You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/11/29 13:30:23 UTC
[myfaces-tobago] branch master updated (e790026 -> efb65f9)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from e790026 rebuild themes after update
new 2131eb0 TOBAGO-1782: Clean up * Remove deprecated code
new 4c725e0 Merge remote-tracking branch 'origin/master'
new 4c8b1df TOBAGO-1782: Clean up * Remove deprecated code
new ba89389 TOBAGO-1782: Clean up * set parameter and local variables "final" where possible
new 032da88 TOBAGO-1782: Clean up * imports * unneeded null check
new 72e2d60 fix docu
new efb65f9 TOBAGO-1832: Remove support for attic MethodBinding
The 7 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:
tobago-core/src/main/faces-config/faces-config.xml | 1 -
.../myfaces/tobago/component/Attributes.java | 6 +-
.../myfaces/tobago/component/InputSuggest.java | 15 +-
.../myfaces/tobago/component/InputSuggest2.java | 10 +-
.../myfaces/tobago/component/LabelLayout.java | 2 +-
.../component/MethodBindingToMethodExpression.java | 241 ---------------------
.../component/MethodExpressionToMethodBinding.java | 108 ---------
.../apache/myfaces/tobago/context/ThemeImpl.java | 10 +-
.../myfaces/tobago/context/ThemeResources.java | 6 +-
.../myfaces/tobago/context/TobagoBundle.java | 22 +-
.../myfaces/tobago/context/TobagoContext.java | 8 +-
.../myfaces/tobago/convert/DurationConverter.java | 2 +-
.../tobago/el/ConstantMethodExpression.java | 14 +-
.../tobago/event/CollapsibleActionListener.java | 6 +-
.../tobago/event/SheetStateChangeSource.java | 16 +-
.../tobago/event/SheetStateChangeSource2.java | 9 +-
.../myfaces/tobago/event/SortActionSource.java | 14 +-
.../myfaces/tobago/event/SortActionSource2.java | 11 +-
.../myfaces/tobago/event/TabChangeSource.java | 16 +-
.../myfaces/tobago/event/TabChangeSource2.java | 11 +-
.../myfaces/tobago/event/TobagoActionSource.java | 50 +++++
.../myfaces/tobago/facelets/EventHandler.java | 32 +--
.../facelets/GridLayoutConstraintHandler.java | 2 +-
.../facelets/SegmentLayoutConstraintHandler.java | 8 +-
.../facelets/SheetStateChangeSourceRule.java | 3 +-
.../tobago/facelets/SortActionSourceRule.java | 3 +-
.../myfaces/tobago/facelets/SpanHandler.java | 2 +-
.../myfaces/tobago/facelets/SuggestMethodRule.java | 6 +-
.../tobago/facelets/SupportsMarkupRule.java | 2 +-
.../tobago/facelets/TobagoComponentHandler.java | 12 +-
.../tobago/internal/ajax/AjaxInternalUtils.java | 80 -------
.../internal/ajax/AjaxNavigationListener.java | 77 -------
.../tobago/internal/ajax/AjaxNavigationState.java | 206 ------------------
.../behavior/AttachedListStateWrapper.java | 2 +-
.../internal/behavior/AttachedStateWrapper.java | 2 +-
.../tobago/internal/behavior/DeltaStateHelper.java | 148 ++++++-------
.../tobago/internal/behavior/EventBehavior.java | 46 ++--
.../component/AbstractUICollapsiblePanel.java | 2 +-
.../internal/component/AbstractUICommand.java | 2 +-
.../internal/component/AbstractUICommandBase.java | 16 +-
.../tobago/internal/component/AbstractUIData.java | 6 +-
.../internal/component/AbstractUIFlexLayout.java | 2 +-
.../internal/component/AbstractUIGridLayout.java | 12 +-
.../internal/component/AbstractUIProgress.java | 6 +-
.../internal/component/AbstractUISection.java | 4 +-
.../component/AbstractUISegmentLayout.java | 2 +-
.../tobago/internal/component/AbstractUISheet.java | 20 +-
.../internal/component/AbstractUISuggest.java | 10 +-
.../internal/component/AbstractUITabGroup.java | 6 +-
.../internal/config/ContentSecurityPolicy.java | 2 +-
.../internal/config/TobagoConfigBuilder.java | 2 +-
.../internal/config/TobagoConfigFragment.java | 8 +-
.../tobago/internal/config/TobagoConfigImpl.java | 6 +-
.../tobago/internal/config/TobagoConfigSorter.java | 6 +-
.../tobago/internal/context/DateTimeI18n.java | 6 +-
.../myfaces/tobago/internal/context/Nonce.java | 2 +-
.../tobago/internal/layout/LayoutUtils.java | 2 +-
.../tobago/internal/renderkit/Collapse.java | 2 +-
.../myfaces/tobago/internal/renderkit/Command.java | 10 +-
.../tobago/internal/renderkit/CommandMap.java | 6 +-
.../internal/renderkit/renderer/BarRenderer.java | 18 +-
.../renderkit/renderer/ButtonsRenderer.java | 8 +-
.../internal/renderkit/renderer/DateRenderer.java | 6 +-
.../renderer/DecodingInputRendererBase.java | 2 +-
.../renderkit/renderer/FigureRenderer.java | 4 +-
.../internal/renderkit/renderer/FileRenderer.java | 20 +-
.../renderkit/renderer/FooterRenderer.java | 4 +-
.../renderkit/renderer/HeaderRenderer.java | 4 +-
.../renderkit/renderer/HiddenRenderer.java | 4 +-
.../internal/renderkit/renderer/ImageRenderer.java | 2 +-
.../internal/renderkit/renderer/InRenderer.java | 12 +-
.../renderer/LabelLayoutRendererBase.java | 10 +-
.../internal/renderkit/renderer/LabelRenderer.java | 2 +-
.../internal/renderkit/renderer/LinksRenderer.java | 8 +-
.../renderer/MessageLayoutRendererBase.java | 8 +-
.../internal/renderkit/renderer/OutRenderer.java | 2 +-
.../internal/renderkit/renderer/PageRenderer.java | 14 +-
.../internal/renderkit/renderer/PopupRenderer.java | 4 +-
.../internal/renderkit/renderer/RowRenderer.java | 4 +-
.../renderkit/renderer/SectionRenderer.java | 2 +-
.../renderkit/renderer/SegmentLayoutRenderer.java | 4 +-
.../renderer/SelectBooleanCheckboxRenderer.java | 6 +-
.../renderer/SelectManyCheckboxRenderer.java | 6 +-
.../renderer/SelectManyListboxRenderer.java | 2 +-
.../renderkit/renderer/SelectManyRendererBase.java | 122 +++++------
.../renderer/SelectManyShuttleRenderer.java | 2 +-
.../renderer/SelectOneChoiceInsideInRenderer.java | 4 +-
.../renderer/SelectOneChoiceRenderer.java | 6 +-
.../renderer/SelectOneListboxRenderer.java | 4 +-
.../renderkit/renderer/SelectOneRadioRenderer.java | 10 +-
.../internal/renderkit/renderer/SheetRenderer.java | 38 ++--
.../renderkit/renderer/SplitLayoutRenderer.java | 4 +-
.../internal/renderkit/renderer/StyleRenderer.java | 2 +-
.../renderkit/renderer/SuggestRenderer.java | 6 +-
.../renderkit/renderer/TabGroupRenderer.java | 10 +-
.../renderkit/renderer/TextareaRenderer.java | 8 +-
.../renderer/TobagoClientBehaviorRenderer.java | 26 +--
.../taglib/component/SheetTagDeclaration.java | 1 -
.../taglib/component/SuggestTagDeclaration.java | 6 +-
.../taglib/component/TabGroupTagDeclaration.java | 1 -
.../internal/taglib/declaration/HasAction.java | 6 +-
.../tobago/internal/util/AccessKeyLogger.java | 6 +-
.../tobago/internal/util/AuthorizationHelper.java | 10 +-
.../myfaces/tobago/internal/util/CookieUtils.java | 14 +-
.../tobago/internal/util/HtmlRendererUtils.java | 6 +-
.../tobago/internal/util/HttpPartWrapper.java | 28 +--
.../myfaces/tobago/internal/util/JQueryUtils.java | 4 +-
.../myfaces/tobago/internal/util/JsonUtils.java | 10 +-
.../tobago/internal/util/MimeTypeUtils.java | 6 +-
.../myfaces/tobago/internal/util/ObjectUtils.java | 2 +-
.../myfaces/tobago/internal/util/PartUtils.java | 34 +--
.../myfaces/tobago/internal/util/RenderUtils.java | 10 +-
.../tobago/internal/util/SelectItemUtils.java | 8 +-
.../myfaces/tobago/internal/util/StringUtils.java | 22 +-
.../tobago/internal/util/StyleRenderUtils.java | 6 +-
.../webapp/DebugResponseWriterWrapper.java | 2 +-
.../tobago/internal/webapp/LoggingMdcFilter.java | 8 +-
.../webapp/TobagoResponseWriterWrapper.java | 6 +-
.../org/apache/myfaces/tobago/layout/GridSpan.java | 2 +-
.../apache/myfaces/tobago/layout/MarginTokens.java | 4 +-
.../org/apache/myfaces/tobago/layout/Measure.java | 12 +-
.../apache/myfaces/tobago/layout/MeasureList.java | 2 +-
.../myfaces/tobago/model/ScrollPosition.java | 4 +-
.../apache/myfaces/tobago/model/SelectItem.java | 4 +-
.../apache/myfaces/tobago/model/SheetState.java | 4 +-
.../myfaces/tobago/renderkit/TobagoRenderKit.java | 6 +-
.../tobago/renderkit/css/BootstrapClass.java | 18 +-
.../myfaces/tobago/renderkit/css/CustomClass.java | 2 +-
.../renderkit/css/FontAwesomeIconEncoder.java | 6 +-
.../myfaces/tobago/renderkit/css/Styles.java | 6 +-
.../myfaces/tobago/renderkit/css/TobagoClass.java | 4 +-
.../tobago/renderkit/html/DataAttributes.java | 2 +-
.../tobago/renderkit/html/HtmlAttributes.java | 2 +-
.../tobago/renderkit/html/HtmlButtonTypes.java | 2 +-
.../tobago/renderkit/html/HtmlInputTypes.java | 2 +-
.../tobago/sanitizer/IgnoringSanitizer.java | 4 +-
.../myfaces/tobago/servlet/ResourceServlet.java | 2 +-
.../org/apache/myfaces/tobago/util/AjaxUtils.java | 6 +-
.../apache/myfaces/tobago/util/ComponentUtils.java | 10 +-
.../apache/myfaces/tobago/util/MessageFormat.java | 30 +--
.../apache/myfaces/tobago/util/WebXmlUtils.java | 18 +-
.../tobago/webapp/AjaxExceptionHandler.java | 8 +-
.../tobago/webapp/AjaxExceptionHandlerFactory.java | 2 +-
.../org/apache/myfaces/tobago/webapp/Secret.java | 4 +-
.../tobago/webapp/TobagoResponseWriter.java | 2 +-
.../AttributesOfGeneratedUIComponentsUnitTest.java | 4 +-
.../tobago/component/RendererTypesUnitTest.java | 2 +-
.../myfaces/tobago/context/MarkupUnitTest.java | 14 +-
.../component/AbstractUIGridLayoutUnitTest.java | 2 +-
.../internal/config/AbstractTobagoTestBase.java | 2 +-
.../tobago/internal/util/PartUtilsUnitTest.java | 8 +-
.../tobago/renderkit/css/CssClassUtils.java | 8 +-
.../tobago/renderkit/css/StyleUnitTest.java | 4 +-
.../tobago/renderkit/css/TobagoClassUnitTest.java | 14 +-
.../renderkit/html/HtmlElementsUnitTest.java | 2 +-
.../tobago/util/ComponentUtilsUnitTest.java | 4 +-
.../apache/myfaces/tobago/util/EnumUnitTest.java | 4 +-
.../apache/myfaces/tobago/example/blank/Hello.java | 2 +-
.../myfaces/tobago/example/data/CommandNode.java | 4 +-
.../myfaces/tobago/example/data/SolarObject.java | 12 +-
.../tobago/example/demo/BehaviorController.java | 4 +-
.../tobago/example/demo/BootstrapUtils.java | 2 +-
.../example/demo/CollapsibleBoxController.java | 2 +-
.../tobago/example/demo/CollapsibleController.java | 2 +-
.../example/demo/CollapsiblePanelController.java | 2 +-
.../example/demo/CollapsiblePopupController.java | 2 +-
.../example/demo/CollapsibleSectionController.java | 2 +-
.../tobago/example/demo/ConversionController.java | 2 +-
.../example/demo/CurrentValueController.java | 4 +-
.../tobago/example/demo/DateController.java | 10 +-
.../example/demo/DefaultCommandController.java | 6 +-
.../example/demo/DeltaSpikeClientWindowConfig.java | 2 +-
.../tobago/example/demo/DemoController.java | 4 +-
.../tobago/example/demo/EventController.java | 14 +-
.../tobago/example/demo/ExceptionController.java | 6 +-
.../example/demo/ExceptionHandlerController.java | 8 +-
.../tobago/example/demo/ExecuteController.java | 8 +-
.../tobago/example/demo/ForEachController.java | 8 +-
.../tobago/example/demo/FormAjaxController.java | 6 +-
.../tobago/example/demo/FormController.java | 4 +-
.../example/demo/FormRequiredController.java | 6 +-
.../tobago/example/demo/GroupController.java | 14 +-
.../myfaces/tobago/example/demo/InController.java | 4 +-
.../tobago/example/demo/LocaleController.java | 4 +-
.../apache/myfaces/tobago/example/demo/Login.java | 4 +-
.../tobago/example/demo/ManifestReader.java | 2 +-
.../example/demo/MessageLayoutController.java | 2 +-
.../tobago/example/demo/MetaController.java | 2 +-
.../tobago/example/demo/NavigationNode.java | 2 +-
.../tobago/example/demo/NavigationState.java | 2 +-
.../tobago/example/demo/NavigationTree.java | 2 +-
.../tobago/example/demo/OldLinksServlet.java | 6 +-
.../tobago/example/demo/PanelController.java | 2 +-
.../example/demo/PartialReloadController.java | 2 +-
.../myfaces/tobago/example/demo/PlanetExample.java | 2 +-
.../tobago/example/demo/PopupController.java | 6 +-
.../demo/PrettyUrlForMenuNavigationHandler.java | 2 +-
.../tobago/example/demo/ProgressController.java | 8 +-
.../tobago/example/demo/RoleController.java | 2 +-
.../demo/SelectBooleanCheckboxController.java | 12 +-
.../tobago/example/demo/SelectItemModel.java | 2 +-
.../example/demo/SelectManyCheckboxController.java | 8 +-
.../example/demo/SelectManyListboxController.java | 6 +-
.../example/demo/SelectManyShuttleController.java | 4 +-
.../example/demo/SelectOneChoiceController.java | 2 +-
.../example/demo/SelectOneListboxController.java | 4 +-
.../example/demo/SelectOneRadioController.java | 4 +-
.../myfaces/tobago/example/demo/SheetConfig.java | 6 +-
.../tobago/example/demo/SheetController.java | 24 +-
.../tobago/example/demo/SheetFilterController.java | 36 +--
.../tobago/example/demo/SourceFileReader.java | 2 +-
.../tobago/example/demo/SplitLayoutController.java | 4 +-
.../tobago/example/demo/SuggestController.java | 6 +-
.../myfaces/tobago/example/demo/TabController.java | 2 +-
.../tobago/example/demo/TestController.java | 24 +-
.../tobago/example/demo/TextareaController.java | 2 +-
.../tobago/example/demo/ThemeController.java | 4 +-
.../tobago/example/demo/TinyMceController.java | 2 +-
.../example/demo/TreeCommandTypesController.java | 2 +-
.../tobago/example/demo/TreeController.java | 8 +-
.../tobago/example/demo/TreeEditorController.java | 26 +--
.../tobago/example/demo/TreeSelectController.java | 16 +-
.../tobago/example/demo/UniversalLoggingInfo.java | 26 +--
.../tobago/example/demo/UploadController.java | 14 +-
.../tobago/example/demo/ValidationController.java | 10 +-
.../example/demo/ValidationJsr303Controller.java | 4 +-
.../actionlistener/SimpleTabChangeListener.java | 2 +-
.../example/demo/nonfacesrequest/FishPond.java | 2 +-
.../tobago/example/test/DateController.java | 4 +-
.../tobago/example/demo/ArquillianTest.java | 4 +-
.../tobago/example/demo/NavigationUnitTest.java | 2 +-
.../myfaces/tobago/example/demo/QUnitTests.java | 144 ++++++------
.../renderkit/css/BootstrapClassUnitTest.java | 12 +-
.../myfaces/tobago/apt/generate/ComponentInfo.java | 2 +-
.../apt/processor/CheckstyleConfigGenerator.java | 8 +-
.../tobago/apt/processor/ClassesGenerator.java | 2 +-
.../tobago/apt/processor/TaglibGenerator.java | 20 +-
.../org/apache/myfaces/tobago/apt/component.stg | 27 ---
238 files changed, 1064 insertions(+), 1794 deletions(-)
delete mode 100644 tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
delete mode 100644 tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
create mode 100644 tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
delete mode 100644 tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
delete mode 100644 tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationListener.java
delete mode 100644 tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].
[myfaces-tobago] 07/07: TOBAGO-1832: Remove support for attic
MethodBinding
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit efb65f993a7267c279679fd1cecbd102f30b4087
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 29 14:28:27 2017 +0100
TOBAGO-1832: Remove support for attic MethodBinding
---
.../myfaces/tobago/component/InputSuggest.java | 15 +-
.../myfaces/tobago/component/InputSuggest2.java | 10 +-
.../component/MethodBindingToMethodExpression.java | 241 ---------------------
.../component/MethodExpressionToMethodBinding.java | 108 ---------
.../tobago/event/SheetStateChangeSource.java | 16 +-
.../tobago/event/SheetStateChangeSource2.java | 9 +-
.../myfaces/tobago/event/SortActionSource.java | 14 +-
.../myfaces/tobago/event/SortActionSource2.java | 11 +-
.../myfaces/tobago/event/TabChangeSource.java | 16 +-
.../myfaces/tobago/event/TabChangeSource2.java | 11 +-
.../myfaces/tobago/event/TobagoActionSource.java | 50 +++++
.../facelets/SheetStateChangeSourceRule.java | 3 +-
.../tobago/facelets/SortActionSourceRule.java | 3 +-
.../myfaces/tobago/facelets/SuggestMethodRule.java | 6 +-
.../internal/component/AbstractUICommandBase.java | 10 +-
.../tobago/internal/component/AbstractUISheet.java | 6 +-
.../internal/component/AbstractUISuggest.java | 4 +-
.../internal/component/AbstractUITabGroup.java | 6 +-
.../taglib/component/SheetTagDeclaration.java | 1 -
.../taglib/component/SuggestTagDeclaration.java | 2 +-
.../taglib/component/TabGroupTagDeclaration.java | 1 -
.../internal/taglib/declaration/HasAction.java | 6 +-
.../org/apache/myfaces/tobago/apt/component.stg | 27 ---
23 files changed, 105 insertions(+), 471 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java
index ee86208..0555ec6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java
@@ -19,18 +19,11 @@
package org.apache.myfaces.tobago.component;
-import javax.faces.el.MethodBinding;
+import javax.el.MethodExpression;
public interface InputSuggest {
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- MethodBinding getSuggestMethod();
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- void setSuggestMethod(MethodBinding suggestMethod);
+ MethodExpression getSuggestMethodExpression();
+
+ void setSuggestMethodExpression(MethodExpression suggestExpression);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
index 1d2160b..3aefa0e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
@@ -19,11 +19,9 @@
package org.apache.myfaces.tobago.component;
-import javax.el.MethodExpression;
-
+/**
+ * @deprecated since 4.0.0
+ */
+@Deprecated
public interface InputSuggest2 extends InputSuggest {
-
- MethodExpression getSuggestMethodExpression();
-
- void setSuggestMethodExpression(MethodExpression suggestExpression);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
deleted file mode 100644
index 963ee17..0000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.component;
-
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.el.MethodInfo;
-import javax.el.MethodNotFoundException;
-import javax.faces.FacesException;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.el.EvaluationException;
-import javax.faces.el.MethodBinding;
-
-/**
- * @deprecated since 2.0.0
- */
-@Deprecated
-public class MethodBindingToMethodExpression extends MethodExpression implements StateHolder {
- private MethodBinding methodBinding;
-
- private boolean transientFlag;
-
- private transient MethodInfo methodInfo;
-
- /**
- * No-arg constructor used during restoreState
- */
- public MethodBindingToMethodExpression() {
- }
-
- /**
- * Creates a new instance of MethodBindingToMethodExpression
- * @param methodBinding The MethodBinding to wrap.
- */
- public MethodBindingToMethodExpression(final MethodBinding methodBinding) {
- checkNullArgument(methodBinding, "methodBinding");
- this.methodBinding = methodBinding;
- }
-
- /**
- * Return the wrapped MethodBinding.
- * @return the wrapped MethodBinding
- */
- public MethodBinding getMethodBinding() {
- return methodBinding;
- }
-
- void setMethodBinding(final MethodBinding methodBinding) {
- this.methodBinding = methodBinding;
- }
-
- /**
- * Note: MethodInfo.getParamTypes() may incorrectly return an empty class array if invoke() has not been called.
- *
- * @throws IllegalStateException if expected params types have not been determined.
- */
- @Override
- public MethodInfo getMethodInfo(final ELContext context) throws ELException {
- checkNullArgument(context, "elcontext");
- checkNullState(methodBinding, "methodBinding");
-
- if (methodInfo == null) {
- final FacesContext facesContext = (FacesContext) context.getContext(FacesContext.class);
- if (facesContext != null) {
- methodInfo = invoke(new Invoker<MethodInfo>() {
- @Override
- public MethodInfo invoke() {
- return new MethodInfo(null, methodBinding.getType(facesContext), null);
- }
- });
- }
- }
- return methodInfo;
- }
-
- @Override
- public Object invoke(final ELContext context, final Object[] params) throws ELException {
- checkNullArgument(context, "elcontext");
- checkNullState(methodBinding, "methodBinding");
- final FacesContext facesContext = (FacesContext) context.getContext(FacesContext.class);
- if (facesContext != null) {
- return invoke(new Invoker<Object>() {
- @Override
- public Object invoke() {
- return methodBinding.invoke(facesContext, params);
- }
- });
- }
- return null;
- }
-
- @Override
- public boolean isLiteralText() {
- if (methodBinding == null) {
- throw new IllegalStateException("methodBinding is null");
- }
- final String expr = methodBinding.getExpressionString();
- return !(expr.startsWith("#{") && expr.endsWith("}"));
- }
-
- @Override
- public String getExpressionString() {
- return methodBinding.getExpressionString();
- }
-
- @Override
- public Object saveState(final FacesContext context) {
- if (!isTransient()) {
- if (methodBinding instanceof StateHolder) {
- final Object[] state = new Object[2];
- state[0] = methodBinding.getClass().getName();
- state[1] = ((StateHolder) methodBinding).saveState(context);
- return state;
- } else {
- return methodBinding;
- }
- }
- return null;
- }
-
- @Override
- public void restoreState(final FacesContext context, final Object state) {
- if (state instanceof MethodBinding) {
- methodBinding = (MethodBinding) state;
- methodInfo = null;
- } else if (state != null) {
- final Object[] values = (Object[]) state;
- methodBinding = (MethodBinding) newInstance(values[0].toString());
- ((StateHolder) methodBinding).restoreState(context, values[1]);
- methodInfo = null;
- }
- }
-
- @Override
- public void setTransient(final boolean transientFlag) {
- this.transientFlag = transientFlag;
- }
-
- @Override
- public boolean isTransient() {
- return transientFlag;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((methodBinding == null) ? 0 : methodBinding.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final MethodBindingToMethodExpression other = (MethodBindingToMethodExpression) obj;
- if (methodBinding == null) {
- if (other.methodBinding != null) {
- return false;
- }
- } else if (!methodBinding.equals(other.methodBinding)) {
- return false;
- }
- return true;
- }
-
- private void checkNullState(final Object notNullInstance, final String instanceName) {
- if (notNullInstance == null) {
- throw new IllegalStateException(instanceName + " is null");
- }
- }
-
- private void checkNullArgument(final Object notNullInstance, final String instanceName) {
- if (notNullInstance == null) {
- throw new IllegalArgumentException(instanceName + " is null");
- }
- }
-
- private <T> T invoke(final Invoker<T> invoker) {
- try {
- return invoker.invoke();
- } catch (final javax.faces.el.MethodNotFoundException e) {
- throw new MethodNotFoundException(e.getMessage(), e);
- } catch (final EvaluationException e) {
- throw new ELException(e.getMessage(), e);
- }
- }
-
- private interface Invoker<T> {
- T invoke();
- }
-
- private static Object newInstance(final String type) {
- if (type == null) {
- throw new NullPointerException("type");
- }
- try {
- try {
- return Class.forName(type, false, Thread.currentThread().getContextClassLoader()).newInstance();
- } catch (final ClassNotFoundException e) {
- // ignore
- return Class.forName(type, false, MethodBindingToMethodExpression.class.getClassLoader()).newInstance();
- }
- } catch (final ClassNotFoundException e) {
- throw new FacesException(e);
- } catch (final NoClassDefFoundError e) {
- throw new FacesException(e);
- } catch (final InstantiationException e) {
- throw new FacesException(e);
- } catch (final IllegalAccessException e) {
- throw new FacesException(e);
- }
- }
-
-}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
deleted file mode 100644
index 7d0ad96..0000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.component;
-
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.el.EvaluationException;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.MethodNotFoundException;
-
-/**
- * @deprecated since 2.0.0
- */
-@Deprecated
-public class MethodExpressionToMethodBinding extends MethodBinding implements StateHolder {
-
- private MethodExpression methodExpression;
-
- private boolean isTransient = false;
-
- public MethodExpressionToMethodBinding() {
- methodExpression = null;
- }
-
- /**
- * Creates a new instance of MethodExpressionToMethodBinding
- */
- public MethodExpressionToMethodBinding(final MethodExpression methodExpression) {
- this.methodExpression = methodExpression;
- }
-
- @Override
- public String getExpressionString() {
- return methodExpression.getExpressionString();
- }
-
- @Override
- public Class getType(final FacesContext facesContext)
- throws MethodNotFoundException {
-
- try {
- return methodExpression.getMethodInfo(facesContext.getELContext()).getReturnType();
- } catch (final javax.el.MethodNotFoundException e) {
- throw new javax.faces.el.MethodNotFoundException(e);
- } catch (final ELException e) {
- throw new EvaluationException(e);
- }
- }
-
- @Override
- public Object invoke(final FacesContext facesContext, final Object[] params)
- throws EvaluationException {
-
- try {
- return methodExpression.invoke(facesContext.getELContext(), params);
- } catch (final javax.el.MethodNotFoundException e) {
- throw new javax.faces.el.MethodNotFoundException(e);
- } catch (final ELException e) {
- throw new EvaluationException(e);
- }
- }
-
-
- @Override
- public void restoreState(final FacesContext context, final Object state) {
- if (state != null) {
- methodExpression = (MethodExpression) state;
- }
- }
-
- @Override
- public Object saveState(final FacesContext context) {
- if (!isTransient) {
- return methodExpression;
- }
- return null;
- }
-
- @Override
- public void setTransient(final boolean newTransientValue) {
- isTransient = newTransientValue;
- }
-
- @Override
- public boolean isTransient() {
- return isTransient;
- }
-
-}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
index f793d50..a6ee420 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
@@ -19,19 +19,13 @@
package org.apache.myfaces.tobago.event;
+import javax.el.MethodExpression;
+
public interface SheetStateChangeSource {
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- javax.faces.el.MethodBinding getStateChangeListener();
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- void setStateChangeListener(javax.faces.el.MethodBinding actionListener);
+ MethodExpression getStateChangeListenerExpression();
+
+ void setStateChangeListenerExpression(MethodExpression actionListener);
void addStateChangeListener(SheetStateChangeListener listener);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource2.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource2.java
index c881625..0f16a8d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource2.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource2.java
@@ -19,11 +19,10 @@
package org.apache.myfaces.tobago.event;
-import javax.el.MethodExpression;
-
+/**
+ * @deprecated since 4.0.0
+ */
+@Deprecated
public interface SheetStateChangeSource2 extends SheetStateChangeSource {
- MethodExpression getStateChangeListenerExpression();
-
- void setStateChangeListenerExpression(MethodExpression actionListener);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java
index 00c02bc..458553f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java
@@ -19,19 +19,11 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.el.MethodBinding;
+import javax.el.MethodExpression;
public interface SortActionSource {
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- MethodBinding getSortActionListener();
+ MethodExpression getSortActionListenerExpression();
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- void setSortActionListener(MethodBinding actionListener);
+ void setSortActionListenerExpression(MethodExpression actionListener);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource2.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource2.java
index 787c940..12f3da1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource2.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource2.java
@@ -19,12 +19,9 @@
package org.apache.myfaces.tobago.event;
-import javax.el.MethodExpression;
-
+/**
+ * @deprecated since 4.0.0
+ */
+@Deprecated
public interface SortActionSource2 extends SortActionSource {
-
- MethodExpression getSortActionListenerExpression();
-
- void setSortActionListenerExpression(MethodExpression actionListener);
-
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
index 44f8251..0e083a7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
@@ -19,19 +19,13 @@
package org.apache.myfaces.tobago.event;
+import javax.el.MethodExpression;
+
public interface TabChangeSource {
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- javax.faces.el.MethodBinding getTabChangeListener();
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- void setTabChangeListener(javax.faces.el.MethodBinding actionListener);
+ MethodExpression getTabChangeListenerExpression();
+
+ void setTabChangeListenerExpression(MethodExpression actionListener);
void addTabChangeListener(TabChangeListener listener);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource2.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource2.java
index fe87751..5129490 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource2.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource2.java
@@ -19,12 +19,9 @@
package org.apache.myfaces.tobago.event;
-import javax.el.MethodExpression;
-
+/**
+ * @deprecated since 4.0.0
+ */
+@Deprecated
public interface TabChangeSource2 extends TabChangeSource {
-
- MethodExpression getTabChangeListenerExpression();
-
- void setTabChangeListenerExpression(MethodExpression actionListener);
-
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
new file mode 100644
index 0000000..7bd56bd
--- /dev/null
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
@@ -0,0 +1,50 @@
+package org.apache.myfaces.tobago.event;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.faces.component.ActionSource2;
+import javax.faces.el.MethodBinding;
+
+public interface TobagoActionSource extends ActionSource2 {
+
+ Logger LOG = LoggerFactory.getLogger(TobagoActionSource.class);
+
+ /**
+ * @deprecated Replaced by ActionSource2.getActionExpression
+ */
+ @Override
+ @Deprecated
+ default MethodBinding getAction() {
+ LOG.warn("No longer supported!");
+ return null;
+ }
+
+ /**
+ * @deprecated Replaced by ActionSource2.setActionExpression
+ */
+ @Override
+ @Deprecated
+ default void setAction(MethodBinding action) {
+ LOG.warn("No longer supported!");
+ }
+
+ /**
+ * @deprecated Replaced by getActionListeners
+ */
+ @Override
+ @Deprecated
+ default MethodBinding getActionListener() {
+ LOG.warn("No longer supported!");
+ return null;
+ }
+
+ /**
+ * @deprecated Replaced by getActionListeners
+ */
+ @Override
+ @Deprecated
+ default void setActionListener(MethodBinding actionListener) {
+ LOG.warn("No longer supported!");
+ }
+}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
index 9f16593..2c0c6fa 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.event.SheetStateChangeSource;
-import org.apache.myfaces.tobago.event.SheetStateChangeSource2;
import javax.faces.event.ActionEvent;
import javax.faces.view.facelets.FaceletContext;
@@ -55,7 +54,7 @@ public class SheetStateChangeSourceRule extends MetaRule {
@Override
public void applyMetadata(final FaceletContext ctx, final Object instance) {
- ((SheetStateChangeSource2) instance).setStateChangeListenerExpression(
+ ((SheetStateChangeSource) instance).setStateChangeListenerExpression(
attribute.getMethodExpression(ctx, null, SheetStateChangeSourceRule.ACTION_LISTENER));
}
}
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 e1bdeaa..45f89b3 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
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.event.SortActionSource;
-import org.apache.myfaces.tobago.event.SortActionSource2;
import javax.faces.event.ActionEvent;
import javax.faces.view.facelets.FaceletContext;
@@ -56,7 +55,7 @@ public class SortActionSourceRule extends MetaRule {
@Override
public void applyMetadata(final FaceletContext ctx, final Object instance) {
- ((SortActionSource2) instance).setSortActionListenerExpression(
+ ((SortActionSource) instance).setSortActionListenerExpression(
attribute.getMethodExpression(ctx, null, SortActionSourceRule.ACTION_LISTENER));
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
index f9a2c10..00e0769 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.facelets;
-import org.apache.myfaces.tobago.component.InputSuggest2;
+import org.apache.myfaces.tobago.component.InputSuggest;
import org.apache.myfaces.tobago.internal.component.AbstractUISuggest;
import org.apache.myfaces.tobago.model.SuggestFilter;
@@ -38,7 +38,7 @@ public class SuggestMethodRule extends MetaRule {
@Override
public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
- if (metadataTarget.isTargetInstanceOf(InputSuggest2.class)) {
+ if (metadataTarget.isTargetInstanceOf(InputSuggest.class)) {
if ("suggestMethod".equals(name)) {
return new SuggestMethodMapper(attribute);
}
@@ -62,7 +62,7 @@ public class SuggestMethodRule extends MetaRule {
@Override
public void applyMetadata(final FaceletContext ctx, final Object instance) {
- ((InputSuggest2) instance).setSuggestMethodExpression(
+ ((InputSuggest) instance).setSuggestMethodExpression(
attribute.getMethodExpression(ctx, null, SuggestMethodRule.SUGGEST_METHOD));
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
index 268c38f..1045901 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
@@ -97,19 +97,19 @@ public abstract class AbstractUICommandBase extends UICommand
final FacesContext facesContext = getFacesContext();
final TobagoConfig tobagoConfig = TobagoConfig.getInstance(facesContext);
return super.isRendered()
- && (tobagoConfig.getSecurityAnnotation() != SecurityAnnotation.hide || isAllowed());
+ && (tobagoConfig.getSecurityAnnotation() != SecurityAnnotation.hide || isAllowed());
}
/**
- Flag indicating that this element is disabled.
- <br>Default: <code>false</code>
+ * Flag indicating that this element is disabled.
+ * <br>Default: <code>false</code>
*/
public boolean isDisabled() {
final FacesContext facesContext = getFacesContext();
final TobagoConfig tobagoConfig = TobagoConfig.getInstance(facesContext);
final Boolean disabled = (Boolean) getStateHelper().eval(AbstractUICommand.PropertyKeys.disabled);
return disabled != null && disabled
- || (tobagoConfig.getSecurityAnnotation() == SecurityAnnotation.disable && !isAllowed());
+ || (tobagoConfig.getSecurityAnnotation() == SecurityAnnotation.disable && !isAllowed());
}
private boolean isAllowed() {
@@ -118,7 +118,7 @@ public abstract class AbstractUICommandBase extends UICommand
final MethodExpression actionExpression = getActionExpression();
if (actionExpression != null) {
final boolean authorized =
- authorizationHelper.isAuthorized(facesContext, actionExpression.getExpressionString());
+ authorizationHelper.isAuthorized(facesContext, actionExpression.getExpressionString());
if (!authorized) {
return false;
}
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 bacbf9e..2d4e070 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
@@ -25,9 +25,9 @@ import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.event.PageActionEvent;
import org.apache.myfaces.tobago.event.SheetStateChangeEvent;
import org.apache.myfaces.tobago.event.SheetStateChangeListener;
-import org.apache.myfaces.tobago.event.SheetStateChangeSource2;
+import org.apache.myfaces.tobago.event.SheetStateChangeSource;
import org.apache.myfaces.tobago.event.SortActionEvent;
-import org.apache.myfaces.tobago.event.SortActionSource2;
+import org.apache.myfaces.tobago.event.SortActionSource;
import org.apache.myfaces.tobago.internal.layout.Grid;
import org.apache.myfaces.tobago.internal.layout.OriginCell;
import org.apache.myfaces.tobago.layout.Measure;
@@ -64,7 +64,7 @@ import java.util.List;
*/
@ListenerFor(systemEventClass = PreRenderComponentEvent.class)
public abstract class AbstractUISheet extends AbstractUIData
- implements SheetStateChangeSource2, SortActionSource2, ClientBehaviorHolder, Visual,
+ implements SheetStateChangeSource, SortActionSource, ClientBehaviorHolder, Visual,
ComponentSystemEventListener {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUISheet.class);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
index fcd8df2..8256406 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.component.InputSuggest2;
+import org.apache.myfaces.tobago.component.InputSuggest;
import org.apache.myfaces.tobago.model.SuggestFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +33,7 @@ import javax.faces.context.FacesContext;
* {@link org.apache.myfaces.tobago.internal.taglib.component.SuggestTagDeclaration}
*/
public abstract class AbstractUISuggest
- extends UIComponentBase implements InputSuggest2, ClientBehaviorHolder {
+ extends UIComponentBase implements InputSuggest, ClientBehaviorHolder {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUISuggest.class);
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 2fd394d..4900add 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
@@ -24,7 +24,8 @@ import org.apache.myfaces.tobago.component.UITab;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.event.TabChangeEvent;
import org.apache.myfaces.tobago.event.TabChangeListener;
-import org.apache.myfaces.tobago.event.TabChangeSource2;
+import org.apache.myfaces.tobago.event.TabChangeSource;
+import org.apache.myfaces.tobago.event.TobagoActionSource;
import org.apache.myfaces.tobago.model.SwitchType;
import org.apache.myfaces.tobago.util.FacesELUtils;
import org.slf4j.Logger;
@@ -32,7 +33,6 @@ import org.slf4j.LoggerFactory;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
-import javax.faces.component.ActionSource2;
import javax.faces.component.UIComponent;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
@@ -48,7 +48,7 @@ import java.util.List;
* {@link org.apache.myfaces.tobago.internal.taglib.component.TabGroupTagDeclaration}
*/
public abstract class AbstractUITabGroup extends AbstractUIPanelBase
- implements TabChangeSource2, ActionSource2, ClientBehaviorHolder, Visual {
+ implements TabChangeSource, TobagoActionSource, ClientBehaviorHolder, Visual {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUITabGroup.class);
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 9a15470..d6708f8 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
@@ -49,7 +49,6 @@ import javax.faces.component.UIData;
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISheet",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISheet",
- interfaces = "org.apache.myfaces.tobago.event.SortActionSource2",
uiComponentFacesClass = "javax.faces.component.UIData",
componentFamily = UIData.COMPONENT_FAMILY,
rendererType = RendererTypes.SHEET,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
index 9152472..d95140a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
@@ -62,7 +62,7 @@ import javax.faces.component.UIInput;
public interface SuggestTagDeclaration extends HasIdBindingAndRendered {
/**
- * MethodBinding which generates a list of suggested input values based on
+ * {@link javax.el.MethodExpression} which generates a list of suggested input values based on
* the currently entered text, which could be retrieved via getSubmittedValue() on the UIIn.
* The expression has to evaluate to a public method which has a javax.faces.component.UIInput parameter
* and returns a List<String>, a List<org.apache.myfaces.tobago.model.AutoSuggestItem>
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 b2077ae..cf63a5c 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
@@ -49,7 +49,6 @@ import javax.faces.component.UIPanel;
uiComponentFacesClass = "javax.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.TAB_GROUP,
- interfaces = "javax.faces.component.ActionSource2",
allowedChildComponenents = "org.apache.myfaces.tobago.Tab",
behaviors = {
@Behavior(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
index 715eb90..75870a8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
@@ -28,9 +28,9 @@ public interface HasAction {
* Action to invoke when clicked.
* This must be a MethodExpression or a String representing the application action to invoke when
* this component is activated by the user.
- * The MethodBinding must evaluate to a public method that takes no parameters,
- * and returns a String (the logical outcome) which is passed to the
- * NavigationHandler for this application.
+ * The {@link javax.el.MethodExpression} must evaluate to a public method that takes no parameters,
+ * and returns a {@link String} (the logical outcome) which is passed to the
+ * {@link javax.faces.application.NavigationHandler} for this application.
* The string is directly passed to the navigation handler.
*/
@TagAttribute
diff --git a/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg b/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
index 0fa1394..854788e 100644
--- a/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
+++ b/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
@@ -414,33 +414,6 @@ NumberProperty(property) ::= <<
MethodExpressionProperty(property) ::= <<
-/**
- * @deprecated since 2.0.0
- */
-@Deprecated
-public javax.faces.el.MethodBinding get<property.upperCamelCaseName>() {
- javax.el.MethodExpression expression = get<property.upperCamelCaseName>Expression();
- if (expression instanceof MethodBindingToMethodExpression) {
- return ((MethodBindingToMethodExpression)expression).getMethodBinding();
- }
- if (expression != null) {
- return new MethodExpressionToMethodBinding(expression);
- }
- return null;
-}
-
-/**
- * @deprecated since 2.0.0
- */
-@Deprecated
-public void set<property.upperCamelCaseName>(javax.faces.el.MethodBinding <property.propertyName>) {
- if (<property.propertyName> != null) {
- set<property.upperCamelCaseName>Expression(new MethodBindingToMethodExpression(<property.propertyName>));
- } else {
- set<property.upperCamelCaseName>Expression(null);
- }
-}
-
public <property.type> get<property.upperCamelCaseName>Expression() {
return (<property.type>) getStateHelper().eval(PropertyKeys.<property.propertyName>);
}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 04/07: TOBAGO-1782: Clean up * set parameter and
local variables "final" where possible
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit ba89389b7cc9037521f1d7f21f6dbb18f0dd86b8
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 29 09:52:35 2017 +0100
TOBAGO-1782: Clean up
* set parameter and local variables "final" where possible
---
.../myfaces/tobago/component/Attributes.java | 6 +-
.../myfaces/tobago/component/LabelLayout.java | 2 +-
.../apache/myfaces/tobago/context/ThemeImpl.java | 10 +-
.../myfaces/tobago/context/ThemeResources.java | 6 +-
.../myfaces/tobago/context/TobagoBundle.java | 22 +--
.../myfaces/tobago/context/TobagoContext.java | 8 +-
.../myfaces/tobago/convert/DurationConverter.java | 2 +-
.../tobago/el/ConstantMethodExpression.java | 14 +-
.../tobago/event/CollapsibleActionListener.java | 6 +-
.../myfaces/tobago/facelets/EventHandler.java | 32 ++---
.../facelets/GridLayoutConstraintHandler.java | 2 +-
.../facelets/SegmentLayoutConstraintHandler.java | 8 +-
.../myfaces/tobago/facelets/SpanHandler.java | 2 +-
.../tobago/facelets/SupportsMarkupRule.java | 2 +-
.../tobago/facelets/TobagoComponentHandler.java | 12 +-
.../behavior/AttachedListStateWrapper.java | 2 +-
.../internal/behavior/AttachedStateWrapper.java | 2 +-
.../tobago/internal/behavior/DeltaStateHelper.java | 148 ++++++++++-----------
.../tobago/internal/behavior/EventBehavior.java | 46 +++----
.../component/AbstractUICollapsiblePanel.java | 2 +-
.../internal/component/AbstractUICommand.java | 2 +-
.../internal/component/AbstractUICommandBase.java | 6 +-
.../tobago/internal/component/AbstractUIData.java | 6 +-
.../internal/component/AbstractUIFlexLayout.java | 2 +-
.../internal/component/AbstractUIGridLayout.java | 12 +-
.../internal/component/AbstractUIProgress.java | 6 +-
.../internal/component/AbstractUISection.java | 4 +-
.../component/AbstractUISegmentLayout.java | 2 +-
.../tobago/internal/component/AbstractUISheet.java | 14 +-
.../internal/component/AbstractUISuggest.java | 6 +-
.../internal/config/ContentSecurityPolicy.java | 2 +-
.../internal/config/TobagoConfigBuilder.java | 2 +-
.../internal/config/TobagoConfigFragment.java | 8 +-
.../tobago/internal/config/TobagoConfigImpl.java | 6 +-
.../tobago/internal/config/TobagoConfigSorter.java | 6 +-
.../tobago/internal/context/DateTimeI18n.java | 4 +-
.../myfaces/tobago/internal/context/Nonce.java | 2 +-
.../tobago/internal/layout/LayoutUtils.java | 2 +-
.../tobago/internal/renderkit/Collapse.java | 2 +-
.../myfaces/tobago/internal/renderkit/Command.java | 10 +-
.../tobago/internal/renderkit/CommandMap.java | 6 +-
.../internal/renderkit/renderer/BarRenderer.java | 18 +--
.../renderkit/renderer/ButtonsRenderer.java | 8 +-
.../internal/renderkit/renderer/DateRenderer.java | 6 +-
.../renderer/DecodingInputRendererBase.java | 2 +-
.../renderkit/renderer/FigureRenderer.java | 4 +-
.../internal/renderkit/renderer/FileRenderer.java | 20 +--
.../renderkit/renderer/FooterRenderer.java | 4 +-
.../renderkit/renderer/HeaderRenderer.java | 4 +-
.../renderkit/renderer/HiddenRenderer.java | 4 +-
.../internal/renderkit/renderer/ImageRenderer.java | 2 +-
.../internal/renderkit/renderer/InRenderer.java | 12 +-
.../renderer/LabelLayoutRendererBase.java | 10 +-
.../internal/renderkit/renderer/LabelRenderer.java | 2 +-
.../internal/renderkit/renderer/LinksRenderer.java | 8 +-
.../renderer/MessageLayoutRendererBase.java | 8 +-
.../internal/renderkit/renderer/OutRenderer.java | 2 +-
.../internal/renderkit/renderer/PageRenderer.java | 14 +-
.../internal/renderkit/renderer/PopupRenderer.java | 4 +-
.../internal/renderkit/renderer/RowRenderer.java | 4 +-
.../renderkit/renderer/SectionRenderer.java | 2 +-
.../renderkit/renderer/SegmentLayoutRenderer.java | 4 +-
.../renderer/SelectBooleanCheckboxRenderer.java | 6 +-
.../renderer/SelectManyCheckboxRenderer.java | 6 +-
.../renderer/SelectManyListboxRenderer.java | 2 +-
.../renderkit/renderer/SelectManyRendererBase.java | 122 ++++++++---------
.../renderer/SelectManyShuttleRenderer.java | 2 +-
.../renderer/SelectOneChoiceInsideInRenderer.java | 4 +-
.../renderer/SelectOneChoiceRenderer.java | 6 +-
.../renderer/SelectOneListboxRenderer.java | 4 +-
.../renderkit/renderer/SelectOneRadioRenderer.java | 10 +-
.../internal/renderkit/renderer/SheetRenderer.java | 38 +++---
.../renderkit/renderer/SplitLayoutRenderer.java | 4 +-
.../internal/renderkit/renderer/StyleRenderer.java | 2 +-
.../renderkit/renderer/SuggestRenderer.java | 6 +-
.../renderkit/renderer/TabGroupRenderer.java | 10 +-
.../renderkit/renderer/TextareaRenderer.java | 8 +-
.../renderer/TobagoClientBehaviorRenderer.java | 26 ++--
.../tobago/internal/util/AccessKeyLogger.java | 6 +-
.../tobago/internal/util/AuthorizationHelper.java | 10 +-
.../myfaces/tobago/internal/util/CookieUtils.java | 14 +-
.../tobago/internal/util/HtmlRendererUtils.java | 6 +-
.../tobago/internal/util/HttpPartWrapper.java | 28 ++--
.../myfaces/tobago/internal/util/JQueryUtils.java | 4 +-
.../myfaces/tobago/internal/util/JsonUtils.java | 10 +-
.../tobago/internal/util/MimeTypeUtils.java | 6 +-
.../myfaces/tobago/internal/util/ObjectUtils.java | 2 +-
.../myfaces/tobago/internal/util/PartUtils.java | 34 ++---
.../myfaces/tobago/internal/util/RenderUtils.java | 10 +-
.../tobago/internal/util/SelectItemUtils.java | 8 +-
.../myfaces/tobago/internal/util/StringUtils.java | 22 +--
.../tobago/internal/util/StyleRenderUtils.java | 6 +-
.../webapp/DebugResponseWriterWrapper.java | 2 +-
.../tobago/internal/webapp/LoggingMdcFilter.java | 8 +-
.../webapp/TobagoResponseWriterWrapper.java | 6 +-
.../org/apache/myfaces/tobago/layout/GridSpan.java | 2 +-
.../apache/myfaces/tobago/layout/MarginTokens.java | 4 +-
.../org/apache/myfaces/tobago/layout/Measure.java | 12 +-
.../apache/myfaces/tobago/layout/MeasureList.java | 2 +-
.../myfaces/tobago/model/ScrollPosition.java | 4 +-
.../apache/myfaces/tobago/model/SelectItem.java | 4 +-
.../apache/myfaces/tobago/model/SheetState.java | 4 +-
.../myfaces/tobago/renderkit/TobagoRenderKit.java | 6 +-
.../tobago/renderkit/css/BootstrapClass.java | 18 +--
.../myfaces/tobago/renderkit/css/CustomClass.java | 2 +-
.../renderkit/css/FontAwesomeIconEncoder.java | 6 +-
.../myfaces/tobago/renderkit/css/Styles.java | 6 +-
.../myfaces/tobago/renderkit/css/TobagoClass.java | 4 +-
.../tobago/renderkit/html/DataAttributes.java | 2 +-
.../tobago/renderkit/html/HtmlAttributes.java | 2 +-
.../tobago/renderkit/html/HtmlButtonTypes.java | 2 +-
.../tobago/renderkit/html/HtmlInputTypes.java | 2 +-
.../tobago/sanitizer/IgnoringSanitizer.java | 4 +-
.../myfaces/tobago/servlet/ResourceServlet.java | 2 +-
.../org/apache/myfaces/tobago/util/AjaxUtils.java | 6 +-
.../apache/myfaces/tobago/util/ComponentUtils.java | 10 +-
.../apache/myfaces/tobago/util/MessageFormat.java | 30 ++---
.../apache/myfaces/tobago/util/WebXmlUtils.java | 18 +--
.../tobago/webapp/AjaxExceptionHandler.java | 8 +-
.../tobago/webapp/AjaxExceptionHandlerFactory.java | 2 +-
.../org/apache/myfaces/tobago/webapp/Secret.java | 4 +-
.../tobago/webapp/TobagoResponseWriter.java | 2 +-
.../AttributesOfGeneratedUIComponentsUnitTest.java | 4 +-
.../tobago/component/RendererTypesUnitTest.java | 2 +-
.../myfaces/tobago/context/MarkupUnitTest.java | 14 +-
.../component/AbstractUIGridLayoutUnitTest.java | 2 +-
.../internal/config/AbstractTobagoTestBase.java | 2 +-
.../tobago/internal/util/PartUtilsUnitTest.java | 8 +-
.../tobago/renderkit/css/CssClassUtils.java | 8 +-
.../tobago/renderkit/css/StyleUnitTest.java | 4 +-
.../tobago/renderkit/css/TobagoClassUnitTest.java | 14 +-
.../renderkit/html/HtmlElementsUnitTest.java | 2 +-
.../tobago/util/ComponentUtilsUnitTest.java | 4 +-
.../apache/myfaces/tobago/util/EnumUnitTest.java | 4 +-
.../apache/myfaces/tobago/example/blank/Hello.java | 2 +-
.../myfaces/tobago/example/data/CommandNode.java | 4 +-
.../myfaces/tobago/example/data/SolarObject.java | 12 +-
.../tobago/example/demo/BehaviorController.java | 4 +-
.../tobago/example/demo/BootstrapUtils.java | 2 +-
.../example/demo/CollapsibleBoxController.java | 2 +-
.../tobago/example/demo/CollapsibleController.java | 2 +-
.../example/demo/CollapsiblePanelController.java | 2 +-
.../example/demo/CollapsiblePopupController.java | 2 +-
.../example/demo/CollapsibleSectionController.java | 2 +-
.../tobago/example/demo/ConversionController.java | 2 +-
.../example/demo/CurrentValueController.java | 4 +-
.../tobago/example/demo/DateController.java | 10 +-
.../example/demo/DefaultCommandController.java | 6 +-
.../example/demo/DeltaSpikeClientWindowConfig.java | 2 +-
.../tobago/example/demo/DemoController.java | 4 +-
.../tobago/example/demo/EventController.java | 14 +-
.../tobago/example/demo/ExceptionController.java | 6 +-
.../example/demo/ExceptionHandlerController.java | 8 +-
.../tobago/example/demo/ExecuteController.java | 8 +-
.../tobago/example/demo/ForEachController.java | 8 +-
.../tobago/example/demo/FormAjaxController.java | 6 +-
.../tobago/example/demo/FormController.java | 4 +-
.../example/demo/FormRequiredController.java | 6 +-
.../tobago/example/demo/GroupController.java | 14 +-
.../myfaces/tobago/example/demo/InController.java | 4 +-
.../tobago/example/demo/LocaleController.java | 4 +-
.../apache/myfaces/tobago/example/demo/Login.java | 4 +-
.../tobago/example/demo/ManifestReader.java | 2 +-
.../example/demo/MessageLayoutController.java | 2 +-
.../tobago/example/demo/MetaController.java | 2 +-
.../tobago/example/demo/NavigationNode.java | 2 +-
.../tobago/example/demo/NavigationState.java | 2 +-
.../tobago/example/demo/NavigationTree.java | 2 +-
.../tobago/example/demo/OldLinksServlet.java | 6 +-
.../tobago/example/demo/PanelController.java | 2 +-
.../example/demo/PartialReloadController.java | 2 +-
.../myfaces/tobago/example/demo/PlanetExample.java | 2 +-
.../tobago/example/demo/PopupController.java | 6 +-
.../demo/PrettyUrlForMenuNavigationHandler.java | 2 +-
.../tobago/example/demo/ProgressController.java | 8 +-
.../tobago/example/demo/RoleController.java | 2 +-
.../demo/SelectBooleanCheckboxController.java | 12 +-
.../tobago/example/demo/SelectItemModel.java | 2 +-
.../example/demo/SelectManyCheckboxController.java | 8 +-
.../example/demo/SelectManyListboxController.java | 6 +-
.../example/demo/SelectManyShuttleController.java | 4 +-
.../example/demo/SelectOneChoiceController.java | 2 +-
.../example/demo/SelectOneListboxController.java | 4 +-
.../example/demo/SelectOneRadioController.java | 4 +-
.../myfaces/tobago/example/demo/SheetConfig.java | 6 +-
.../tobago/example/demo/SheetController.java | 24 ++--
.../tobago/example/demo/SheetFilterController.java | 36 ++---
.../tobago/example/demo/SourceFileReader.java | 2 +-
.../tobago/example/demo/SplitLayoutController.java | 4 +-
.../tobago/example/demo/SuggestController.java | 6 +-
.../myfaces/tobago/example/demo/TabController.java | 2 +-
.../tobago/example/demo/TestController.java | 24 ++--
.../tobago/example/demo/TextareaController.java | 2 +-
.../tobago/example/demo/ThemeController.java | 4 +-
.../tobago/example/demo/TinyMceController.java | 2 +-
.../example/demo/TreeCommandTypesController.java | 2 +-
.../tobago/example/demo/TreeController.java | 8 +-
.../tobago/example/demo/TreeEditorController.java | 26 ++--
.../tobago/example/demo/TreeSelectController.java | 16 +--
.../tobago/example/demo/UniversalLoggingInfo.java | 26 ++--
.../tobago/example/demo/UploadController.java | 14 +-
.../tobago/example/demo/ValidationController.java | 10 +-
.../example/demo/ValidationJsr303Controller.java | 4 +-
.../actionlistener/SimpleTabChangeListener.java | 2 +-
.../example/demo/nonfacesrequest/FishPond.java | 2 +-
.../tobago/example/test/DateController.java | 4 +-
.../tobago/example/demo/ArquillianTest.java | 4 +-
.../tobago/example/demo/NavigationUnitTest.java | 2 +-
.../myfaces/tobago/example/demo/QUnitTests.java | 144 ++++++++++----------
.../renderkit/css/BootstrapClassUnitTest.java | 12 +-
.../myfaces/tobago/apt/generate/ComponentInfo.java | 2 +-
.../apt/processor/CheckstyleConfigGenerator.java | 8 +-
.../tobago/apt/processor/ClassesGenerator.java | 2 +-
.../tobago/apt/processor/TaglibGenerator.java | 8 +-
214 files changed, 950 insertions(+), 950 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 ad929a7..858706d 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
@@ -397,7 +397,7 @@ public enum Attributes {
this(null);
}
- Attributes(String explicit) {
+ Attributes(final String explicit) {
this.explicit = explicit;
}
@@ -409,10 +409,10 @@ public enum Attributes {
}
}
- public static Attributes valueOfFailsafe(String name) {
+ public static Attributes valueOfFailsafe(final String name) {
try {
return Attributes.valueOf(name);
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
LOG.warn("Can't find enum for {} with name '{}'", Attributes.class.getName(), name);
return null;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/LabelLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/LabelLayout.java
index 47616a0..69256c5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/LabelLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/LabelLayout.java
@@ -86,7 +86,7 @@ public enum LabelLayout {
return (LabelLayout) facesContext.getAttributes().get(SEGMENT_TO_RENDER_KEY);
}
- public static void removeSegment(FacesContext facesContext) {
+ public static void removeSegment(final FacesContext facesContext) {
facesContext.getAttributes().remove(SEGMENT_TO_RENDER_KEY);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
index 1c8438d..c1605d8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
@@ -146,7 +146,7 @@ public class ThemeImpl implements Theme, Serializable {
return productionResources;
}
- public void addResources(final ThemeResources themeResources) {
+ private void addResources(final ThemeResources themeResources) {
checkLocked();
if (themeResources.isProduction()) {
@@ -229,22 +229,22 @@ public class ThemeImpl implements Theme, Serializable {
builder.append("null");
}
builder.append(", \nproductionScripts=[");
- for (String s : productionScripts != null ? productionScripts : new String[0]) {
+ for (final String s : productionScripts != null ? productionScripts : new String[0]) {
builder.append("\n");
builder.append(s);
}
builder.append("], \nscripts=[");
- for (String s : scripts != null ? scripts : new String[0]) {
+ for (final String s : scripts != null ? scripts : new String[0]) {
builder.append("\n");
builder.append(s);
}
builder.append("], \nproductionStyles=[");
- for (String s : productionStyles != null ? productionStyles : new String[0]) {
+ for (final String s : productionStyles != null ? productionStyles : new String[0]) {
builder.append("\n");
builder.append(s);
}
builder.append("], \nstyles=[");
- for (String s : styles != null ? styles : new String[0]) {
+ for (final String s : styles != null ? styles : new String[0]) {
builder.append("\n");
builder.append(s);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResources.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResources.java
index df791ac..4355195 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResources.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResources.java
@@ -36,7 +36,7 @@ public final class ThemeResources implements Serializable {
private final List<ThemeStyle> styleList = new ArrayList<>();
private final List<ThemeStyle> styleExcludes = new ArrayList<>();
- public ThemeResources(boolean production) {
+ public ThemeResources(final boolean production) {
this.production = production;
}
@@ -64,11 +64,11 @@ public final class ThemeResources implements Serializable {
return production;
}
- public boolean addScript(final ThemeScript script, boolean exclude) {
+ public boolean addScript(final ThemeScript script, final boolean exclude) {
return exclude ? scriptExcludes.add(script) : scriptList.add(script);
}
- public boolean addStyle(final ThemeStyle style, boolean exclude) {
+ public boolean addStyle(final ThemeStyle style, final boolean exclude) {
return exclude ? styleExcludes.add(style) : styleList.add(style);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
index da7bd51..061170f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
@@ -77,28 +77,28 @@ public class TobagoBundle extends ResourceBundle {
private Properties props;
- private XmlTobagoBundle(InputStream stream) throws IOException {
+ private XmlTobagoBundle(final InputStream stream) throws IOException {
props = new Properties();
props.loadFromXML(stream);
}
- protected Object handleGetObject(String key) {
+ protected Object handleGetObject(final String key) {
return props.getProperty(key);
}
public Enumeration<String> getKeys() {
- Set<String> handleKeys = props.stringPropertyNames();
+ final Set<String> handleKeys = props.stringPropertyNames();
return Collections.enumeration(handleKeys);
}
public static class XMLResourceBundleControl extends Control {
- public List<String> getFormats(String baseName) {
+ public List<String> getFormats(final String baseName) {
return Collections.singletonList(XML);
}
public ResourceBundle newBundle(
- String baseName, Locale locale, String format, ClassLoader loader, boolean reload)
+ final String baseName, final Locale locale, final String format, final ClassLoader loader, final boolean reload)
throws IllegalAccessException, InstantiationException,
IOException {
@@ -110,24 +110,24 @@ public class TobagoBundle extends ResourceBundle {
return null;
}
- String bundleName = toBundleName(baseName, locale);
- String resourceName = toResourceName(bundleName, format);
- URL url = loader.getResource(resourceName);
+ final String bundleName = toBundleName(baseName, locale);
+ final String resourceName = toResourceName(bundleName, format);
+ final URL url = loader.getResource(resourceName);
if (url == null) {
return null;
}
- URLConnection connection = url.openConnection();
+ final URLConnection connection = url.openConnection();
if (connection == null) {
return null;
}
if (reload) {
connection.setUseCaches(false);
}
- InputStream stream = connection.getInputStream();
+ final InputStream stream = connection.getInputStream();
if (stream == null) {
return null;
}
- BufferedInputStream bis = new BufferedInputStream(stream);
+ final BufferedInputStream bis = new BufferedInputStream(stream);
bundle = new XmlTobagoBundle(bis);
bis.close();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
index 1df4d15..7650a08 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
@@ -67,7 +67,7 @@ public class TobagoContext implements Serializable {
final ExternalContext externalContext = facesContext.getExternalContext();
final String themeName;
- Object request = externalContext.getRequest();
+ final Object request = externalContext.getRequest();
if (request instanceof HttpServletRequest) {
themeName = CookieUtils.getThemeNameFromCookie((HttpServletRequest) request);
} else {
@@ -83,7 +83,7 @@ public class TobagoContext implements Serializable {
return theme;
}
- public void setTheme(Theme theme) {
+ public void setTheme(final Theme theme) {
this.theme = theme;
}
@@ -111,7 +111,7 @@ public class TobagoContext implements Serializable {
return focusId;
}
- public void setFocusId(String focusId) {
+ public void setFocusId(final String focusId) {
this.focusId = focusId;
}
@@ -119,7 +119,7 @@ public class TobagoContext implements Serializable {
return enctype;
}
- public void setEnctype(String enctype) {
+ public void setEnctype(final String enctype) {
this.enctype = enctype;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
index 7ac0df0..dda774c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
@@ -122,7 +122,7 @@ public class DurationConverter implements Converter {
Unit unit;
try {
unit = Unit.valueOf(unitString);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.warn("Unsupported unit: '{}'", unitString);
unit = Unit.milli;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java
index c0b28ba..05635f7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java
@@ -35,24 +35,24 @@ public class ConstantMethodExpression extends MethodExpression implements StateH
public ConstantMethodExpression() {
}
- public ConstantMethodExpression(String outcome) {
+ public ConstantMethodExpression(final String outcome) {
this.outcome = outcome;
}
@Override
- public MethodInfo getMethodInfo(ELContext context)
+ public MethodInfo getMethodInfo(final ELContext context)
throws NullPointerException, ELException {
return null;
}
@Override
- public Object invoke(ELContext context, Object[] params)
+ public Object invoke(final ELContext context, final Object[] params)
throws NullPointerException, ELException {
return outcome;
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -60,7 +60,7 @@ public class ConstantMethodExpression extends MethodExpression implements StateH
return false;
}
- ConstantMethodExpression that = (ConstantMethodExpression) o;
+ final ConstantMethodExpression that = (ConstantMethodExpression) o;
return !(outcome != null ? !outcome.equals(that.outcome) : that.outcome != null);
@@ -82,12 +82,12 @@ public class ConstantMethodExpression extends MethodExpression implements StateH
}
@Override
- public Object saveState(FacesContext context) {
+ public Object saveState(final FacesContext context) {
return outcome;
}
@Override
- public void restoreState(FacesContext context, Object state) {
+ public void restoreState(final FacesContext context, final Object state) {
this.outcome = (String) state;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java
index 7005172..2d75c97 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java
@@ -66,12 +66,12 @@ public class CollapsibleActionListener implements ActionListener, StateHolder {
}
@Override
- public Object saveState(FacesContext context) {
+ public Object saveState(final FacesContext context) {
return forId;
}
@Override
- public void restoreState(FacesContext context, Object state) {
+ public void restoreState(final FacesContext context, final Object state) {
this.forId = (String) state;
}
@@ -81,7 +81,7 @@ public class CollapsibleActionListener implements ActionListener, StateHolder {
}
@Override
- public void setTransient(boolean transientFlag) {
+ public void setTransient(final boolean transientFlag) {
this.transientFlag = transientFlag;
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/EventHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/EventHandler.java
index fefd35e..b2bd917 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/EventHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/EventHandler.java
@@ -78,12 +78,12 @@ public class EventHandler extends TobagoComponentHandler implements BehaviorHold
// todo (see original AjaxHandler impl) private final boolean _wrapMode;
- public EventHandler(ComponentConfig config) {
+ public EventHandler(final ComponentConfig config) {
super(config);
event = getAttribute(Attributes.event.getName());
}
- public void apply(FaceletContext ctx, UIComponent parent)
+ public void apply(final FaceletContext ctx, final UIComponent parent)
throws IOException {
super.apply(ctx, parent);
@@ -133,13 +133,13 @@ public class EventHandler extends TobagoComponentHandler implements BehaviorHold
* to the selected component through ClientBehaviorHolder.getEventNames() or
* ClientBehaviorHolder.getDefaultEventName()
*/
- public void applyAttachedObject(FacesContext context, UIComponent parent) {
+ public void applyAttachedObject(final FacesContext context, final UIComponent parent) {
// Retrieve the current FaceletContext from FacesContext object
- FaceletContext faceletContext = (FaceletContext) context
+ final FaceletContext faceletContext = (FaceletContext) context
.getAttributes().get(FaceletContext.FACELET_CONTEXT_KEY);
// cast to a ClientBehaviorHolder
- ClientBehaviorHolder cvh = (ClientBehaviorHolder) parent;
+ final ClientBehaviorHolder cvh = (ClientBehaviorHolder) parent;
String eventName = getEventName();
if (eventName == null) {
@@ -151,11 +151,11 @@ public class EventHandler extends TobagoComponentHandler implements BehaviorHold
throw new TagAttributeException(event, "event it is not a valid eventName defined for this component");
}
- Map<String, List<ClientBehavior>> clientBehaviors = cvh.getClientBehaviors();
+ final Map<String, List<ClientBehavior>> clientBehaviors = cvh.getClientBehaviors();
- List<ClientBehavior> clientBehaviorList = clientBehaviors.get(eventName);
+ final List<ClientBehavior> clientBehaviorList = clientBehaviors.get(eventName);
if (clientBehaviorList != null && !clientBehaviorList.isEmpty()) {
- for (ClientBehavior cb : clientBehaviorList) {
+ for (final ClientBehavior cb : clientBehaviorList) {
if (cb instanceof AjaxBehavior) {
// The most inner one has been applied, so according to
// jsf 2.0 spec section 10.4.1.1 it is not necessary to apply
@@ -166,17 +166,17 @@ public class EventHandler extends TobagoComponentHandler implements BehaviorHold
}
}
- EventBehavior ajaxBehavior = createBehavior(context);
+ final EventBehavior ajaxBehavior = createBehavior(context);
cvh.addClientBehavior(eventName, ajaxBehavior);
}
- protected EventBehavior createBehavior(FacesContext context) {
+ protected EventBehavior createBehavior(final FacesContext context) {
return (EventBehavior) context.getApplication().createBehavior(EventBehavior.BEHAVIOR_ID);
}
@Override
- public void onComponentCreated(FaceletContext faceletContext, UIComponent component, UIComponent parent) {
+ public void onComponentCreated(final FaceletContext faceletContext, final UIComponent component, final UIComponent parent) {
super.onComponentCreated(faceletContext, component, parent);
final UIEvent event = (UIEvent) component;
@@ -207,11 +207,11 @@ public class EventHandler extends TobagoComponentHandler implements BehaviorHold
public AjaxBehaviorListenerImpl() {
}
- public AjaxBehaviorListenerImpl(MethodExpression expr) {
+ public AjaxBehaviorListenerImpl(final MethodExpression expr) {
expression = expr;
}
- public void processAjaxBehavior(AjaxBehaviorEvent event)
+ public void processAjaxBehavior(final AjaxBehaviorEvent event)
throws AbortProcessingException {
expression.invoke(FacesContext.getCurrentInstance().getELContext(),
new Object[]{event});
@@ -221,21 +221,21 @@ public class EventHandler extends TobagoComponentHandler implements BehaviorHold
return transientBoolean;
}
- public void restoreState(FacesContext context, Object state) {
+ public void restoreState(final FacesContext context, final Object state) {
if (state == null) {
return;
}
expression = (MethodExpression) state;
}
- public Object saveState(FacesContext context) {
+ public Object saveState(final FacesContext context) {
if (initialStateMarked()) {
return null;
}
return expression;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
transientBoolean = newTransientValue;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
index 4bbcc1c..8c3a807 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
@@ -56,7 +56,7 @@ public class GridLayoutConstraintHandler extends TagHandler {
}
@Override
- public void apply(final FaceletContext faceletContext, UIComponent parent) throws IOException {
+ public void apply(final FaceletContext faceletContext, final UIComponent parent) throws IOException {
final Map<String, Object> attributes = parent.getAttributes();
if (columnSpan != null) {
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 f5c3398..bd8b45f 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
@@ -46,7 +46,7 @@ public class SegmentLayoutConstraintHandler extends TagHandler {
private final TagAttribute offsetLarge;
private final TagAttribute offsetExtraLarge;
- public SegmentLayoutConstraintHandler(TagConfig config) {
+ public SegmentLayoutConstraintHandler(final TagConfig config) {
super(config);
overwriteExtraSmall = getAttribute(Attributes.extraSmall.getName());
overwriteSmall = getAttribute(Attributes.small.getName());
@@ -66,7 +66,7 @@ public class SegmentLayoutConstraintHandler extends TagHandler {
}
@Override
- public void apply(FaceletContext faceletContext, UIComponent parent) throws IOException {
+ public void apply(final FaceletContext faceletContext, final UIComponent parent) throws IOException {
apply(faceletContext, parent, overwriteExtraSmall, Attributes.overwriteExtraSmall, Integer.TYPE);
apply(faceletContext, parent, overwriteSmall, Attributes.overwriteSmall, Integer.TYPE);
apply(faceletContext, parent, overwriteMedium, Attributes.overwriteMedium, Integer.TYPE);
@@ -86,8 +86,8 @@ public class SegmentLayoutConstraintHandler extends TagHandler {
apply(faceletContext, parent, offsetExtraLarge, Attributes.offsetExtraLarge, Integer.TYPE);
}
- private void apply(FaceletContext faceletContext, 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/SpanHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SpanHandler.java
index 171d5b9..5faa1f7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SpanHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SpanHandler.java
@@ -28,7 +28,7 @@ import javax.faces.view.facelets.TagConfig;
@Deprecated
public class SpanHandler extends GridLayoutConstraintHandler {
- public SpanHandler(TagConfig config) {
+ public SpanHandler(final TagConfig config) {
super(config);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
index 4d34530..aa1781e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
@@ -38,7 +38,7 @@ public class SupportsMarkupRule extends MetaRule {
@Override
public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(Visual.class)) {
- Attributes a = Attributes.valueOfFailsafe(name);
+ final Attributes a = Attributes.valueOfFailsafe(name);
if (Attributes.markup == a) {
return new SupportsMarkupMapper(attribute);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
index 006b6a4..73850cf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
@@ -87,16 +87,16 @@ public class TobagoComponentHandler extends ComponentHandler {
if (validators.length > 0) {
final Set<String> classNames = new HashSet<>();
// collect classNames of validators
- for (Validator validator : validators) {
+ for (final Validator validator : validators) {
classNames.add(validator.getClass().getName());
}
- for (Map.Entry<String, String> entry : validatorInfoMap.entrySet()) {
- if (!classNames.contains(entry.getValue())) {
- component.addValidator(context.getApplication().createValidator((String) entry.getKey()));
+ validatorInfoMap.forEach((key, value) -> {
+ if (!classNames.contains(value)) {
+ component.addValidator(context.getApplication().createValidator(key));
}
- }
+ });
} else {
- for (String next : validatorInfoMap.keySet()) {
+ for (final String next : validatorInfoMap.keySet()) {
component.addValidator(context.getApplication().createValidator(next));
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/AttachedListStateWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/AttachedListStateWrapper.java
index 235f38f..4dcbe6c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/AttachedListStateWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/AttachedListStateWrapper.java
@@ -33,7 +33,7 @@ class AttachedListStateWrapper implements Serializable {
private List<Object> wrappedStateList;
- AttachedListStateWrapper(List<Object> wrappedStateList) {
+ AttachedListStateWrapper(final List<Object> wrappedStateList) {
this.wrappedStateList = wrappedStateList;
}
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 b4d75ed..41fb68c 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
@@ -33,7 +33,7 @@ class AttachedStateWrapper implements Serializable {
/**
* @param clazz null means wrappedStateObject is a List of state objects
*/
- AttachedStateWrapper(Class<?> clazz, Object wrappedStateObject) {
+ AttachedStateWrapper(final Class<?> clazz, final Object wrappedStateObject) {
if (wrappedStateObject != null && !(wrappedStateObject instanceof Serializable)) {
throw new IllegalArgumentException("Attached state for Object of type " + clazz + " (Class "
+ wrappedStateObject.getClass().getName() + ") is not 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 8ad8e09..ea483b7 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
@@ -172,7 +172,7 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
private boolean transientBoolean = false;
- DeltaStateHelper(A target) {
+ DeltaStateHelper(final A target) {
super();
this.target = target;
fullState = new HashMap<>();
@@ -200,7 +200,7 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return target.initialStateMarked();
}
- public void add(Serializable key, Object value) {
+ public void add(final Serializable key, final Object value) {
if (createDeltas()) {
//Track delta case
Map<Object, Boolean> deltaListMapValues = (Map<Object, Boolean>) deltas
@@ -222,12 +222,12 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
fullListValues.add(value);
}
- public Object eval(Serializable key) {
- Object returnValue = fullState.get(key);
+ public Object eval(final Serializable key) {
+ final Object returnValue = fullState.get(key);
if (returnValue != null) {
return returnValue;
}
- ValueExpression expression = target.getValueExpression(key
+ final ValueExpression expression = target.getValueExpression(key
.toString());
if (expression != null) {
return expression.getValue(FacesContext.getCurrentInstance()
@@ -236,12 +236,12 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return null;
}
- public Object eval(Serializable key, Object defaultValue) {
- Object returnValue = fullState.get(key);
+ public Object eval(final Serializable key, final Object defaultValue) {
+ final Object returnValue = fullState.get(key);
if (returnValue != null) {
return returnValue;
}
- ValueExpression expression = target.getValueExpression(key
+ final ValueExpression expression = target.getValueExpression(key
.toString());
if (expression != null) {
return expression.getValue(FacesContext.getCurrentInstance()
@@ -250,11 +250,11 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return defaultValue;
}
- public Object get(Serializable key) {
+ public Object get(final Serializable key) {
return fullState.get(key);
}
- public Object put(Serializable key, Object value) {
+ public Object put(final Serializable key, final Object value) {
Object returnValue = null;
if (createDeltas()) {
if (deltas.containsKey(key)) {
@@ -278,7 +278,7 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return returnValue;
}
- public Object put(Serializable key, String mapKey, Object value) {
+ public Object put(final Serializable key, final String mapKey, final Object value) {
boolean returnSet = false;
Object returnValue = null;
if (createDeltas()) {
@@ -312,7 +312,7 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return returnValue;
}
- public Object remove(Serializable key) {
+ public Object remove(final Serializable key) {
Object returnValue = null;
if (createDeltas()) {
if (deltas.containsKey(key)) {
@@ -330,14 +330,14 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return returnValue;
}
- public Object remove(Serializable key, Object valueOrKey) {
+ public Object remove(final Serializable key, final Object valueOrKey) {
// Comment by lu4242 : The spec javadoc says if it is a Collection
// or Map deal with it. But the intention of this method is work
// with add(?,?) and put(?,?,?), this ones return instances of
// InternalMap and InternalList to prevent mixing, so to be
// consistent we'll cast to those classes here.
- Object collectionOrMap = fullState.get(key);
+ final Object collectionOrMap = fullState.get(key);
Object returnValue = null;
if (collectionOrMap instanceof DeltaStateHelper.InternalMap) {
if (createDeltas()) {
@@ -362,10 +362,10 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
}
private static Object removeValueOrKeyFromCollectionDelta(
- Map<Serializable, Object> stateMap, Serializable key,
- Object valueOrKey) {
+ final Map<Serializable, Object> stateMap, final Serializable key,
+ final Object valueOrKey) {
Object returnValue = null;
- Map<Object, Boolean> c = (Map<Object, Boolean>) stateMap.get(key);
+ final Map<Object, Boolean> c = (Map<Object, Boolean>) stateMap.get(key);
if (c != null) {
if (c.containsKey(valueOrKey)) {
returnValue = valueOrKey;
@@ -376,10 +376,10 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
}
private static Object removeValueOrKeyFromCollection(
- Map<Serializable, Object> stateMap, Serializable key,
- Object valueOrKey) {
+ final Map<Serializable, Object> stateMap, final Serializable key,
+ final Object valueOrKey) {
Object returnValue = null;
- Collection c = (Collection) stateMap.get(key);
+ final Collection c = (Collection) stateMap.get(key);
if (c != null) {
if (c.remove(valueOrKey)) {
returnValue = valueOrKey;
@@ -392,14 +392,14 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
}
private static Object removeValueOrKeyFromMap(
- Map<Serializable, Object> stateMap, Serializable key,
- Object valueOrKey, boolean delta) {
+ final Map<Serializable, Object> stateMap, final Serializable key,
+ final Object valueOrKey, final boolean delta) {
if (valueOrKey == null) {
return null;
}
Object returnValue = null;
- Map<String, Object> map = (Map<String, Object>) stateMap.get(key);
+ final Map<String, Object> map = (Map<String, Object>) stateMap.get(key);
if (map != null) {
if (delta) {
// Keep track of the removed values using key/null pair on the delta map
@@ -430,8 +430,8 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
* <p>
* the internal Map again is then mapped to a map with key value pairs
*/
- public Object saveState(FacesContext context) {
- Map serializableMap = (isInitialStateMarked()) ? deltas : fullState;
+ public Object saveState(final FacesContext context) {
+ final Map serializableMap = (isInitialStateMarked()) ? deltas : fullState;
if (serializableMap == null || serializableMap.size() == 0) {
return null;
@@ -453,22 +453,22 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
Map.Entry<Serializable, Object> entry;
//entry == key, value, key, value
- Object[] retArr = new Object[serializableMap.entrySet().size() * 2];
+ final Object[] retArr = new Object[serializableMap.entrySet().size() * 2];
//Object[] retArr = new Object[serializableMap.entrySet().size() * 2 + stateHolderKeyCount];
- Iterator<Map.Entry<Serializable, Object>> it = serializableMap.entrySet().iterator();
+ final Iterator<Map.Entry<Serializable, Object>> it = serializableMap.entrySet().iterator();
int cnt = 0;
while (it.hasNext()) {
entry = it.next();
retArr[cnt] = entry.getKey();
- Object value = entry.getValue();
+ final Object value = entry.getValue();
// The condition in which the call to saveAttachedState
// is to handle List, StateHolder or non Serializable instances.
// we check it here, to prevent unnecessary calls.
if (value instanceof StateHolder || value instanceof List || !(value instanceof Serializable)) {
- Object savedValue = saveAttachedState(context, value);
+ final Object savedValue = saveAttachedState(context, value);
retArr[cnt + 1] = savedValue;
} else {
retArr[cnt + 1] = value;
@@ -512,12 +512,12 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return retArr;
}
- public void restoreState(FacesContext context, Object state) {
+ public void restoreState(final FacesContext context, final Object state) {
if (state == null) {
return;
}
- Object[] serializedState = (Object[]) state;
+ final Object[] serializedState = (Object[]) state;
if (!isInitialStateMarked() && !fullState.isEmpty()) {
fullState.clear();
@@ -527,15 +527,15 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
}
for (int cnt = 0; cnt < serializedState.length; cnt += 2) {
- Serializable key = (Serializable) serializedState[cnt];
- Object savedValue = restoreAttachedState(context,
+ final Serializable key = (Serializable) serializedState[cnt];
+ final Object savedValue = restoreAttachedState(context,
serializedState[cnt + 1]);
if (isInitialStateMarked()) {
if (savedValue instanceof DeltaStateHelper.InternalDeltaListMap) {
- for (Map.Entry<Object, Boolean> mapEntry : ((Map<Object, Boolean>) savedValue)
+ for (final Map.Entry<Object, Boolean> mapEntry : ((Map<Object, Boolean>) savedValue)
.entrySet()) {
- boolean addOrRemove = mapEntry.getValue();
+ final boolean addOrRemove = mapEntry.getValue();
if (addOrRemove) {
//add
this.add(key, mapEntry.getKey());
@@ -545,7 +545,7 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
}
}
} else if (savedValue instanceof DeltaStateHelper.InternalMap) {
- for (Map.Entry<String, Object> mapEntry : ((Map<String, Object>) savedValue)
+ for (final Map.Entry<String, Object> mapEntry : ((Map<String, Object>) savedValue)
.entrySet()) {
this.put(key, mapEntry.getKey(), mapEntry.getValue());
}
@@ -568,7 +568,7 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
}
}
- public void setTransient(boolean transientValue) {
+ public void setTransient(final boolean transientValue) {
transientBoolean = transientValue;
}
@@ -579,15 +579,15 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
super();
}
- InternalMap(int initialCapacity, float loadFactor) {
+ InternalMap(final int initialCapacity, final float loadFactor) {
super(initialCapacity, loadFactor);
}
- InternalMap(Map<? extends K, ? extends V> m) {
+ InternalMap(final Map<? extends K, ? extends V> m) {
super(m);
}
- InternalMap(int initialSize) {
+ InternalMap(final int initialSize) {
super(initialSize);
}
@@ -595,23 +595,23 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return false;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
// No op
}
- public void restoreState(FacesContext context, Object state) {
- Object[] listAsMap = (Object[]) state;
+ public void restoreState(final FacesContext context, final Object state) {
+ final Object[] listAsMap = (Object[]) state;
for (int cnt = 0; cnt < listAsMap.length; cnt += 2) {
this.put((K) listAsMap[cnt], (V) UIComponentBase.restoreAttachedState(context, listAsMap[cnt + 1]));
}
}
- public Object saveState(FacesContext context) {
+ public Object saveState(final FacesContext context) {
int cnt = 0;
- Object[] mapArr = new Object[this.size() * 2];
- for (Map.Entry<K, V> entry : this.entrySet()) {
+ final Object[] mapArr = new Object[this.size() * 2];
+ for (final Map.Entry<K, V> entry : this.entrySet()) {
mapArr[cnt] = entry.getKey();
- Object value = entry.getValue();
+ final Object value = entry.getValue();
if (value instanceof StateHolder || value instanceof List || !(value instanceof Serializable)) {
mapArr[cnt + 1] = saveAttachedState(context, value);
@@ -633,15 +633,15 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
super();
}
- InternalDeltaListMap(int initialCapacity, float loadFactor) {
+ InternalDeltaListMap(final int initialCapacity, final float loadFactor) {
super(initialCapacity, loadFactor);
}
- InternalDeltaListMap(int initialSize) {
+ InternalDeltaListMap(final int initialSize) {
super(initialSize);
}
- InternalDeltaListMap(Map<? extends K, ? extends V> m) {
+ InternalDeltaListMap(final Map<? extends K, ? extends V> m) {
super(m);
}
}
@@ -651,11 +651,11 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
super();
}
- InternalList(Collection<? extends T> c) {
+ InternalList(final Collection<? extends T> c) {
super(c);
}
- InternalList(int initialSize) {
+ InternalList(final int initialSize) {
super(initialSize);
}
@@ -663,22 +663,22 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return false;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
}
- public void restoreState(FacesContext context, Object state) {
- Object[] listAsArr = (Object[]) state;
+ public void restoreState(final FacesContext context, final Object state) {
+ final Object[] listAsArr = (Object[]) state;
//since all other options would mean dual iteration
//we have to do it the hard way
- for (Object elem : listAsArr) {
+ for (final Object elem : listAsArr) {
add((T) restoreAttachedState(context, elem));
}
}
- public Object saveState(FacesContext context) {
- Object[] values = new Object[size()];
+ public Object saveState(final FacesContext context) {
+ final Object[] values = new Object[size()];
for (int i = 0; i < size(); i++) {
- Object value = get(i);
+ final Object value = get(i);
if (value instanceof StateHolder || value instanceof List || !(value instanceof Serializable)) {
values[i] = saveAttachedState(context, value);
@@ -690,7 +690,7 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
}
}
- private static Object saveAttachedState(FacesContext context, Object attachedObject) {
+ private static Object saveAttachedState(final FacesContext context, final Object attachedObject) {
if (context == null) {
throw new NullPointerException("context");
}
@@ -701,15 +701,15 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
// StateHolder interface should take precedence over
// List children
if (attachedObject instanceof StateHolder) {
- StateHolder holder = (StateHolder) attachedObject;
+ final StateHolder holder = (StateHolder) attachedObject;
if (holder.isTransient()) {
return null;
}
return new AttachedStateWrapper(attachedObject.getClass(), holder.saveState(context));
} else if (attachedObject instanceof List) {
- List<Object> lst = new ArrayList<>(((List<?>) attachedObject).size());
- for (Object item : (List<?>) attachedObject) {
+ final List<Object> lst = new ArrayList<>(((List<?>) attachedObject).size());
+ for (final Object item : (List<?>) attachedObject) {
if (item != null) {
lst.add(saveAttachedState(context, item));
}
@@ -723,7 +723,7 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
}
}
- private static Object restoreAttachedState(FacesContext context, Object stateObj) throws IllegalStateException {
+ private static Object restoreAttachedState(final FacesContext context, final Object stateObj) throws IllegalStateException {
if (context == null) {
throw new NullPointerException("context");
}
@@ -731,28 +731,28 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return null;
}
if (stateObj instanceof AttachedListStateWrapper) {
- List<Object> lst = ((AttachedListStateWrapper) stateObj).getWrappedStateList();
- List<Object> restoredList = new ArrayList<>(lst.size());
- for (Object item : lst) {
+ final List<Object> lst = ((AttachedListStateWrapper) stateObj).getWrappedStateList();
+ final List<Object> restoredList = new ArrayList<>(lst.size());
+ for (final Object item : lst) {
restoredList.add(restoreAttachedState(context, item));
}
return restoredList;
} else if (stateObj instanceof AttachedStateWrapper) {
- Class<?> clazz = ((AttachedStateWrapper) stateObj).getClazz();
- Object restoredObject;
+ final Class<?> clazz = ((AttachedStateWrapper) stateObj).getClazz();
+ final Object restoredObject;
try {
restoredObject = clazz.newInstance();
- } catch (InstantiationException e) {
+ } catch (final InstantiationException e) {
throw new RuntimeException("Could not restore StateHolder of type " + clazz.getName()
+ " (missing no-args constructor?)", e);
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
throw new RuntimeException(e);
}
if (restoredObject instanceof StateHolder) {
- AttachedStateWrapper wrapper = (AttachedStateWrapper) stateObj;
- Object wrappedState = wrapper.getWrappedStateObject();
+ final AttachedStateWrapper wrapper = (AttachedStateWrapper) stateObj;
+ final Object wrappedState = wrapper.getWrappedStateObject();
- StateHolder holder = (StateHolder) restoredObject;
+ final StateHolder holder = (StateHolder) restoredObject;
holder.restoreState(context, wrappedState);
}
return restoredObject;
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 5faafbe..d09650f 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
@@ -80,11 +80,11 @@ public class EventBehavior extends ClientBehaviorBase {
super();
}
- public void addAjaxBehaviorListener(AjaxBehaviorListener listener) {
+ public void addAjaxBehaviorListener(final AjaxBehaviorListener listener) {
super.addBehaviorListener(listener);
}
- public void removeAjaxBehaviorListener(AjaxBehaviorListener listener) {
+ public void removeAjaxBehaviorListener(final AjaxBehaviorListener listener) {
removeBehaviorListener(listener);
}
@@ -95,7 +95,7 @@ public class EventBehavior extends ClientBehaviorBase {
return evalForCollection(ATTR_EXECUTE);
}
- public void setExecute(Collection<String> execute) {
+ public void setExecute(final Collection<String> execute) {
getStateHelper().put(ATTR_EXECUTE, execute);
}
@@ -103,7 +103,7 @@ public class EventBehavior extends ClientBehaviorBase {
return (String) getStateHelper().eval(ATTR_ON_ERROR);
}
- public void setOnerror(String onError) {
+ public void setOnerror(final String onError) {
getStateHelper().put(ATTR_ON_ERROR, onError);
}
@@ -111,7 +111,7 @@ public class EventBehavior extends ClientBehaviorBase {
return (String) getStateHelper().eval(ATTR_ON_EVENT);
}
- public void setOnevent(String onEvent) {
+ public void setOnevent(final String onEvent) {
getStateHelper().put(ATTR_ON_EVENT, onEvent);
}
@@ -122,18 +122,18 @@ public class EventBehavior extends ClientBehaviorBase {
return evalForCollection(ATTR_RENDER);
}
- public void setRender(Collection<String> render) {
+ public void setRender(final Collection<String> render) {
getStateHelper().put(ATTR_RENDER, render);
}
@SuppressWarnings("unchecked")
- public ValueExpression getValueExpression(String name) {
+ public ValueExpression getValueExpression(final String name) {
//return getValueExpressionMap().get(name);
if (name == null) {
throw new NullPointerException("name can not be null");
}
- Map<String, Object> bindings = (Map<String, Object>) getStateHelper().
+ final Map<String, Object> bindings = (Map<String, Object>) getStateHelper().
get(EventBehavior.PropertyKeys.bindings);
if (bindings != null) {
return (ValueExpression) bindings.get(name);
@@ -142,7 +142,7 @@ public class EventBehavior extends ClientBehaviorBase {
}
}
- public void setValueExpression(String name, ValueExpression expression) {
+ public void setValueExpression(final String name, final ValueExpression expression) {
/*
if (item == null)
{
@@ -171,7 +171,7 @@ public class EventBehavior extends ClientBehaviorBase {
return retVal;
}
- public void setDisabled(boolean disabled) {
+ public void setDisabled(final boolean disabled) {
getStateHelper().put(ATTR_DISABLED, disabled);
}
@@ -181,7 +181,7 @@ public class EventBehavior extends ClientBehaviorBase {
return retVal;
}
- public void setImmediate(boolean immediate) {
+ public void setImmediate(final boolean immediate) {
getStateHelper().put(ATTR_IMMEDIATE, immediate);
}
@@ -200,11 +200,11 @@ public class EventBehavior extends ClientBehaviorBase {
}
@Override
- public void restoreState(FacesContext facesContext, Object o) {
+ public void restoreState(final FacesContext facesContext, final Object o) {
if (o == null) {
return;
}
- Object[] values = (Object[]) o;
+ final Object[] values = (Object[]) o;
if (values[0] != null) {
super.restoreState(facesContext, values[0]);
}
@@ -222,7 +222,7 @@ public class EventBehavior extends ClientBehaviorBase {
* @param create if true a state helper is created if not already existing
* @return an implementation of the StateHelper interface or null if none exists and create is set to false
*/
- private StateHelper getStateHelper(boolean create) {
+ private StateHelper getStateHelper(final boolean create) {
if (stateHelper != null) {
return stateHelper;
}
@@ -233,11 +233,11 @@ public class EventBehavior extends ClientBehaviorBase {
}
@Override
- public Object saveState(FacesContext facesContext) {
+ public Object saveState(final FacesContext facesContext) {
if (initialStateMarked()) {
- Object parentSaved = super.saveState(facesContext);
+ final Object parentSaved = super.saveState(facesContext);
Object stateHelperSaved = null;
- StateHelper stateHelper = getStateHelper(false);
+ final StateHelper stateHelper = getStateHelper(false);
if (stateHelper != null) {
stateHelperSaved = stateHelper.saveState(facesContext);
}
@@ -248,9 +248,9 @@ public class EventBehavior extends ClientBehaviorBase {
}
return new Object[]{parentSaved, stateHelperSaved};
} else {
- Object[] values = new Object[2];
+ final Object[] values = new Object[2];
values[0] = super.saveState(facesContext);
- StateHelper stateHelper = getStateHelper(false);
+ final StateHelper stateHelper = getStateHelper(false);
if (stateHelper != null) {
values[1] = stateHelper.saveState(facesContext);
}
@@ -271,8 +271,8 @@ public class EventBehavior extends ClientBehaviorBase {
* @return
*/
@SuppressWarnings("unchecked")
- private Collection<String> evalForCollection(String attributeName) {
- Object value = getStateHelper().eval(attributeName);
+ private Collection<String> evalForCollection(final String attributeName) {
+ final Object value = getStateHelper().eval(attributeName);
if (value == null) {
return Collections.emptyList();
} else if (value instanceof Collection) {
@@ -292,7 +292,7 @@ public class EventBehavior extends ClientBehaviorBase {
* @param stringValue
* @return
*/
- private Collection<String> getCollectionFromSpaceSplitString(String stringValue) {
+ private Collection<String> getCollectionFromSpaceSplitString(final String stringValue) {
//@special handling for @all, @none, @form and @this
if (stringValue.equals(VAL_FORM)) {
return VAL_FORM_LIST;
@@ -305,7 +305,7 @@ public class EventBehavior extends ClientBehaviorBase {
}
// not one of the "normal" values - split it and return the Collection
- String[] arrValue = stringValue.split(" ");
+ final String[] arrValue = stringValue.split(" ");
return Arrays.asList(arrValue);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
index 3032d99..6b37774 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
@@ -81,7 +81,7 @@ public abstract class AbstractUICollapsiblePanel extends AbstractUIPanelBase {
public abstract CollapseMode getCollapsedMode();
- public void setSubmittedCollapsed(Boolean submittedCollapsed) {
+ public void setSubmittedCollapsed(final Boolean submittedCollapsed) {
this.submittedCollapsed = submittedCollapsed;
}
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 973b199..5c07171 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
@@ -51,7 +51,7 @@ public abstract class AbstractUICommand extends AbstractUICommandBase
public boolean isParentOfCommands() {
if (parentOfCommands == null) {
parentOfCommands = false;
- for (UIComponent child : getChildren()) {
+ for (final UIComponent child : getChildren()) {
if (child.isRendered()
&& !(child instanceof UIEvent)
&& (child instanceof UICommand || child instanceof UIInput)) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
index 1670265..268c38f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
@@ -46,12 +46,12 @@ public abstract class AbstractUICommandBase extends UICommand
implements ComponentSystemEventListener {
@Override
- public void processEvent(ComponentSystemEvent event) {
+ public void processEvent(final ComponentSystemEvent event) {
super.processEvent(event);
if (event instanceof PostAddToViewEvent) {
final List<AbstractUIOperation> list = ComponentUtils.findDescendantList(this, AbstractUIOperation.class);
- for (AbstractUIOperation operation : list) {
+ for (final AbstractUIOperation operation : list) {
addActionListener(new CollapsibleActionListener(operation.getFor()));
}
}
@@ -126,7 +126,7 @@ public abstract class AbstractUICommandBase extends UICommand
return true;
}
- public void setDisabled(boolean disabled) {
+ public void setDisabled(final boolean disabled) {
getStateHelper().put(AbstractUICommand.PropertyKeys.disabled, disabled);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
index 2e0e864..7295c47 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
@@ -267,14 +267,14 @@ public abstract class AbstractUIData extends javax.faces.component.UIData implem
* This is, because we need to visit the UIRow for each row, which is not done in the base implementation.
*/
@Override
- public boolean visitTree(VisitContext context, VisitCallback callback) {
+ public boolean visitTree(final VisitContext context, final VisitCallback callback) {
if (super.visitTree(context, callback)) {
return true;
}
// save the current row index
- int oldRowIndex = getRowIndex();
+ final int oldRowIndex = getRowIndex();
// set row index to -1 to process the facets and to get the rowless clientId
setRowIndex(-1);
// push the Component to EL
@@ -295,7 +295,7 @@ public abstract class AbstractUIData extends javax.faces.component.UIData implem
}
// visit the children of every child of the UIData that is an instance of UIColumn
for (int i = 0, childCount = getChildCount(); i < childCount; i++) {
- UIComponent child = getChildren().get(i);
+ final UIComponent child = getChildren().get(i);
if (child instanceof AbstractUIRow) {
if (child.visitTree(context, callback)) {
return true;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
index 08e075e..1875f23 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
@@ -59,7 +59,7 @@ public abstract class AbstractUIFlexLayout extends AbstractUILayoutBase implemen
if (tokens.getSize() > 0) {
int i = 0;
- for (UIComponent child : getChildren()) {
+ for (final UIComponent child : getChildren()) {
if (child instanceof Visual) {
if (i >= tokens.getSize()) {
i = 0;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
index 2707490..6f594cc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
@@ -64,7 +64,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase
* Initialize the grid and remove the current width and height values from the component, recursively.
*/
@Override
- public void processEvent(ComponentSystemEvent event) throws AbortProcessingException {
+ public void processEvent(final ComponentSystemEvent event) throws AbortProcessingException {
super.processEvent(event);
@@ -100,7 +100,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase
int rowsCount = initalRowsCount;
// #1 put all components with "gridRow" and "gridColumn" set into the grid cells
- for (UIComponent component : components) {
+ for (final UIComponent component : components) {
final Map<String, Object> attributes = component.getAttributes();
final Integer gridColumn = (Integer) attributes.get(Attributes.gridColumn.getName());
final Integer gridRow = (Integer) attributes.get(Attributes.gridRow.getName());
@@ -134,7 +134,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase
// #2 distribute the rest of the components to the free grid cells
int j = 0;
int i = 0;
- for (UIComponent component : components) {
+ for (final UIComponent component : components) {
final Map<String, Object> attributes = component.getAttributes();
final Integer gridColumn = (Integer) attributes.get(Attributes.gridColumn.getName());
final Integer gridRow = (Integer) attributes.get(Attributes.gridRow.getName());
@@ -159,7 +159,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase
}
// #3 create UIStyle children. TODO: There might be a better way...
- for (UIComponent component : components) {
+ for (final UIComponent component : components) {
final Map<String, Object> attributes = component.getAttributes();
UIStyle style = ComponentUtils.findChild(component, UIStyle.class);
@@ -236,8 +236,8 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase
}
protected UIComponent[][] expand(final UIComponent[][] cells, final Integer minRows, final int step) {
- int rows = (int) Math.ceil((double) minRows / step) * step;
- int columns = cells[0].length;
+ final int rows = (int) Math.ceil((double) minRows / step) * step;
+ final int columns = cells[0].length;
final UIComponent[][] result = new UIComponent[rows][columns];
for (int j = 0; j < cells.length; j++) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java
index c61050c..0dba23b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java
@@ -53,14 +53,14 @@ public abstract class AbstractUIProgress extends UIOutput
}
@Override
- public void processEvent(ComponentSystemEvent event) throws AbortProcessingException {
+ public void processEvent(final ComponentSystemEvent event) throws AbortProcessingException {
super.processEvent(event);
if (event instanceof PreRenderComponentEvent) {
- Object model = getValue();
+ final Object model = getValue();
if (model instanceof BoundedRangeModel) {
- BoundedRangeModel m = (BoundedRangeModel) model;
+ final BoundedRangeModel m = (BoundedRangeModel) model;
rangeValue = (double) m.getValue();
rangeMax = (double) m.getMaximum();
final int min = m.getMinimum();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
index 43649d6..212b0e4e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
@@ -55,7 +55,7 @@ public abstract class AbstractUISection extends AbstractUICollapsiblePanel {
public abstract String getImage();
@Override
- public void encodeBegin(FacesContext context) throws IOException {
+ public void encodeBegin(final FacesContext context) throws IOException {
if (getLevel() == 0) {
final AbstractUISection section = ComponentUtils.findAncestor(getParent(), AbstractUISection.class);
@@ -73,7 +73,7 @@ public abstract class AbstractUISection extends AbstractUICollapsiblePanel {
return level;
}
- public void setLevel(int level) {
+ public void setLevel(final int level) {
this.level = level;
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java
index cd94625..bfc0ef8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java
@@ -33,7 +33,7 @@ public abstract class AbstractUISegmentLayout extends AbstractUILayoutBase imple
@Override
public String toString() {
- StringBuilder builder = new StringBuilder(getClass().getSimpleName());
+ final StringBuilder builder = new StringBuilder(getClass().getSimpleName());
if (getExtraSmall() != null) {
builder.append("\n extraSmall=");
builder.append(getExtraSmall());
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 e4d87cf..bacbf9e 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
@@ -126,7 +126,7 @@ public abstract class AbstractUISheet extends AbstractUIData
public abstract String getColumns();
@Override
- public void processEvent(ComponentSystemEvent event) throws AbortProcessingException {
+ public void processEvent(final ComponentSystemEvent event) throws AbortProcessingException {
super.processEvent(event);
@@ -138,7 +138,7 @@ public abstract class AbstractUISheet extends AbstractUIData
autoLayout = true;
if (columnLayout != null) {
- for (Measure token : columnLayout) {
+ for (final Measure token : columnLayout) {
if (token != Measure.AUTO) {
autoLayout = false;
break;
@@ -338,7 +338,7 @@ public abstract class AbstractUISheet extends AbstractUIData
}
public List<AbstractUIColumnBase> getAllColumns() {
- ArrayList<AbstractUIColumnBase> result = new ArrayList<>();
+ final ArrayList<AbstractUIColumnBase> result = new ArrayList<>();
findColumns(this, result, true);
return result;
}
@@ -394,7 +394,7 @@ public abstract class AbstractUISheet extends AbstractUIData
}
}
- public void init(FacesContext facesContext) {
+ public void init(final FacesContext facesContext) {
sort(facesContext, null);
layoutHeader();
}
@@ -418,8 +418,8 @@ public abstract class AbstractUISheet extends AbstractUIData
for (final UIComponent child : header.getChildren()) {
if (child.isRendered()) {
- int columnSpan = ComponentUtils.getIntAttribute(child, Attributes.columnSpan, 1);
- int rowSpan = ComponentUtils.getIntAttribute(child, Attributes.rowSpan, 1);
+ final int columnSpan = ComponentUtils.getIntAttribute(child, Attributes.columnSpan, 1);
+ final int rowSpan = ComponentUtils.getIntAttribute(child, Attributes.rowSpan, 1);
grid.add(new OriginCell(child), columnSpan, rowSpan);
}
}
@@ -438,7 +438,7 @@ public abstract class AbstractUISheet extends AbstractUIData
? event
: new SortActionEvent(this,
(UIColumn) findComponent(getSheetState(facesContext).getSortedColumnId()))});
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.warn("Sorting not possible!", e);
}
} else {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
index d41bdea..fcd8df2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
@@ -62,7 +62,7 @@ public abstract class AbstractUISuggest
if (expression != null) {
try {
return (String) expression.getValue(FacesContext.getCurrentInstance().getELContext());
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("", e);
return null;
}
@@ -71,12 +71,12 @@ public abstract class AbstractUISuggest
}
}
- public void setQuery(String query) {
+ public void setQuery(final String query) {
final ValueExpression expression = this.getValueExpression("query");
if (expression != null) {
try {
expression.setValue(FacesContext.getCurrentInstance().getELContext(), query);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("query='" + query + "'", e);
}
} else {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
index 06936b0..ad85096 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
@@ -51,7 +51,7 @@ public class ContentSecurityPolicy {
public void merge(final ContentSecurityPolicy other) {
checkLocked();
- for (Map.Entry<String, String> entry : other.directiveMap.entrySet()) {
+ for (final Map.Entry<String, String> entry : other.directiveMap.entrySet()) {
addDirective(entry.getKey(), entry.getValue());
}
mode = other.mode;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
index 0fc09ce..46df385 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
@@ -49,7 +49,7 @@ public class TobagoConfigBuilder {
this.configFragmentList = new ArrayList<>();
}
- public TobagoConfigBuilder(ServletContext servletContext, List<TobagoConfigFragment> configFragmentList) {
+ public TobagoConfigBuilder(final ServletContext servletContext, final List<TobagoConfigFragment> configFragmentList) {
this(servletContext);
this.configFragmentList.addAll(configFragmentList);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
index 156bfbc..307445b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
@@ -169,7 +169,7 @@ public class TobagoConfigFragment {
return sanitizerClass;
}
- public void setSanitizerClass(String sanitizerClass) {
+ public void setSanitizerClass(final String sanitizerClass) {
this.sanitizerClass = sanitizerClass;
}
@@ -177,7 +177,7 @@ public class TobagoConfigFragment {
return sanitizerProperties;
}
- public void setSanitizerProperties(Properties sanitizerProperties) {
+ public void setSanitizerProperties(final Properties sanitizerProperties) {
this.sanitizerProperties = sanitizerProperties;
}
@@ -185,11 +185,11 @@ public class TobagoConfigFragment {
return decodeLineFeed;
}
- public void setDecodeLineFeed(Boolean decodeLineFeed) {
+ public void setDecodeLineFeed(final Boolean decodeLineFeed) {
this.decodeLineFeed = decodeLineFeed;
}
- public void addMimeType(String extension, String type) {
+ public void addMimeType(final String extension, final String type) {
this.mimeTypes.put(extension, type);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
index 8ec966a..0982597 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
@@ -87,7 +87,7 @@ public class TobagoConfigImpl extends TobagoConfig {
protected void lock() {
unmodifiable = true;
supportedThemes = Collections.unmodifiableList(supportedThemes);
- for (Theme theme : supportedThemes) {
+ for (final Theme theme : supportedThemes) {
((ThemeImpl) theme).lock();
}
supportedThemeNames = Collections.unmodifiableList(supportedThemeNames);
@@ -197,7 +197,7 @@ public class TobagoConfigImpl extends TobagoConfig {
return defaultTheme;
}
- protected void addAvailableTheme(ThemeImpl availableTheme) {
+ protected void addAvailableTheme(final ThemeImpl availableTheme) {
checkLocked();
availableThemes.put(availableTheme.getName(), availableTheme);
}
@@ -316,7 +316,7 @@ public class TobagoConfigImpl extends TobagoConfig {
return decodeLineFeed;
}
- public void setDecodeLineFeed(boolean decodeLineFeed) {
+ public void setDecodeLineFeed(final boolean decodeLineFeed) {
checkLocked();
this.decodeLineFeed = decodeLineFeed;
}
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 fecee9c..9229b7d 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
@@ -124,7 +124,7 @@ public class TobagoConfigSorter implements Comparator<TobagoConfigFragment> {
}
// theme definition
- for (ThemeImpl theme : fragment.getThemeDefinitions()) {
+ for (final ThemeImpl theme : fragment.getThemeDefinitions()) {
result.addAvailableTheme(theme);
}
@@ -146,7 +146,7 @@ public class TobagoConfigSorter implements Comparator<TobagoConfigFragment> {
final Sanitizer sanitizer = aClass.newInstance();
sanitizer.setProperties(sanitizerProperties);
result.setSanitizer(sanitizer);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
LOG.error("Can't create sanitizer: '" + sanitizerClass + "'", e);
result.setSanitizer(new IgnoringSanitizer());
}
@@ -278,7 +278,7 @@ public class TobagoConfigSorter implements Comparator<TobagoConfigFragment> {
return null;
}
- private void resolveThemes(TobagoConfigImpl tobagoConfig, Map<String, ThemeImpl> map) {
+ private void resolveThemes(final TobagoConfigImpl tobagoConfig, final Map<String, ThemeImpl> map) {
for (final ThemeImpl theme : map.values()) {
final String fallbackName = theme.getFallbackName();
final ThemeImpl fallback = map.get(fallbackName);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
index 1cf34e1..10f33af 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
@@ -41,7 +41,7 @@ public class DateTimeI18n {
private final String[] dayNamesMin = new String[7];
private final int firstDay;
- private DateTimeI18n(Locale locale) {
+ private DateTimeI18n(final Locale locale) {
LOG.debug("Creating DateTimeI18n for locale: " + locale);
@@ -70,7 +70,7 @@ public class DateTimeI18n {
firstDay = calendar.getFirstDayOfWeek() - 1; // because Java: 1 = Sunday and jQuery UI DatePicker: 0 = Sunday
}
- public static synchronized DateTimeI18n valueOf(Locale locale) {
+ public static synchronized DateTimeI18n valueOf(final Locale locale) {
DateTimeI18n dateTimeI18n;
dateTimeI18n = CACHE.get(locale);
if (dateTimeI18n == null) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java
index 6077454..e935f25 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java
@@ -17,7 +17,7 @@ public class Nonce implements Serializable {
private Nonce() {
}
- public static String getNonce(FacesContext facesContext) {
+ public static String getNonce(final FacesContext facesContext) {
final UIViewRoot viewRoot = facesContext.getViewRoot();
String nonce = (String) viewRoot.getViewMap().get(KEY);
if (nonce == null) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
index 8f73b20..62c95af 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
@@ -69,7 +69,7 @@ public final class LayoutUtils {
* @deprecated since 3.0.0
*/
@Deprecated
- public static UIComponent getLayoutManager(UIComponent component) {
+ public static UIComponent getLayoutManager(final UIComponent component) {
final UIComponent base;
final UIComponent compositeFacet = component.getFacet(UIComponent.COMPOSITE_FACET_NAME);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Collapse.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Collapse.java
index a024216..bbf8119 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Collapse.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Collapse.java
@@ -24,7 +24,7 @@ public class Collapse {
private Action action;
private String forId;
- public Collapse(Action action, String forId) {
+ public Collapse(final Action action, final String forId) {
this.action = action;
this.forId = forId;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Command.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Command.java
index 7c9641e..e615ead 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Command.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Command.java
@@ -87,7 +87,7 @@ public class Command {
command.isOmit());
}
- public Command(final FacesContext facesContext, UIComponent facetComponent, final String focusId) {
+ public Command(final FacesContext facesContext, final UIComponent facetComponent, final String focusId) {
final UIComponent component;
if (facetComponent instanceof UIForm && facetComponent.getChildCount() == 1) {
LOG.warn("Please don't use a form, but a command with immediate=true instead.");
@@ -161,7 +161,7 @@ public class Command {
return execute;
}
- public void setExecute(String execute) {
+ public void setExecute(final String execute) {
if (StringUtils.isNotBlank(execute)) {
this.execute = execute;
}
@@ -171,7 +171,7 @@ public class Command {
return render;
}
- public void setRender(String render) {
+ public void setRender(final String render) {
if (StringUtils.isNotBlank(render)) {
this.render = render;
}
@@ -205,7 +205,7 @@ public class Command {
return collapse;
}
- public void setCollapse(Collapse collapse) {
+ public void setCollapse(final Collapse collapse) {
this.collapse = collapse;
}
@@ -217,7 +217,7 @@ public class Command {
this.omit = omit;
}
- public void merge(Command c) {
+ public void merge(final Command c) {
//XXX TBD: check if this is okay.
// we need at least this for "execute" and "render" in the moment.
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 dd53e53..8c82b08 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
@@ -104,9 +104,9 @@ public class CommandMap {
c1.merge(c2);
}
} else {
- for (Map.Entry<ClientBehaviors, Command> entry : m2.getOther().entrySet()) {
- ClientBehaviors key = entry.getKey();
- Command value = entry.getValue();
+ for (final Map.Entry<ClientBehaviors, Command> entry : m2.getOther().entrySet()) {
+ final ClientBehaviors key = entry.getKey();
+ final Command value = entry.getValue();
if (m1.other.containsKey(key)) {
final Command command = m1.other.get(key);
command.merge(value);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
index cb6f282..38c908a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
@@ -48,7 +48,7 @@ import java.io.IOException;
public class BarRenderer extends RendererBase {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIBar bar = (UIBar) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -80,7 +80,7 @@ public class BarRenderer extends RendererBase {
BootstrapClass.ALIGN_ITEMS_CENTER);
}
- private BootstrapClass getNavbarExpand(Markup markup) {
+ private BootstrapClass getNavbarExpand(final Markup markup) {
if (markup != null) {
if (markup.contains(Markup.EXTRA_LARGE)) {
return BootstrapClass.NAVBAR_EXPAND_XL;
@@ -95,7 +95,7 @@ public class BarRenderer extends RendererBase {
return BootstrapClass.NAVBAR_EXPAND;
}
- private BootstrapClass getNavbarColorScheme(Markup markup) {
+ private BootstrapClass getNavbarColorScheme(final Markup markup) {
if (markup != null) {
if (markup.contains(Markup.DARK)) {
return BootstrapClass.NAVBAR_DARK;
@@ -112,15 +112,15 @@ public class BarRenderer extends RendererBase {
}
@Override
- public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
setRenderTypes(component);
- for (UIComponent child : component.getChildren()) {
+ for (final UIComponent child : component.getChildren()) {
child.encodeAll(facesContext);
}
}
- private void setRenderTypes(UIComponent component) throws IOException {
- for (UIComponent child : component.getChildren()) {
+ private void setRenderTypes(final UIComponent component) throws IOException {
+ for (final UIComponent child : component.getChildren()) {
if (child.isRendered()) {
if (child instanceof AbstractUIForm) {
setRenderTypes(child);
@@ -132,7 +132,7 @@ public class BarRenderer extends RendererBase {
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIBar bar = (UIBar) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UIComponent after = ComponentUtils.getFacet(bar, Facets.after);
@@ -151,7 +151,7 @@ public class BarRenderer extends RendererBase {
}
private void encodeOpener(
- FacesContext facesContext, UIBar bar, TobagoResponseWriter writer, String navbarId) throws IOException {
+ final FacesContext facesContext, final UIBar bar, final TobagoResponseWriter writer, final String navbarId) throws IOException {
final boolean togglerLeft = bar.getMarkup() != null && bar.getMarkup().contains(Markup.TOGGLER_LEFT);
final UIComponent brand = ComponentUtils.getFacet(bar, Facets.brand);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
index fb55198..467ccc0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
@@ -41,7 +41,7 @@ import java.io.IOException;
public class ButtonsRenderer extends RendererBase {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIButtons buttons = (AbstractUIButtons) component;
final Markup markup = buttons.getMarkup();
@@ -70,8 +70,8 @@ public class ButtonsRenderer extends RendererBase {
}
@Override
- public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {
- for (UIComponent child : component.getChildren()) {
+ public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
+ for (final UIComponent child : component.getChildren()) {
if (child.isRendered()) {
if (child instanceof AbstractUIButton) {
child.setRendererType(RendererTypes.ButtonInsideButtons.name());
@@ -84,7 +84,7 @@ public class ButtonsRenderer extends RendererBase {
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
index 164725e..8daea7a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
@@ -55,14 +55,14 @@ public class DateRenderer extends InRenderer {
super.writeAdditionalAttributes(facesContext, writer, date);
writer.writeAttribute(DataAttributes.PATTERN, date.getPattern(), true);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
writer.writeAttribute(DataAttributes.TODAY, sdf.format(new Date()), true);
final DateTimeI18n dateTimeI18n = DateTimeI18n.valueOf(facesContext.getViewRoot().getLocale());
writer.writeAttribute(DataAttributes.DATE_TIME_I18N, JsonUtils.encode(dateTimeI18n), true);
}
@Override
- protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIDate date = (AbstractUIDate) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -80,7 +80,7 @@ public class DateRenderer extends InRenderer {
}
@Override
- public void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
super.encodeEndField(facesContext, component);
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 aadaa9f..203897c 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
@@ -50,7 +50,7 @@ public abstract class DecodingInputRendererBase extends RendererBase {
final Map<String, String> requestParameterMap = facesContext.getExternalContext().getRequestParameterMap();
if (requestParameterMap.containsKey(clientId)) {
- String newValue = requestParameterMap.get(clientId);
+ final String newValue = requestParameterMap.get(clientId);
if (LOG.isDebugEnabled()) {
final boolean password = ComponentUtils.getBooleanAttribute(component, Attributes.password);
LOG.debug("clientId='{}'", clientId);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
index 9996cf6..31ab57f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
@@ -36,7 +36,7 @@ import java.io.IOException;
public class FigureRenderer extends RendererBase {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIFigure figure = (AbstractUIFigure) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.FIGURE);
@@ -56,7 +56,7 @@ public class FigureRenderer extends RendererBase {
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIFigure figure = (AbstractUIFigure) component;
final UIComponent label = ComponentUtils.getFacet(figure, Facets.label);
final String labelString = figure.getLabel();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
index 672fa68..88d96b4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
@@ -60,7 +60,7 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
private static final Logger LOG = LoggerFactory.getLogger(FileRenderer.class);
@Override
- public void processEvent(ComponentSystemEvent event) {
+ public void processEvent(final ComponentSystemEvent event) {
TobagoContext.getInstance(FacesContext.getCurrentInstance()).setEnctype("multipart/form-data");
}
@@ -79,10 +79,10 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
final Object request = facesContext.getExternalContext().getRequest();
if (request instanceof HttpServletRequest) {
try {
- HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+ final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
if (file.isMultiple()) {
- List<Part> parts = new ArrayList<>();
- for (Part part : httpServletRequest.getParts()) {
+ final List<Part> parts = new ArrayList<>();
+ for (final Part part : httpServletRequest.getParts()) {
if (file.getClientId(facesContext).equals(part.getName())) {
LOG.debug("Uploaded file '{}', size={}, type='{}'",
PartUtils.getSubmittedFileName(part), part.getSize(), part.getContentType());
@@ -98,7 +98,7 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
}
file.setSubmittedValue(new HttpPartWrapper(part));
}
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("", e);
file.setValid(false);
}
@@ -110,7 +110,7 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
}
@Override
- protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIFile file = (AbstractUIFile) component;
final String clientId = file.getClientId(facesContext);
@@ -156,7 +156,7 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
writer.writeIdAttribute(fieldId);
writer.writeClassAttribute(TobagoClass.FILE__REAL);
writer.writeNameAttribute(clientId);
- String multiFormat = TobagoResourceBundle.getString(facesContext, "tobago.file.multiFormat");
+ final String multiFormat = TobagoResourceBundle.getString(facesContext, "tobago.file.multiFormat");
writer.writeAttribute(DataAttributes.dynamic("tobago-file-multi-format"), multiFormat, true);
// readonly seems not making sense in browsers.
writer.writeAttribute(HtmlAttributes.DISABLED, file.isDisabled() || file.isReadonly());
@@ -188,7 +188,7 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
private String createAcceptFromValidators(final AbstractUIFile file) {
final StringBuilder builder = new StringBuilder();
- for (Validator validator : file.getValidators()) {
+ for (final Validator validator : file.getValidators()) {
if (validator instanceof FileItemValidator) {
final FileItemValidator fileItemValidator = (FileItemValidator) validator;
for (final String contentType : fileItemValidator.getContentType()) {
@@ -205,13 +205,13 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
}
@Override
- protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
final AbstractUIFile file = (AbstractUIFile) component;
return file.getFieldId(facesContext);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
index e608e96..ba086d6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
@@ -38,7 +38,7 @@ import java.io.IOException;
public class FooterRenderer extends RendererBase {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UIFooter footer = (UIFooter) component;
final Markup markup = footer.getMarkup();
@@ -56,7 +56,7 @@ public class FooterRenderer extends RendererBase {
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.FOOTER);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
index 0f671cd..1ae8f2c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
@@ -38,7 +38,7 @@ import java.io.IOException;
public class HeaderRenderer extends RendererBase {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UIHeader header = (UIHeader) component;
final Markup markup = header.getMarkup();
@@ -59,7 +59,7 @@ public class HeaderRenderer extends RendererBase {
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.HEADER);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java
index bccdef4..41cd243 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java
@@ -34,7 +34,7 @@ import java.io.IOException;
public class HiddenRenderer extends DecodingInputRendererBase {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIHidden hidden = (AbstractUIHidden) component;
final String clientId = hidden.getClientId(facesContext);
@@ -57,7 +57,7 @@ public class HiddenRenderer extends DecodingInputRendererBase {
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.INPUT);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java
index 522dcf2..ed39fea 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java
@@ -47,7 +47,7 @@ public class ImageRenderer extends RendererBase {
final AbstractUIImage image = (AbstractUIImage) component;
final String value = image.getUrl();
- boolean fontAwesome = StringUtils.startsWith(value, "fa-");
+ final boolean fontAwesome = StringUtils.startsWith(value, "fa-");
final boolean disabled = image.isDisabled()
|| (image.getParent() instanceof AbstractUICommandBase
&& ((AbstractUICommandBase) image.getParent()).isDisabled());
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 af08849..0c7a44f 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
@@ -58,7 +58,7 @@ public class InRenderer extends MessageLayoutRendererBase {
private static final Logger LOG = LoggerFactory.getLogger(InRenderer.class);
@Override
- protected void encodeBeginField(FacesContext facesContext, UIComponent component)
+ protected void encodeBeginField(final FacesContext facesContext, final UIComponent component)
throws IOException {
final AbstractUIInput input = (AbstractUIInput) component;
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, input);
@@ -120,7 +120,7 @@ public class InRenderer extends MessageLayoutRendererBase {
maxLength = lengthValidator.getMaximum();
minLength = lengthValidator.getMinimum();
} else if (validator instanceof RegexValidator) {
- RegexValidator regexValidator = (RegexValidator) validator;
+ final RegexValidator regexValidator = (RegexValidator) validator;
pattern = regexValidator.getPattern();
}
}
@@ -165,8 +165,8 @@ public class InRenderer extends MessageLayoutRendererBase {
}
}
- private void encodeGroupAddon(FacesContext facesContext, TobagoResponseWriter writer, UIComponent addon,
- boolean isAfterFacet) throws IOException {
+ private void encodeGroupAddon(final FacesContext facesContext, final TobagoResponseWriter writer, final UIComponent addon,
+ final boolean isAfterFacet) throws IOException {
if (addon != null) {
final List<UIComponent> children;
if (addon instanceof UIPanel) {
@@ -174,7 +174,7 @@ public class InRenderer extends MessageLayoutRendererBase {
} else {
children = Collections.singletonList(addon);
}
- for (UIComponent child : children) {
+ for (final UIComponent child : children) {
if (child instanceof AbstractUIButton && ((AbstractUIButton) child).isParentOfCommands()) {
if (isAfterFacet) {
child.setRendererType(RendererTypes.ButtonInsideInAfter.name());
@@ -204,7 +204,7 @@ public class InRenderer extends MessageLayoutRendererBase {
}
@Override
- protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
}
protected TobagoClass getRendererCssClass() {
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 43dbdc4..b4044a9 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
@@ -92,7 +92,7 @@ public abstract class LabelLayoutRendererBase extends DecodingInputRendererBase
// render the styles here, because inside of <select> its not possible.
if (component.getRendersChildren()) {
final List<AbstractUIStyle> children = ComponentUtils.findDescendantList(component, AbstractUIStyle.class);
- for (AbstractUIStyle child : children) {
+ for (final AbstractUIStyle child : children) {
child.encodeAll(facesContext);
}
}
@@ -101,10 +101,10 @@ public abstract class LabelLayoutRendererBase extends DecodingInputRendererBase
}
@Override
- public void encodeChildren(FacesContext context, UIComponent component) throws IOException {
+ public void encodeChildren(final FacesContext context, final UIComponent component) throws IOException {
if (component.getChildCount() > 0) {
for (int i = 0, childCount = component.getChildCount(); i < childCount; i++) {
- UIComponent child = component.getChildren().get(i);
+ final UIComponent child = component.getChildren().get(i);
if (!child.isRendered()) {
continue;
}
@@ -232,7 +232,7 @@ public abstract class LabelLayoutRendererBase extends DecodingInputRendererBase
writer.writeAttribute(HtmlAttributes.FOR, getFieldId(facesContext, component), false);
writer.writeClassAttribute(TobagoClass.LABEL, BootstrapClass.COL_FORM_LABEL);
if (component instanceof SupportsAccessKey) {
- LabelWithAccessKey labelWithAccessKey = new LabelWithAccessKey((SupportsAccessKey) component);
+ final LabelWithAccessKey labelWithAccessKey = new LabelWithAccessKey((SupportsAccessKey) component);
HtmlRendererUtils.writeLabelWithAccessKey(writer, labelWithAccessKey);
} else {
writer.writeText(label);
@@ -241,7 +241,7 @@ public abstract class LabelLayoutRendererBase extends DecodingInputRendererBase
}
}
- private LabelLayout getType(UIComponent component) {
+ private LabelLayout getType(final UIComponent component) {
return component instanceof SupportsLabelLayout
? ((SupportsLabelLayout) component).getLabelLayout()
: LabelLayout.skip;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelRenderer.java
index 08eb2e8..78f91be 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelRenderer.java
@@ -47,7 +47,7 @@ import java.io.IOException;
public class LabelRenderer extends RendererBase implements ComponentSystemEventListener {
@Override
- public void processEvent(ComponentSystemEvent event) {
+ public void processEvent(final ComponentSystemEvent event) {
ComponentUtils.evaluateAutoFor(event.getComponent(), UIInput.class);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
index 695fa8e..565e04f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
@@ -38,7 +38,7 @@ import java.io.IOException;
public class LinksRenderer extends RendererBase {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUILinks links = (AbstractUILinks) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -54,10 +54,10 @@ public class LinksRenderer extends RendererBase {
}
@Override
- public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
- for (UIComponent child : component.getChildren()) {
+ for (final UIComponent child : component.getChildren()) {
if (child.isRendered()) {
if (child instanceof AbstractUILink) {
child.setRendererType(RendererTypes.LinkInsideLinks.name());
@@ -73,7 +73,7 @@ public class LinksRenderer extends RendererBase {
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.UL);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
index 824930c..a369767 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
@@ -101,7 +101,7 @@ public abstract class MessageLayoutRendererBase extends LabelLayoutRendererBase
int warningCount = 0;
int informationCount = 0;
- for (FacesMessage message : messages) {
+ for (final FacesMessage message : messages) {
if (FacesMessage.SEVERITY_FATAL.equals(message.getSeverity())) {
fatalCount++;
} else if (FacesMessage.SEVERITY_ERROR.equals(message.getSeverity())) {
@@ -113,7 +113,7 @@ public abstract class MessageLayoutRendererBase extends LabelLayoutRendererBase
}
}
- StringBuilder stringBuilder = new StringBuilder();
+ final StringBuilder stringBuilder = new StringBuilder();
if (messages.size() > 1) {
if (fatalCount > 0) {
@@ -168,8 +168,8 @@ public abstract class MessageLayoutRendererBase extends LabelLayoutRendererBase
}
private String getMessage(final List<FacesMessage> messages) {
- StringBuilder stringBuilder = new StringBuilder();
- for (FacesMessage message : messages) {
+ final StringBuilder stringBuilder = new StringBuilder();
+ for (final FacesMessage message : messages) {
stringBuilder.append(message.getDetail());
stringBuilder.append("\n\n");
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
index e60513f..9e1c298 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
@@ -109,7 +109,7 @@ public class OutRenderer extends MessageLayoutRendererBase {
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
return component.getClientId(facesContext);
}
}
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 312714c..66a6531 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
@@ -183,7 +183,7 @@ public class PageRenderer extends RendererBase {
facesContext, viewRoot.getComponentResources(facesContext, HEAD_TARGET), writer.getCharacterEncoding());
// meta tags
- for (UIComponent metas : headResources.getMetas()) {
+ for (final UIComponent metas : headResources.getMetas()) {
metas.encodeAll(facesContext);
}
@@ -205,7 +205,7 @@ public class PageRenderer extends RendererBase {
}
// style files individual files
- for (UIComponent styles : headResources.getStyles()) {
+ for (final UIComponent styles : headResources.getStyles()) {
styles.encodeAll(facesContext);
}
@@ -237,11 +237,11 @@ public class PageRenderer extends RendererBase {
}
// script files individual files
- for (UIComponent scripts : headResources.getScripts()) {
+ for (final UIComponent scripts : headResources.getScripts()) {
scripts.encodeAll(facesContext);
}
- for (UIComponent misc : headResources.getMisc()) {
+ for (final UIComponent misc : headResources.getMisc()) {
misc.encodeAll(facesContext);
}
@@ -393,7 +393,7 @@ public class PageRenderer extends RendererBase {
HeadResources(
final FacesContext facesContext, final Collection<? extends UIComponent> collection, final String charset) {
- for (UIComponent uiComponent : collection) {
+ for (final UIComponent uiComponent : collection) {
if (uiComponent instanceof AbstractUIMeta) {
metas.add(uiComponent);
} else if (uiComponent instanceof AbstractUIStyle) {
@@ -450,7 +450,7 @@ public class PageRenderer extends RendererBase {
}
private boolean containsCharset(final List<UIComponent> headComponents) {
- for (UIComponent headComponent : headComponents) {
+ for (final UIComponent headComponent : headComponents) {
if (headComponent instanceof AbstractUIMeta
&& ((AbstractUIMeta) headComponent).getCharset() != null) {
return true;
@@ -460,7 +460,7 @@ public class PageRenderer extends RendererBase {
}
private boolean containsNameViewport(final List<UIComponent> headComponents) {
- for (UIComponent headComponent : headComponents) {
+ for (final UIComponent headComponent : headComponents) {
if (headComponent instanceof AbstractUIMeta
&& "viewport".equals(((AbstractUIMeta) headComponent).getName())) {
return true;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
index 2f169dd..5075525 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
@@ -40,7 +40,7 @@ import java.io.IOException;
public class PopupRenderer extends PanelRendererBase {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIPopup popup = (AbstractUIPopup) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -79,7 +79,7 @@ public class PopupRenderer extends PanelRendererBase {
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RowRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RowRenderer.java
index 2e09c16..9c1bc12 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RowRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RowRenderer.java
@@ -28,10 +28,10 @@ public class RowRenderer extends DecodingCommandRendererBase {
// XXX hack to fix TOBAGO-1572
@Override
- protected void commandActivated(UIComponent component) {
+ protected void commandActivated(final UIComponent component) {
AbstractUIEvent event = null;
- for (UIComponent uiComponent : component.getChildren()) {
+ for (final UIComponent uiComponent : component.getChildren()) {
if (uiComponent instanceof AbstractUIEvent) {
event = (AbstractUIEvent) uiComponent;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
index 2b32aed..5413879 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
@@ -57,7 +57,7 @@ public class SectionRenderer extends PanelRendererBase {
section.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, section);
- String label = section.getLabelToRender();
+ final String label = section.getLabelToRender();
final HtmlElements tag;
switch (section.getLevel()) {
case 1:
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
index 8de0959..8cda1d5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
@@ -91,7 +91,7 @@ public class SegmentLayoutRenderer extends RendererBase {
MarginTokens.parse(segmentLayout.getMarginMedium()),
MarginTokens.parse(segmentLayout.getMarginLarge()),
MarginTokens.parse(segmentLayout.getMarginExtraLarge()));
- for (UIComponent child : children) {
+ for (final UIComponent child : children) {
if (child.isRendered()) {
encodeChild(facesContext, writer, generator, child);
}
@@ -123,7 +123,7 @@ public class SegmentLayoutRenderer extends RendererBase {
}
private void encodeDiv(
- FacesContext facesContext, TobagoResponseWriter writer, BootstrapClass.Generator generator, UIComponent child)
+ final FacesContext facesContext, final TobagoResponseWriter writer, final BootstrapClass.Generator generator, final UIComponent child)
throws IOException {
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(null, null, generator.generate(child));
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
index e966938..4a28467 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
@@ -69,7 +69,7 @@ public class SelectBooleanCheckboxRenderer extends MessageLayoutRendererBase {
}
@Override
- protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUISelectBooleanCheckbox select = (AbstractUISelectBooleanCheckbox) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -134,7 +134,7 @@ public class SelectBooleanCheckboxRenderer extends MessageLayoutRendererBase {
}
@Override
- protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.LABEL);
writer.endElement(HtmlElements.DIV);
@@ -149,7 +149,7 @@ public class SelectBooleanCheckboxRenderer extends MessageLayoutRendererBase {
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
final AbstractUISelectBooleanCheckbox select = (AbstractUISelectBooleanCheckbox) component;
return select.getFieldId(facesContext);
}
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 a779602..c36e7bd 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
@@ -93,7 +93,7 @@ public class SelectManyCheckboxRenderer extends SelectManyRendererBase {
writer.writeClassAttribute(BootstrapClass.FORM_CHECK_INPUT);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX);
final String formattedValue = ComponentUtils.getFormattedValue(facesContext, select, item.getValue());
- boolean checked;
+ final boolean checked;
if (submittedValues == null) {
checked = ArrayUtils.contains(values, item.getValue());
} else {
@@ -119,7 +119,7 @@ public class SelectManyCheckboxRenderer extends SelectManyRendererBase {
writer.endElement(HtmlElements.I);
if (item instanceof org.apache.myfaces.tobago.model.SelectItem) {
- org.apache.myfaces.tobago.model.SelectItem tobagoItem = (org.apache.myfaces.tobago.model.SelectItem) item;
+ final org.apache.myfaces.tobago.model.SelectItem tobagoItem = (org.apache.myfaces.tobago.model.SelectItem) item;
final String image = tobagoItem.getImage();
if (image != null) {
@@ -157,7 +157,7 @@ public class SelectManyCheckboxRenderer extends SelectManyRendererBase {
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
return component.getClientId(facesContext);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
index e81b0da..a31192b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
@@ -92,7 +92,7 @@ public class SelectManyListboxRenderer extends SelectManyRendererBase {
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
final UISelectManyListbox select = (UISelectManyListbox) component;
return select.getFieldId(facesContext);
}
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 13ff40e..b250130 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
@@ -87,7 +87,7 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
RenderUtils.decodeClientBehaviors(facesContext, select);
}
- public String[] getSubmittedValues(UIInput input) {
+ public String[] getSubmittedValues(final UIInput input) {
return (String[]) input.getSubmittedValue();
}
@@ -122,8 +122,8 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
static final String COLLECTION_TYPE_KEY = "collectionType";
static final String VALUE_TYPE_KEY = "valueType";
- static Object getConvertedUISelectManyValue(FacesContext facesContext, UISelectMany component,
- String[] submittedValue) throws ConverterException {
+ static Object getConvertedUISelectManyValue(final FacesContext facesContext, final UISelectMany component,
+ final String[] submittedValue) throws ConverterException {
return getConvertedUISelectManyValue(facesContext, component,
submittedValue, false);
}
@@ -140,8 +140,8 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
* @return
* @throws ConverterException
*/
- static Object getConvertedUISelectManyValue(FacesContext facesContext, UISelectMany component,
- String[] submittedValue, 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).
@@ -151,7 +151,7 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
throw new NullPointerException("submittedValue");
}
- ValueExpression expression = component.getValueExpression("value");
+ final ValueExpression expression = component.getValueExpression("value");
Object targetForConvertedValues = null;
// if the component has an attached converter, use it
@@ -163,14 +163,14 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
}
if (expression != null) {
- Class<?> modelType = expression
+ final Class<?> modelType = expression
.getType(facesContext.getELContext());
if (modelType == null) {
// FIXME temporal workaround for MYFACES-2552
return submittedValue;
} else if (modelType.isArray()) {
// the target should be an array
- Class<?> componentType = modelType.getComponentType();
+ final Class<?> componentType = modelType.getComponentType();
// check for optimization if the target is
// a string array --> no conversion needed
if (String.class.equals(componentType)) {
@@ -200,14 +200,14 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
} else if (Collection.class.isAssignableFrom(modelType) || Object.class.equals(modelType)) {
if (converter == null) {
// try to get the by-type-converter from the type of the SelectItems
- SelectItemsIterator iterator = new SelectItemsIterator(component, facesContext);
+ final SelectItemsIterator iterator = new SelectItemsIterator(component, facesContext);
converter = getSelectItemsValueConverter(iterator, facesContext);
}
- Object collectionTypeAttr = component.getAttributes().get(
+ final Object collectionTypeAttr = component.getAttributes().get(
COLLECTION_TYPE_KEY);
if (collectionTypeAttr != null) {
- Class<?> collectionType = getClassFromAttribute(facesContext, collectionTypeAttr);
+ final Class<?> collectionType = getClassFromAttribute(facesContext, collectionTypeAttr);
if (collectionType == null) {
throw new FacesException(
"The attribute "
@@ -228,26 +228,26 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
// now we have a real collectionType --> try to instantiate it
try {
targetForConvertedValues = collectionType.newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new FacesException("The Collection "
+ collectionType.getName()
+ "can not be instantiated.", e);
}
} else if (Collection.class.isAssignableFrom(modelType)) {
// component.getValue() will implement Collection at this point
- Collection<?> componentValue = (Collection<?>) component
+ final Collection<?> componentValue = (Collection<?>) component
.getValue();
// can we clone the Collection
if (componentValue instanceof Cloneable) {
// clone method of Object is protected --> use reflection
try {
- Method cloneMethod = componentValue.getClass()
+ final Method cloneMethod = componentValue.getClass()
.getMethod("clone");
- Collection<?> clone = (Collection<?>) cloneMethod
+ final Collection<?> clone = (Collection<?>) cloneMethod
.invoke(componentValue);
clone.clear();
targetForConvertedValues = clone;
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Could not clone " + componentValue.getClass().getName(), e);
}
}
@@ -260,7 +260,7 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
targetForConvertedValues = (componentValue != null
? componentValue.getClass()
: modelType).newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
// this did not work either
// use the standard concrete type
if (SortedSet.class.isAssignableFrom(modelType)) {
@@ -298,10 +298,10 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
// convert the values with the selected converter (if any)
// and store them in targetForConvertedValues
- boolean isArray = targetForConvertedValues.getClass().isArray();
+ final boolean isArray = targetForConvertedValues.getClass().isArray();
for (int i = 0; i < submittedValue.length; i++) {
// get the value
- Object value;
+ final Object value;
if (converter != null) {
value = converter.getAsObject(facesContext, component,
submittedValue[i]);
@@ -348,7 +348,7 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
if (attr instanceof String) {
try {
type = Class.forName((String) attr);
- } catch (ClassNotFoundException cnfe) {
+ } catch (final ClassNotFoundException cnfe) {
throw new FacesException("Unable to find class " + attr + " on the classpath.", cnfe);
}
} else if (attr instanceof Class) {
@@ -367,13 +367,13 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
* @param component
* @return
*/
- static Converter getValueTypeConverter(FacesContext facesContext, UISelectMany component) {
+ static Converter getValueTypeConverter(final FacesContext facesContext, final UISelectMany component) {
Converter converter = null;
- Object valueTypeAttr = component.getAttributes().get(VALUE_TYPE_KEY);
+ final Object valueTypeAttr = component.getAttributes().get(VALUE_TYPE_KEY);
if (valueTypeAttr != null) {
// treat the valueType attribute exactly like the collectionType attribute
- Class<?> valueType = getClassFromAttribute(facesContext, valueTypeAttr);
+ final Class<?> valueType = getClassFromAttribute(facesContext, valueTypeAttr);
if (valueType == null) {
throw new FacesException(
"The attribute "
@@ -407,20 +407,20 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
* @param facesContext
* @return The first suitable Converter for the given SelectItems or null.
*/
- static Converter getSelectItemsValueConverter(Iterator<SelectItem> iterator, FacesContext facesContext) {
+ static Converter getSelectItemsValueConverter(final Iterator<SelectItem> iterator, final FacesContext facesContext) {
// Attention!
// This code is duplicated in jsfapi component package.
// If you change something here please do the same in the other class!
Converter converter = null;
while (converter == null && iterator.hasNext()) {
- SelectItem item = iterator.next();
+ final SelectItem item = iterator.next();
if (item instanceof SelectItemGroup) {
- Iterator<SelectItem> groupIterator = Arrays.asList(
+ final Iterator<SelectItem> groupIterator = Arrays.asList(
((SelectItemGroup) item).getSelectItems()).iterator();
converter = getSelectItemsValueConverter(groupIterator, facesContext);
} else {
- Class<?> selectItemsType = item.getValue().getClass();
+ final Class<?> selectItemsType = item.getValue().getClass();
// optimization: no conversion for String values
if (String.class.equals(selectItemsType)) {
@@ -429,7 +429,7 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
try {
converter = facesContext.getApplication().createConverter(selectItemsType);
- } catch (FacesException e) {
+ } catch (final FacesException e) {
// nothing - try again
}
}
@@ -445,8 +445,8 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
// ### BEGIN copy out of https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.2.8/
// ### api/src/main/java/javax/faces/component/_ComponentUtils.java
// #################################################################################################################
- static String getPathToComponent(UIComponent component) {
- StringBuilder builder = new StringBuilder();
+ static String getPathToComponent(final UIComponent component) {
+ final StringBuilder builder = new StringBuilder();
if (component == null) {
builder.append("{Component-Path : ");
@@ -462,12 +462,12 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
return builder.toString();
}
- private static void getPathToComponent(UIComponent component, StringBuilder builder) {
+ private static void getPathToComponent(final UIComponent component, final StringBuilder builder) {
if (component == null) {
return;
}
- StringBuilder intBuilder = new StringBuilder();
+ final StringBuilder intBuilder = new StringBuilder();
intBuilder.append("[Class: ");
intBuilder.append(component.getClass().getName());
@@ -513,7 +513,7 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
private UISelectItems currentUISelectItems;
private FacesContext facesContext;
- SelectItemsIterator(UIComponent selectItemsParent, FacesContext facesContext) {
+ SelectItemsIterator(final UIComponent selectItemsParent, final FacesContext facesContext) {
children = selectItemsParent.getChildCount() > 0
? selectItemsParent.getChildren().iterator()
: EMPTY_UICOMPONENT_ITERATOR;
@@ -553,22 +553,22 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
}
}
if (child instanceof UISelectItem) {
- UISelectItem uiSelectItem = (UISelectItem) child;
+ final UISelectItem uiSelectItem = (UISelectItem) child;
Object item = uiSelectItem.getValue();
if (item == null) {
// no value attribute --> create the SelectItem out of the other attributes
- Object itemValue = uiSelectItem.getItemValue();
+ final Object itemValue = uiSelectItem.getItemValue();
String label = uiSelectItem.getItemLabel();
- String description = uiSelectItem.getItemDescription();
- boolean disabled = uiSelectItem.isItemDisabled();
- boolean escape = uiSelectItem.isItemEscaped();
- boolean noSelectionOption = uiSelectItem.isNoSelectionOption();
+ final String description = uiSelectItem.getItemDescription();
+ final boolean disabled = uiSelectItem.isItemDisabled();
+ final boolean escape = uiSelectItem.isItemEscaped();
+ final boolean noSelectionOption = uiSelectItem.isNoSelectionOption();
if (label == null) {
label = itemValue.toString();
}
item = new SelectItem(itemValue, label, description, disabled, escape, noSelectionOption);
} else if (!(item instanceof SelectItem)) {
- ValueExpression expression = uiSelectItem.getValueExpression("value");
+ final ValueExpression expression = uiSelectItem.getValueExpression("value");
throw new IllegalArgumentException("ValueExpression '"
+ (expression == null ? null : expression.getExpressionString()) + "' of UISelectItem : "
+ getPathToComponent(child) + " does not reference an Object of type SelectItem");
@@ -578,7 +578,7 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
return true;
} else if (child instanceof UISelectItems) {
currentUISelectItems = (UISelectItems) child;
- Object value = currentUISelectItems.getValue();
+ final Object value = currentUISelectItems.getValue();
currentComponent = child;
if (value instanceof SelectItem) {
@@ -587,8 +587,8 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
} else if (value != null && value.getClass().isArray()) {
// value is any kind of array (primitive or non-primitive)
// --> we have to use class Array to get the values
- int length = Array.getLength(value);
- Collection<Object> items = new ArrayList<>(length);
+ final int length = Array.getLength(value);
+ final Collection<Object> items = new ArrayList<>(length);
for (int i = 0; i < length; i++) {
items.add(Array.get(value, i));
}
@@ -599,9 +599,9 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
nestedItems = ((Iterable<?>) value).iterator();
return hasNext();
} else if (value instanceof Map) {
- Map<Object, Object> map = (Map<Object, Object>) value;
- Collection<SelectItem> items = new ArrayList<>(map.size());
- for (Map.Entry<Object, Object> entry : map.entrySet()) {
+ final Map<Object, Object> map = (Map<Object, Object>) value;
+ final Collection<SelectItem> items = new ArrayList<>(map.size());
+ for (final Map.Entry<Object, Object> entry : map.entrySet()) {
items.add(new SelectItem(entry.getValue(), entry.getKey().toString()));
}
@@ -611,13 +611,13 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
if ((facesContext.isProjectStage(ProjectStage.Production) && LOG.isDebugEnabled())
|| LOG.isWarnEnabled()) {
- ValueExpression expression = currentUISelectItems.getValueExpression("value");
- Object[] objects = {
+ final ValueExpression expression = currentUISelectItems.getValueExpression("value");
+ final Object[] objects = {
expression == null ? null : expression.getExpressionString(),
getPathToComponent(child),
value == null ? null : value.getClass().getName()
};
- String message = "ValueExpression {0} of UISelectItems with component-path {1}"
+ final String message = "ValueExpression {0} of UISelectItems with component-path {1}"
+ " does not reference an Object of type SelectItem,"
+ " array, Iterable or Map, but of type: {2}";
if (facesContext.isProjectStage(ProjectStage.Production)) {
@@ -640,7 +640,7 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
throw new NoSuchElementException();
}
if (nextItem != null) {
- SelectItem value = nextItem;
+ final SelectItem value = nextItem;
nextItem = null;
return value;
}
@@ -651,12 +651,12 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
// check new params of SelectItems (since 2.0): itemValue, itemLabel, itemDescription,...
// Note that according to the spec UISelectItems does not provide Getter and Setter
// methods for this values, so we have to use the attribute map
- Map<String, Object> attributeMap = currentUISelectItems.getAttributes();
+ final Map<String, Object> attributeMap = currentUISelectItems.getAttributes();
// write the current item into the request map under the key listed in var, if available
boolean wroteRequestMapVarValue = false;
Object oldRequestMapVarValue = null;
- String var = (String) attributeMap.get(VAR_ATTR);
+ final String var = (String) attributeMap.get(VAR_ATTR);
if (var != null && !"".equals(var)) {
// save the current value of the key listed in var from the request map
oldRequestMapVarValue = facesContext.getExternalContext().getRequestMap().put(var, item);
@@ -683,9 +683,9 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
if (itemDescription != null) {
itemDescription = itemDescription.toString();
}
- Boolean itemDisabled = getBooleanAttribute(currentUISelectItems, ITEM_DISABLED_ATTR, false);
- Boolean itemLabelEscaped = getBooleanAttribute(currentUISelectItems, ITEM_LABEL_ESCAPED_ATTR, true);
- Object noSelectionValue = attributeMap.get(NO_SELECTION_VALUE_ATTR);
+ final Boolean itemDisabled = getBooleanAttribute(currentUISelectItems, ITEM_DISABLED_ATTR, false);
+ final Boolean itemLabelEscaped = getBooleanAttribute(currentUISelectItems, ITEM_LABEL_ESCAPED_ATTR, true);
+ final Object noSelectionValue = attributeMap.get(NO_SELECTION_VALUE_ATTR);
item = new SelectItem(itemValue,
(String) itemLabel,
(String) itemDescription,
@@ -719,8 +719,8 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
return currentComponent;
}
- private boolean getBooleanAttribute(UIComponent component, String attrName, boolean defaultValue) {
- Object value = component.getAttributes().get(attrName);
+ private boolean getBooleanAttribute(final UIComponent component, final String attrName, final boolean defaultValue) {
+ final Object value = component.getAttributes().get(attrName);
if (value == null) {
return defaultValue;
} else if (value instanceof Boolean) {
@@ -733,8 +733,8 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
}
}
- private String getPathToComponent(UIComponent component) {
- StringBuilder builder = new StringBuilder();
+ private String getPathToComponent(final UIComponent component) {
+ final StringBuilder builder = new StringBuilder();
if (component == null) {
builder.append("{Component-Path : ");
@@ -750,12 +750,12 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
return builder.toString();
}
- private void getPathToComponent(UIComponent component, StringBuilder builder) {
+ private void getPathToComponent(final UIComponent component, final StringBuilder builder) {
if (component == null) {
return;
}
- StringBuilder intBuilder = new StringBuilder();
+ final StringBuilder intBuilder = new StringBuilder();
intBuilder.append("[Class: ");
intBuilder.append(component.getClass().getName());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
index f529487..d11fe9b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
@@ -174,7 +174,7 @@ public class SelectManyShuttleRenderer extends SelectManyRendererBase {
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
return component.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "unselected";
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceInsideInRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceInsideInRenderer.java
index 18d648d..c57f866 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceInsideInRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceInsideInRenderer.java
@@ -26,12 +26,12 @@ import java.io.IOException;
public class SelectOneChoiceInsideInRenderer extends SelectOneChoiceRenderer {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
encodeBeginField(facesContext, component);
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
encodeEndField(facesContext, component);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
index ad32593..114e25f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
@@ -46,7 +46,7 @@ public class SelectOneChoiceRenderer extends SelectOneRendererBase {
}
@Override
- protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectOneChoice select = (UISelectOneChoice) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -82,13 +82,13 @@ public class SelectOneChoiceRenderer extends SelectOneRendererBase {
}
@Override
- protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
final UISelectOneChoice select = (UISelectOneChoice) component;
return select.getFieldId(facesContext);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
index 8196521..93d863d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
@@ -82,13 +82,13 @@ public class SelectOneListboxRenderer extends SelectOneRendererBase {
}
@Override
- protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
final UISelectOneListbox select = (UISelectOneListbox) component;
return select.getFieldId(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 f096db8..baf6019 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
@@ -44,7 +44,7 @@ import java.io.IOException;
public class SelectOneRadioRenderer extends SelectOneRendererBase {
@Override
- protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUISelectOneRadio select = (AbstractUISelectOneRadio) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -93,7 +93,7 @@ public class SelectOneRadioRenderer extends SelectOneRendererBase {
writer.writeClassAttribute(BootstrapClass.FORM_CHECK_INPUT);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.RADIO);
final String formattedValue = ComponentUtils.getFormattedValue(facesContext, select, item.getValue());
- boolean checked;
+ final boolean checked;
if (submittedValue == null) {
checked = ObjectUtils.equals(item.getValue(), value);
} else {
@@ -119,7 +119,7 @@ public class SelectOneRadioRenderer extends SelectOneRendererBase {
writer.endElement(HtmlElements.I);
if (item instanceof org.apache.myfaces.tobago.model.SelectItem) {
- org.apache.myfaces.tobago.model.SelectItem tobagoItem = (org.apache.myfaces.tobago.model.SelectItem) item;
+ final org.apache.myfaces.tobago.model.SelectItem tobagoItem = (org.apache.myfaces.tobago.model.SelectItem) item;
final String image = tobagoItem.getImage();
if (image != null) {
writer.startElement(HtmlElements.IMG);
@@ -142,7 +142,7 @@ public class SelectOneRadioRenderer extends SelectOneRendererBase {
}
@Override
- protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
@@ -156,7 +156,7 @@ public class SelectOneRadioRenderer extends SelectOneRendererBase {
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
return component.getClientId(facesContext);
}
}
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 06aafa1..141d35a 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
@@ -211,7 +211,7 @@ public class SheetRenderer extends RendererBase {
@Override
public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISheet sheet = (UISheet) component;
- for (UIComponent child : sheet.getChildren()) {
+ for (final UIComponent child : sheet.getChildren()) {
if (child instanceof AbstractUIStyle) {
child.encodeAll(facesContext);
}
@@ -242,7 +242,7 @@ public class SheetRenderer extends RendererBase {
sheetId + SUFFIX_WIDTHS);
final ArrayList<String> encodedRendered = new ArrayList<>();
- for (AbstractUIColumnBase column : columns) {
+ for (final AbstractUIColumnBase column : columns) {
if (!(column instanceof AbstractUIRow)) {
encodedRendered.add(Boolean.toString(column.isRendered()));
}
@@ -465,13 +465,13 @@ public class SheetRenderer extends RendererBase {
writer.endElement(HtmlElements.DIV);
}
- private void encodeTableBody(FacesContext facesContext, UISheet sheet, TobagoResponseWriter writer, String sheetId,
- Selectable selectable, List<Integer> columnWidths, List<Integer> selectedRows,
- List<AbstractUIColumnBase> columns, boolean autoLayout, StringBuilder expandedValue)
+ private void encodeTableBody(final FacesContext facesContext, final UISheet sheet, final TobagoResponseWriter writer, final String sheetId,
+ final Selectable selectable, final List<Integer> columnWidths, final List<Integer> selectedRows,
+ final List<AbstractUIColumnBase> columns, final boolean autoLayout, final StringBuilder expandedValue)
throws IOException {
final boolean showHeader = sheet.isShowHeader();
- Markup sheetMarkup = sheet.getMarkup() != null ? sheet.getMarkup() : Markup.NULL;
+ final Markup sheetMarkup = sheet.getMarkup() != null ? sheet.getMarkup() : Markup.NULL;
final ExpandedState expandedState = sheet.isTreeModel() ? sheet.getExpandedState() : null;
if (showHeader && !autoLayout) {
@@ -615,7 +615,7 @@ public class SheetRenderer extends RendererBase {
for (final UIColumn column : columns) {
if (column.isRendered()) {
if (column instanceof AbstractUIColumn) {
- AbstractUIColumn normalColumn = (AbstractUIColumn) column;
+ final AbstractUIColumn normalColumn = (AbstractUIColumn) column;
writer.startElement(HtmlElements.TD);
Markup markup = normalColumn.getMarkup();
if (markup == null) {
@@ -628,7 +628,7 @@ public class SheetRenderer extends RendererBase {
normalColumn.getCustomClass());
if (normalColumn instanceof UIColumnSelector) {
- UIColumnSelector selector = (UIColumnSelector) normalColumn;
+ final UIColumnSelector selector = (UIColumnSelector) normalColumn;
writer.startElement(HtmlElements.INPUT);
writer.writeNameAttribute(sheetId + "_data_row_selector_" + rowIndex);
if (selectable.isSingle()) {
@@ -699,7 +699,7 @@ public class SheetRenderer extends RendererBase {
// END RENDER BODY CONTENT
}
- private void encodeHiddenInput(TobagoResponseWriter writer, String value, String idWithSuffix) throws IOException {
+ private void encodeHiddenInput(final TobagoResponseWriter writer, final String value, final String idWithSuffix) throws IOException {
writer.startElement(HtmlElements.INPUT);
writer.writeIdAttribute(idWithSuffix);
writer.writeNameAttribute(idWithSuffix);
@@ -714,9 +714,9 @@ public class SheetRenderer extends RendererBase {
// on client site, we don't know nothing about the non-rendered columns.
int i = 0;
int j = 0;
- for (AbstractUIColumnBase column : columns) {
+ for (final AbstractUIColumnBase column : columns) {
if (!(column instanceof AbstractUIRow)) {
- Integer newValue;
+ final Integer newValue;
if (j < samples.size()) {
newValue = samples.get(j);
j++;
@@ -735,7 +735,7 @@ public class SheetRenderer extends RendererBase {
}
}
- private Markup getMarkupForAlign(UIColumn column) {
+ private Markup getMarkupForAlign(final UIColumn column) {
final String textAlign = ComponentUtils.getStringAttribute(column, Attributes.align);
if (textAlign != null) {
switch (TextAlign.valueOf(textAlign)) {
@@ -786,7 +786,7 @@ public class SheetRenderer extends RendererBase {
final UIComponent cellComponent = cell.getComponent();
- Markup align;
+ final Markup align;
final String alignString = ComponentUtils.getStringAttribute(column, Attributes.align);
if (multiHeader && cell.getColumnSpan() > 1) {
align = Markup.CENTER;
@@ -920,11 +920,11 @@ public class SheetRenderer extends RendererBase {
private void writeColgroup(
final TobagoResponseWriter writer, final List<Integer> columnWidths,
- final List<AbstractUIColumnBase> columns, boolean isHeader) throws IOException {
+ final List<AbstractUIColumnBase> columns, final boolean isHeader) throws IOException {
writer.startElement(HtmlElements.COLGROUP);
int i = 0;
- for (AbstractUIColumnBase column : columns) {
+ for (final AbstractUIColumnBase column : columns) {
if (!(column instanceof AbstractUIRow)) {
if (column.isRendered()) {
final Integer width = columnWidths.get(i);
@@ -978,7 +978,7 @@ public class SheetRenderer extends RendererBase {
private void encodeLink(
final FacesContext facesContext, final UISheet data, final Application application,
- final boolean disabled, final SheetAction action, Integer target, Icons icon, CssItem liClass)
+ final boolean disabled, final SheetAction action, final Integer target, final Icons icon, final CssItem liClass)
throws IOException {
final String facet = action == SheetAction.toPage || action == SheetAction.toRow
@@ -1127,8 +1127,8 @@ public class SheetRenderer extends RendererBase {
return command;
}
- private AjaxBehavior createReloadBehavior(UISheet sheet) {
- AjaxBehavior reloadBehavior = findReloadBehavior(sheet);
+ private AjaxBehavior createReloadBehavior(final UISheet sheet) {
+ final AjaxBehavior reloadBehavior = findReloadBehavior(sheet);
final ArrayList<String> renderIds = new ArrayList<>();
if (!renderIds.contains(sheet.getId())) {
renderIds.add(sheet.getId());
@@ -1149,7 +1149,7 @@ public class SheetRenderer extends RendererBase {
return behavior;
}
- private AjaxBehavior findReloadBehavior(ClientBehaviorHolder holder) {
+ private AjaxBehavior findReloadBehavior(final ClientBehaviorHolder holder) {
final List<ClientBehavior> reload = holder.getClientBehaviors().get("reload");
if (reload != null && !reload.isEmpty() && reload.get(0) instanceof AjaxBehavior) {
return (AjaxBehavior) reload.get(0);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
index f8160d5..06efabd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
@@ -61,7 +61,7 @@ public class SplitLayoutRenderer extends RendererBase {
}
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUISplitLayout splitLayout = (AbstractUISplitLayout) component;
final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -75,7 +75,7 @@ public class SplitLayoutRenderer extends RendererBase {
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
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 1895c9b..f5f1fbc 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
@@ -257,7 +257,7 @@ public class StyleRenderer extends RendererBase {
}
}
- private void encodeStyle(final TobagoResponseWriter writer, Styles name, String value) throws IOException {
+ private void encodeStyle(final TobagoResponseWriter writer, final Styles name, final String value) throws IOException {
writer.writeText(name.getCssName());
writer.writeText(":");
switch (name) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java
index af90a8c..8692e67 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java
@@ -51,7 +51,7 @@ public class SuggestRenderer extends RendererBase {
private static final Logger LOG = LoggerFactory.getLogger(SuggestRenderer.class);
@Override
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
final AbstractUISuggest suggest = (AbstractUISuggest) component;
final String clientId = suggest.getClientId(facesContext);
final Map<String, String> requestParameterMap = facesContext.getExternalContext().getRequestParameterMap();
@@ -71,13 +71,13 @@ public class SuggestRenderer extends RendererBase {
}
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUISuggest suggest = (AbstractUISuggest) component;
final AbstractUIInput input = ComponentUtils.findAncestor(suggest, AbstractUIInput.class);
final MethodExpression suggestMethodExpression = suggest.getSuggestMethodExpression();
int totalCount = suggest.getTotalCount();
- String[] array;
+ final String[] array;
if (suggestMethodExpression != null && input != null) { // old way (deprecated)
final AutoSuggestItems autoSuggestItems
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 253d08f..a0741c6 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
@@ -73,7 +73,7 @@ public class TabGroupRenderer extends RendererBase implements ComponentSystemEve
private static final String ACTIVE_INDEX_POSTFIX = ComponentUtils.SUB_SEPARATOR + "activeIndex";
@Override
- public void processEvent(ComponentSystemEvent event) {
+ public void processEvent(final ComponentSystemEvent event) {
final UITabGroup tabGroup = (UITabGroup) event.getComponent();
@@ -281,7 +281,7 @@ public class TabGroupRenderer extends RendererBase implements ComponentSystemEve
}
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.TAB.toString(), false);
- String image = tab.getImage();
+ final String image = tab.getImage();
// tab.getImage() resolves to empty string if el-expression resolves to null
if (image != null && !image.isEmpty()) {
writer.startElement(HtmlElements.IMG);
@@ -310,8 +310,8 @@ public class TabGroupRenderer extends RendererBase implements ComponentSystemEve
}
protected void encodeContent(
- FacesContext facesContext, TobagoResponseWriter writer, UITabGroup tabGroup,
- int activeIndex, SwitchType switchType) throws IOException {
+ final FacesContext facesContext, final TobagoResponseWriter writer, final UITabGroup tabGroup,
+ final int activeIndex, final SwitchType switchType) throws IOException {
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(BootstrapClass.TAB_CONTENT);
int index = 0;
@@ -343,7 +343,7 @@ public class TabGroupRenderer extends RendererBase implements ComponentSystemEve
writer.endElement(HtmlElements.DIV);
}
- private String getTabPanelId(FacesContext facesContext, UITab tab) {
+ private String getTabPanelId(final FacesContext facesContext, final UITab tab) {
return tab.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "content";
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
index efbc041..ca46f27 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
@@ -118,7 +118,7 @@ public class TextareaRenderer extends MessageLayoutRendererBase {
maxLength = lengthValidator.getMaximum();
minLength = lengthValidator.getMinimum();
} else if (validator instanceof RegexValidator) {
- RegexValidator regexValidator = (RegexValidator) validator;
+ final RegexValidator regexValidator = (RegexValidator) validator;
pattern = regexValidator.getPattern();
}
}
@@ -136,7 +136,7 @@ public class TextareaRenderer extends MessageLayoutRendererBase {
HtmlRendererUtils.renderFocus(clientId, input.isFocus(), ComponentUtils.isError(input), facesContext, writer);
- String placeholder = input.getPlaceholder();
+ final String placeholder = input.getPlaceholder();
if (!disabled && !readonly && StringUtils.isNotBlank(placeholder)) {
writer.writeAttribute(HtmlAttributes.PLACEHOLDER, placeholder, true);
}
@@ -162,11 +162,11 @@ public class TextareaRenderer extends MessageLayoutRendererBase {
}
@Override
- protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ protected void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
}
@Override
- protected String getFieldId(FacesContext facesContext, UIComponent component) {
+ protected String getFieldId(final FacesContext facesContext, final UIComponent component) {
final UITextarea input = (UITextarea) component;
return input.getFieldId(facesContext);
}
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 af75f1c..6a72d13 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
@@ -56,7 +56,7 @@ public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehav
* @return "dummy" string or null, if nothing to do.
*/
@Override
- public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior) {
+ public String getScript(final ClientBehaviorContext behaviorContext, final ClientBehavior behavior) {
final FacesContext facesContext = behaviorContext.getFacesContext();
final UIComponent uiComponent = behaviorContext.getComponent();
@@ -72,7 +72,7 @@ public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehav
String actionId = null;
boolean omit = false;
if (behavior instanceof AjaxBehavior) {
- AjaxBehavior ajaxBehavior = (AjaxBehavior) behavior;
+ final AjaxBehavior ajaxBehavior = (AjaxBehavior) behavior;
if (ajaxBehavior.isDisabled()){
return null;
}
@@ -88,7 +88,7 @@ public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehav
executeIds = clientId;
}
if (uiComponent instanceof AbstractUICommand) { // <f:ajax> inside of a command
- AbstractUICommand command = (AbstractUICommand) uiComponent;
+ final AbstractUICommand command = (AbstractUICommand) uiComponent;
transition = command.isTransition();
target = command.getTarget();
omit = command.isOmit() || StringUtils.isNotBlank(RenderUtils.generateUrl(facesContext, command));
@@ -97,7 +97,7 @@ public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehav
ComponentUtils.evaluateClientIds(facesContext, uiComponent, render.toArray(new String[render.size()]));
actionId = clientId;
} else if (behavior instanceof EventBehavior) { // <tc:event>
- AbstractUIEvent event = findEvent(uiComponent, eventName);
+ final AbstractUIEvent event = findEvent(uiComponent, eventName);
if (event != null) {
if (!event.isRendered()) {
return null;
@@ -133,9 +133,9 @@ public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehav
}
private AbstractUIEvent findEvent(final UIComponent component, final ClientBehaviors eventName) {
- for (UIComponent child : component.getChildren()) {
+ for (final UIComponent child : component.getChildren()) {
if (child instanceof AbstractUIEvent) {
- AbstractUIEvent event = (AbstractUIEvent) child;
+ final AbstractUIEvent event = (AbstractUIEvent) child;
if (eventName == event.getEvent()) {
return event;
}
@@ -145,8 +145,8 @@ public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehav
}
@Override
- public void decode(FacesContext context, UIComponent component, ClientBehavior behavior) {
- AjaxBehavior ajaxBehavior = (AjaxBehavior) behavior;
+ public void decode(final FacesContext context, final UIComponent component, final ClientBehavior behavior) {
+ final AjaxBehavior ajaxBehavior = (AjaxBehavior) behavior;
if (ajaxBehavior.isDisabled() || !component.isRendered()) {
return;
}
@@ -154,15 +154,15 @@ public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehav
dispatchBehaviorEvent(component, ajaxBehavior);
}
- private void dispatchBehaviorEvent(UIComponent component, AjaxBehavior ajaxBehavior) {
+ private void dispatchBehaviorEvent(final UIComponent component, final AjaxBehavior ajaxBehavior) {
- AjaxBehaviorEvent event = new AjaxBehaviorEvent(component, ajaxBehavior);
- boolean isImmediate = isImmediate(ajaxBehavior, component);
+ final AjaxBehaviorEvent event = new AjaxBehaviorEvent(component, ajaxBehavior);
+ final boolean isImmediate = isImmediate(ajaxBehavior, component);
event.setPhaseId(isImmediate ? PhaseId.APPLY_REQUEST_VALUES : PhaseId.INVOKE_APPLICATION);
component.queueEvent(event);
}
- private boolean isImmediate(AjaxBehavior ajaxBehavior, UIComponent component) {
+ private boolean isImmediate(final AjaxBehavior ajaxBehavior, final UIComponent component) {
if (ajaxBehavior.isImmediateSet()) {
return ajaxBehavior.isImmediate();
}
@@ -178,7 +178,7 @@ public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehav
/**
* @deprecated TBD
*/
- public static Collapse createCollapsible(FacesContext facesContext, UIComponent component) {
+ public static Collapse createCollapsible(final FacesContext facesContext, final UIComponent component) {
//// TBD: is this nice? May be implemented with a JSF behaviour?
//// BEGIN
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java
index 5c608e2..0e9e574 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java
@@ -52,10 +52,10 @@ public final class AccessKeyLogger extends HashMap<Character, List<String>> {
return keyMap;
}
- public static void addAccessKey(final FacesContext facesContext, final Character key, String clientId) {
+ public static void addAccessKey(final FacesContext facesContext, final Character key, final String clientId) {
if (LOG.isDebugEnabled()) {
final AccessKeyLogger instance = getInstance(facesContext);
- List<String> clientIds;
+ final List<String> clientIds;
if (instance.containsKey(key)) {
clientIds = instance.get(key);
} else {
@@ -73,7 +73,7 @@ public final class AccessKeyLogger extends HashMap<Character, List<String>> {
final StringBuilder builder = new StringBuilder();
final AccessKeyLogger instance = AccessKeyLogger.getInstance(facesContext);
builder.append("Used access keys:");
- for (Map.Entry<Character, List<String>> entry : instance.entrySet()) {
+ for (final Map.Entry<Character, List<String>> entry : instance.entrySet()) {
builder.append("\n'");
builder.append(entry.getKey());
builder.append("' -> ");
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 ba78364..48dcb6d 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 {
// beanManager = CDI.context().getBeanManager();
final InitialContext context = new InitialContext();
beanManager = (BeanManager) context.lookup("java:comp/BeanManager");
- } catch (Exception exception) {
+ } catch (final Exception exception) {
LOG.warn("Can't obtain 'java:comp/BeanManager'");
}
@@ -128,7 +128,7 @@ public class AuthorizationHelper {
return true;
}
- private Annotation getSecurityAnnotation(final FacesContext facesContext, String expression) {
+ private Annotation getSecurityAnnotation(final FacesContext facesContext, final String expression) {
if (cache.containsKey(expression)) {
final Object obj = cache.get(expression);
if (obj instanceof Annotation) {
@@ -145,7 +145,7 @@ public class AuthorizationHelper {
Object bean = null;
if (beanManager != null) { // CDI case
- for (Bean<?> entry : beanManager.getBeans(beanString)) {
+ for (final Bean<?> entry : beanManager.getBeans(beanString)) {
if (bean == null) {
bean = entry;
} else {
@@ -206,7 +206,7 @@ public class AuthorizationHelper {
return null;
}
- private List<Method> findMethods(Object bean, String name) {
+ private List<Method> findMethods(final Object bean, final String name) {
final Class clazz;
if (bean instanceof Bean) {
clazz = ((Bean) bean).getBeanClass();
@@ -216,7 +216,7 @@ public class AuthorizationHelper {
final Method[] methods = clazz.getMethods();
final List<Method> result = new ArrayList<>();
- for (Method method : methods) {
+ for (final Method method : methods) {
if (method.getName().equals(name)) {
result.add(method);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
index 318bd25..15d4931 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
@@ -37,11 +37,11 @@ public class CookieUtils {
private CookieUtils() {
}
- public static String getThemeNameFromCookie(HttpServletRequest request) {
+ public static String getThemeNameFromCookie(final HttpServletRequest request) {
String themeName = null;
final Cookie[] cookies = request.getCookies();
if (cookies != null) {
- for (Cookie cookie : cookies) {
+ for (final Cookie cookie : cookies) {
if (LOG.isDebugEnabled()) {
LOG.debug("cookie name ='{}'", cookie.getName());
LOG.debug("cookie value ='{}'", cookie.getValue());
@@ -60,14 +60,14 @@ public class CookieUtils {
}
public static void setThemeNameToCookie(
- HttpServletRequest request, HttpServletResponse response, String themeName) {
+ final HttpServletRequest request, final HttpServletResponse response, final String themeName) {
String path = request.getContextPath();
path = StringUtils.isBlank(path) ? "/" : path;
boolean found = false;
final Cookie[] cookies = request.getCookies();
if (cookies != null) {
- for (Cookie cookie : cookies) {
+ for (final Cookie cookie : cookies) {
if (THEME_PARAMETER.equals(cookie.getName())) {
if (found) {
if (LOG.isDebugEnabled()) {
@@ -95,7 +95,7 @@ public class CookieUtils {
}
}
if (!found) {
- Cookie cookie = new Cookie(THEME_PARAMETER, themeName);
+ final Cookie cookie = new Cookie(THEME_PARAMETER, themeName);
cookie.setPath(path);
cookie.setMaxAge(ONE_YEAR_IN_SECONDS);
response.addCookie(cookie);
@@ -103,13 +103,13 @@ public class CookieUtils {
}
public static void removeThemeNameCookie(
- HttpServletRequest request, HttpServletResponse response) {
+ final HttpServletRequest request, final HttpServletResponse response) {
String path = request.getContextPath();
path = StringUtils.isBlank(path) ? "/" : path;
final Cookie[] cookies = request.getCookies();
if (cookies != null) {
- for (Cookie cookie : cookies) {
+ for (final Cookie cookie : cookies) {
if (THEME_PARAMETER.equals(cookie.getName())) {
cookie.setMaxAge(0);
cookie.setValue(null);
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 66b9c37..d1673ce 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
@@ -97,7 +97,7 @@ public final class HtmlRendererUtils {
* @deprecated 4.0.0.
*/
@Deprecated
- public static void encodeIconWithLabel(TobagoResponseWriter writer, String image, String label) throws IOException {
+ public static void encodeIconWithLabel(final TobagoResponseWriter writer, final String image, final String label) throws IOException {
if (image != null && image.startsWith("fa-")) { // XXX hack: should be integrated in the resource manager
writer.writeIcon(null, Icons.custom(image)); // todo: should not be static
}
@@ -113,7 +113,7 @@ public final class HtmlRendererUtils {
*/
@Deprecated
public static void encodeIconWithLabel(
- TobagoResponseWriter writer, FacesContext facesContext, String image, LabelWithAccessKey label, boolean disabled)
+ final TobagoResponseWriter writer, final FacesContext facesContext, final String image, final LabelWithAccessKey label, final boolean disabled)
throws IOException {
if (image != null) {
if (image.startsWith("fa-")) {
@@ -217,7 +217,7 @@ public final class HtmlRendererUtils {
itemValue = ComponentUtils.getConvertedValue(facesContext, component, (String) itemValue);
}
final String formattedValue = ComponentUtils.getFormattedValue(facesContext, component, itemValue);
- boolean contains;
+ final boolean contains;
if (submittedValues == null) {
contains = ArrayUtils.contains(values, itemValue);
} else {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HttpPartWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HttpPartWrapper.java
index 1736324..9ed828d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HttpPartWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HttpPartWrapper.java
@@ -36,7 +36,7 @@ public class HttpPartWrapper implements Part, FacesWrapper<Part>, StateHolder {
public HttpPartWrapper() {
}
- public HttpPartWrapper(Part delegate) {
+ public HttpPartWrapper(final Part delegate) {
this.delegate = delegate;
}
@@ -51,7 +51,7 @@ public class HttpPartWrapper implements Part, FacesWrapper<Part>, StateHolder {
}
@Override
- public String getHeader(String headerName) {
+ public String getHeader(final String headerName) {
return getWrapped().getHeader(headerName);
}
@@ -61,7 +61,7 @@ public class HttpPartWrapper implements Part, FacesWrapper<Part>, StateHolder {
}
@Override
- public Collection<String> getHeaders(String headerName) {
+ public Collection<String> getHeaders(final String headerName) {
return getWrapped().getHeaders(headerName);
}
@@ -81,35 +81,35 @@ public class HttpPartWrapper implements Part, FacesWrapper<Part>, StateHolder {
}
@Override
- public void write(String fileName) throws IOException {
+ public void write(final String fileName) throws IOException {
getWrapped().write(fileName);
}
public String getSubmittedFileName() {
- Part wrapped = getWrapped();
+ final Part wrapped = getWrapped();
try {
- Method m = wrapped.getClass().getMethod("getSubmittedFileName");
+ final Method m = wrapped.getClass().getMethod("getSubmittedFileName");
return (String) m.invoke(wrapped);
- } catch (NoSuchMethodException ex) {
+ } catch (final NoSuchMethodException ex) {
throw new FacesException(ex);
- } catch (SecurityException ex) {
+ } catch (final SecurityException ex) {
throw new FacesException(ex);
- } catch (IllegalAccessException ex) {
+ } catch (final IllegalAccessException ex) {
throw new FacesException(ex);
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
throw new FacesException(ex);
- } catch (InvocationTargetException ex) {
+ } catch (final InvocationTargetException ex) {
throw new FacesException(ex);
}
}
@Override
- public Object saveState(FacesContext context) {
+ public Object saveState(final FacesContext context) {
return null;
}
@Override
- public void restoreState(FacesContext context, Object state) {
+ public void restoreState(final FacesContext context, final Object state) {
}
@Override
@@ -118,7 +118,7 @@ public class HttpPartWrapper implements Part, FacesWrapper<Part>, StateHolder {
}
@Override
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JQueryUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JQueryUtils.java
index 78dc09d..b0390af 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JQueryUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JQueryUtils.java
@@ -21,11 +21,11 @@ package org.apache.myfaces.tobago.internal.util;
public class JQueryUtils {
- public static String escapeIdForHtml(String id) {
+ public static String escapeIdForHtml(final String id) {
return "#" + id.replaceAll("([:\\.\\[\\],])", "\\\\$1");
}
- public static String escapeIdForJavaScript(String id) {
+ public static String escapeIdForJavaScript(final String id) {
return "#" + id.replaceAll("([:\\.\\[\\],])", "\\\\\\\\$1");
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonUtils.java
index 0c5cc7d..14a69e3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonUtils.java
@@ -50,7 +50,7 @@ public class JsonUtils {
builder.append(",");
}
- public static void encode(StringBuilder builder, String[] value) {
+ public static void encode(final StringBuilder builder, final String[] value) {
builder.append("[");
boolean colon = false;
for (final String item : value) {
@@ -65,7 +65,7 @@ public class JsonUtils {
builder.append("]");
}
- public static void encode(StringBuilder builder, List<Integer> value) {
+ public static void encode(final StringBuilder builder, final List<Integer> value) {
builder.append("[");
boolean colon = false;
for (final Integer item : value) {
@@ -282,7 +282,7 @@ public class JsonUtils {
final String token = tokenizer.nextToken().trim();
try {
result.add(Integer.parseInt(token));
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
LOG.warn("Can't parse JSON array: not an integer token: '{}'", token);
// ignoring so far
}
@@ -295,9 +295,9 @@ public class JsonUtils {
if (markups == null || markups.isEmpty()) {
return null;
}
- StringBuilder builder = new StringBuilder(20);
+ final StringBuilder builder = new StringBuilder(20);
builder.append('[');
- for (String markup : markups) {
+ for (final String markup : markups) {
builder.append('"');
builder.append(markup);
builder.append('"');
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
index 3825604..662cba5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
@@ -34,7 +34,7 @@ public final class MimeTypeUtils {
// todo: maybe support more extensions
public static String getMimeTypeForFile(final String file) {
- int length = file.length();
+ final int length = file.length();
if (file.charAt(length - 4) == '.') {
if (file.charAt(length - 1) == 'g') {
if (file.regionMatches(length - 3, "png", 0, 2)) {
@@ -91,14 +91,14 @@ public final class MimeTypeUtils {
final int index = file.lastIndexOf('.');
if (index > -1) {
- String extension = file.substring(index + 1);
+ final String extension = file.substring(index + 1);
return additionalMimeTypes.get(extension);
}
return null;
}
- public static void init(ServletContext servletContext) {
+ public static void init(final ServletContext servletContext) {
if (additionalMimeTypes == null) {
final TobagoConfig tobagoConfig = TobagoConfig.getInstance(servletContext);
additionalMimeTypes = tobagoConfig.getMimeTypes();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ObjectUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ObjectUtils.java
index 2d38a7a..c32e01b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ObjectUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ObjectUtils.java
@@ -26,7 +26,7 @@ public class ObjectUtils {
}
@SuppressWarnings("ObjectEquality")
- public static boolean equals(Object o1, Object o2) {
+ public static boolean equals(final Object o1, final Object o2) {
return o1 == o2 || o1 != null && o1.equals(o2);
}
}
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 3c0e5b8..f30395d 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
@@ -55,7 +55,7 @@ public final class PartUtils {
}
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignore
}
return null;
@@ -67,7 +67,7 @@ public final class PartUtils {
*
* @since Tobago 3.0.0
*/
- public static String getSubmittedFileName(Part part) {
+ public static String getSubmittedFileName(final Part part) {
try { // try to call the Servlet 3.1 function
if (SUBMITTED_FILE_NAME_METHOD != null) {
@@ -75,19 +75,19 @@ public final class PartUtils {
LOG.debug("Upload file name = '{}'", fileName);
return fileName;
}
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignore
}
String fileName = null;
- String cd = part.getHeader("Content-Disposition");
+ final String cd = part.getHeader("Content-Disposition");
if (cd != null) {
- String cdl = cd.toLowerCase(Locale.ENGLISH);
+ final String cdl = cd.toLowerCase(Locale.ENGLISH);
if (cdl.startsWith("form-data") || cdl.startsWith("attachment")) {
- ParameterParser paramParser = new ParameterParser();
+ final ParameterParser paramParser = new ParameterParser();
paramParser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map<String, String> params =
+ final Map<String, String> params =
paramParser.parse(cd, ';');
if (params.containsKey("filename")) {
fileName = params.get("filename");
@@ -166,7 +166,7 @@ public final class PartUtils {
* {@code false} otherwise.
* @return the token
*/
- private String getToken(boolean quoted) {
+ private String getToken(final boolean quoted) {
// Trim leading white spaces
while ((i1 < i2) && (Character.isWhitespace(chars[i1]))) {
i1++;
@@ -198,9 +198,9 @@ public final class PartUtils {
* @return {@code true} if the character is present in the array of
* characters, {@code false} otherwise.
*/
- private boolean isOneOf(char ch, final char[] charray) {
+ private boolean isOneOf(final char ch, final char[] charray) {
boolean result = false;
- for (char element : charray) {
+ for (final char element : charray) {
if (ch == element) {
result = true;
break;
@@ -271,7 +271,7 @@ public final class PartUtils {
* converted to lower case when name/value pairs are parsed.
* {@code false} otherwise.
*/
- public void setLowerCaseNames(boolean b) {
+ public void setLowerCaseNames(final boolean b) {
this.lowerCaseNames = b;
}
@@ -283,7 +283,7 @@ public final class PartUtils {
* @param separator the name/value pairs separator
* @return a map of name/value pairs
*/
- public Map<String, String> parse(final String str, char separator) {
+ public Map<String, String> parse(final String str, final char separator) {
if (str == null) {
return new HashMap<>();
}
@@ -299,7 +299,7 @@ public final class PartUtils {
* @param separator the name/value pairs separator
* @return a map of name/value pairs
*/
- public Map<String, String> parse(final char[] charArray, char separator) {
+ public Map<String, String> parse(final char[] charArray, final char separator) {
if (charArray == null) {
return new HashMap<>();
}
@@ -319,14 +319,14 @@ public final class PartUtils {
*/
public Map<String, String> parse(
final char[] charArray,
- int offset,
- int length,
- char separator) {
+ final int offset,
+ final int length,
+ final char separator) {
if (charArray == null) {
return new HashMap<>();
}
- HashMap<String, String> params = new HashMap<>();
+ final HashMap<String, String> params = new HashMap<>();
this.chars = charArray;
this.pos = offset;
this.len = length;
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 a47bf4d..36db432 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
@@ -169,7 +169,7 @@ public final class RenderUtils {
// if the node is not rendered, the state must not be evaluated.
boolean skip = false;
- for (UIComponent uiComponent : data.getChildren()) {
+ for (final UIComponent uiComponent : data.getChildren()) {
if (uiComponent instanceof AbstractUITreeNodeBase && !uiComponent.isRendered()) {
skip = true;
break;
@@ -271,7 +271,7 @@ public final class RenderUtils {
final String characterEncoding = facesContext.getResponseWriter().getCharacterEncoding();
try {
builder.append(URLEncoder.encode(value.toString(), characterEncoding));
- } catch (UnsupportedEncodingException e) {
+ } catch (final UnsupportedEncodingException e) {
LOG.error("", e);
}
}
@@ -292,11 +292,11 @@ public final class RenderUtils {
public static CommandMap getBehaviorCommands(final FacesContext facesContext, final ClientBehaviorHolder holder) {
CommandMap map = null;
final Map<String, List<ClientBehavior>> behaviors = holder.getClientBehaviors();
- for (Map.Entry<String, List<ClientBehavior>> behaviorMap : behaviors.entrySet()) {
+ for (final Map.Entry<String, List<ClientBehavior>> behaviorMap : behaviors.entrySet()) {
final String key = behaviorMap.getKey();
final ClientBehaviorContext context = ClientBehaviorContext.createClientBehaviorContext(
facesContext, (UIComponent) holder, key, ((UIComponent) holder).getClientId(facesContext), null);
- for (ClientBehavior clientBehavior : behaviorMap.getValue()) {
+ for (final ClientBehavior clientBehavior : behaviorMap.getValue()) {
if (clientBehavior instanceof ClientBehaviorBase) {
String type = ((ClientBehaviorBase) clientBehavior).getRendererType();
// XXX this is to use a different renderer for Tobago components and other components.
@@ -338,7 +338,7 @@ public final class RenderUtils {
if (clientBehaviorList != null && !clientBehaviorList.isEmpty()) {
final String clientId = paramMap.get("javax.faces.source");
if (component.getClientId(facesContext).equals(clientId)) {
- for (ClientBehavior clientBehavior : clientBehaviorList) {
+ for (final ClientBehavior clientBehavior : clientBehaviorList) {
clientBehavior.decode(facesContext, component);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
index a892fcf..71ddbcc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
@@ -77,7 +77,7 @@ public class SelectItemUtils {
} else {
final Iterable<SelectItem> iterator = getItemIterator(facesContext, selector);
final List<SelectItem> result = new ArrayList<>();
- for (SelectItem selectItem : iterator) {
+ for (final SelectItem selectItem : iterator) {
result.add(selectItem);
}
return result;
@@ -145,14 +145,14 @@ public class SelectItemUtils {
String image = null;
Markup markup = null;
if (uiSelectItem instanceof org.apache.myfaces.tobago.component.UISelectItem) {
- org.apache.myfaces.tobago.component.UISelectItem tobagoSelectItem
+ final org.apache.myfaces.tobago.component.UISelectItem tobagoSelectItem
= (org.apache.myfaces.tobago.component.UISelectItem) uiSelectItem;
image = tobagoSelectItem.getItemImage();
markup = tobagoSelectItem.getMarkup();
}
item = new org.apache.myfaces.tobago.model.SelectItem(itemValue, label, description, disabled, image, markup);
} else if (!(item instanceof SelectItem)) {
- ValueExpression expression = uiSelectItem.getValueExpression("value");
+ final ValueExpression expression = uiSelectItem.getValueExpression("value");
throw new IllegalArgumentException("ValueExpression '"
+ (expression == null ? null : expression.getExpressionString()) + "' of UISelectItem : "
+ child + " does not reference an Object of type SelectItem");
@@ -183,7 +183,7 @@ public class SelectItemUtils {
} else if (value instanceof Map) {
final Map<Object, Object> map = (Map<Object, Object>) value;
final Collection<SelectItem> items = new ArrayList<>(map.size());
- for (Map.Entry<Object, Object> entry : map.entrySet()) {
+ for (final Map.Entry<Object, Object> entry : map.entrySet()) {
items.add(new org.apache.myfaces.tobago.model.SelectItem(entry.getValue(), entry.getKey().toString()));
}
nestedItems = items.iterator();
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 24bcf5c..7163986 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
@@ -467,7 +467,7 @@ public final class StringUtils {
/**
* Basically taken from commons-lang
*/
- public static boolean notEquals(String a, String b) {
+ public static boolean notEquals(final String a, final String b) {
return a == null ? b != null : !a.equals(b);
}
@@ -478,7 +478,7 @@ public final class StringUtils {
if (link == null) {
return false;
}
- int colon = link.indexOf(':');
+ final int colon = link.indexOf(':');
if (colon < 1) {
return false;
}
@@ -490,7 +490,7 @@ public final class StringUtils {
return true;
}
- public static boolean startsWith(String string, String prefix) {
+ public static boolean startsWith(final String string, final String prefix) {
if (string == null || prefix == null) {
return string == null && prefix == null;
}
@@ -523,20 +523,20 @@ public final class StringUtils {
*
* Basically taken from commons-lang
*/
- public static boolean containsAny(String str, String searchChars) {
+ public static boolean containsAny(final String str, final String searchChars) {
if (searchChars == null) {
return false;
}
- char[] searchChars1 = searchChars.toCharArray();
+ final char[] searchChars1 = searchChars.toCharArray();
if (isEmpty(str) || searchChars1.length == 0) {
return false;
}
- int csLength = str.length();
- int searchLength = searchChars1.length;
- int csLast = csLength - 1;
- int searchLast = searchLength - 1;
+ final int csLength = str.length();
+ final int searchLength = searchChars1.length;
+ final int csLast = csLength - 1;
+ final int searchLast = searchLength - 1;
for (int i = 0; i < csLength; i++) {
- char ch = str.charAt(i);
+ final char ch = str.charAt(i);
for (int j = 0; j < searchLength; j++) {
if (searchChars1[j] == ch) {
if (isHighSurrogate(ch)) {
@@ -566,7 +566,7 @@ public final class StringUtils {
* @return {@code true} if {@code ch} is a high-surrogate code unit;
* {@code false} otherwise.
*/
- private static boolean isHighSurrogate(char ch) {
+ 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/StyleRenderUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtils.java
index 070df5b..67650c7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtils.java
@@ -40,14 +40,14 @@ public class StyleRenderUtils {
/**
* PRELIMINARY
*/
- public static void writeIdSelector(TobagoResponseWriter writer, String id) throws IOException {
+ public static void writeIdSelector(final TobagoResponseWriter writer, final String id) throws IOException {
writer.writeText("#");
final char[] chars = id.toCharArray();
int last = 0;
for (int i = 0; i < chars.length; i++) {
- char c = chars[i];
+ final char c = chars[i];
if (c == ':') {
writer.writeText(chars, last, i - last);
writer.writeText("\\:");
@@ -73,7 +73,7 @@ public class StyleRenderUtils {
/**
* PRELIMINARY
*/
- public static String encodeIdSelector(String clientId) {
+ public static String encodeIdSelector(final String clientId) {
return "#" + clientId.replaceAll(":", "\\\\:");
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
index 61475bb..1f42933 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
@@ -111,7 +111,7 @@ public class DebugResponseWriterWrapper extends TobagoResponseWriter {
}
@Override
- public void writeURIAttribute(MarkupLanguageAttributes name, String string) throws IOException {
+ public void writeURIAttribute(final MarkupLanguageAttributes name, final String string) throws IOException {
responseWriter.writeURIAttribute(name, string);
if (usedAttributes.contains(name)) {
LOG.error("Duplicate attribute '" + name + "' in element <" + stack.peek() + "> with value '" + string + "'!",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java
index ac2c1ad..911e2ef 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java
@@ -49,16 +49,16 @@ public class LoggingMdcFilter implements Filter {
try {
if (request instanceof HttpServletRequest) {
- HttpServletRequest httpRequest = (HttpServletRequest) request;
- HttpSession session = httpRequest.getSession(false);
+ final HttpServletRequest httpRequest = (HttpServletRequest) request;
+ final HttpSession session = httpRequest.getSession(false);
if (session != null) {
MDC.put("sessionId", session.getId());
}
- String remoteAddr = httpRequest.getRemoteAddr();
+ final String remoteAddr = httpRequest.getRemoteAddr();
if (remoteAddr != null) {
MDC.put("ip", remoteAddr);
}
- String remoteUser = httpRequest.getRemoteUser();
+ final String remoteUser = httpRequest.getRemoteUser();
if (remoteUser != null) {
MDC.put("user", remoteUser);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
index d22b726..5b324c8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
@@ -43,7 +43,7 @@ public class TobagoResponseWriterWrapper extends TobagoResponseWriter {
}
@Override
- public void startElement(HtmlElements name) throws IOException {
+ public void startElement(final HtmlElements name) throws IOException {
responseWriter.startElement(name.getValue(), null);
}
@@ -53,7 +53,7 @@ public class TobagoResponseWriterWrapper extends TobagoResponseWriter {
}
@Override
- public void endElement(HtmlElements name) throws IOException {
+ public void endElement(final HtmlElements name) throws IOException {
responseWriter.endElement(name.getValue());
}
@@ -129,7 +129,7 @@ public class TobagoResponseWriterWrapper extends TobagoResponseWriter {
}
@Override
- public void writeURIAttribute(MarkupLanguageAttributes name, String string) throws IOException {
+ public void writeURIAttribute(final MarkupLanguageAttributes name, final String string) throws IOException {
responseWriter.writeURIAttribute(name.getValue(), string, null);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/GridSpan.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/GridSpan.java
index c692b48..3233ae7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/GridSpan.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/GridSpan.java
@@ -35,7 +35,7 @@ public class GridSpan {
public static GridSpan valueOf(final String string) {
final GridSpan item = new GridSpan();
- StringTokenizer tokenizer = new StringTokenizer(string, " /");
+ final StringTokenizer tokenizer = new StringTokenizer(string, " /");
if (tokenizer.hasMoreElements()) {
item.start = Integer.parseInt(tokenizer.nextToken());
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MarginTokens.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MarginTokens.java
index bfa5501..0474467 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MarginTokens.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MarginTokens.java
@@ -40,7 +40,7 @@ public class MarginTokens {
return margins.get(index);
}
- public void addMargin(Margin token) {
+ public void addMargin(final Margin token) {
margins.add(token);
}
@@ -63,7 +63,7 @@ public class MarginTokens {
}
public static Margin parseToken(final String token) {
- for (Margin margin : Margin.values()) {
+ for (final Margin margin : Margin.values()) {
if (margin.name().equals(token)) {
return margin;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
index 99215f7..0e0d192 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
@@ -46,17 +46,17 @@ public final class Measure implements Serializable {
this.unit = Unit.AUTO;
}
- public Measure(int i, Unit unit) {
+ public Measure(final int i, final Unit unit) {
this.value = i;
this.unit = unit;
}
- public Measure(double d, Unit unit) {
+ public Measure(final double d, final Unit unit) {
this.value = (float) d;
this.unit = unit;
}
- public Measure(String string, Unit unit) {
+ public Measure(final String string, final Unit unit) {
this.value = Float.parseFloat(string);
this.unit = unit;
}
@@ -140,7 +140,7 @@ public final class Measure implements Serializable {
}
public String serialize() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
if (unit != Unit.AUTO) {
builder.append(value);
}
@@ -166,7 +166,7 @@ public final class Measure implements Serializable {
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -174,7 +174,7 @@ public final class Measure implements Serializable {
return false;
}
- Measure measure = (Measure) o;
+ final Measure measure = (Measure) o;
if (Float.compare(measure.value, value) != 0) {
return false;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureList.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureList.java
index f4b0560..07e0970 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureList.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureList.java
@@ -51,7 +51,7 @@ public class MeasureList implements Iterable<Measure> {
return list.size();
}
- public Measure get(int i) {
+ public Measure get(final int i) {
return list.get(i);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java
index 4696430..fe95c33 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java
@@ -60,7 +60,7 @@ public class ScrollPosition implements Serializable {
return left;
}
- public void setLeft(Integer left) {
+ public void setLeft(final Integer left) {
this.left = left;
}
@@ -68,7 +68,7 @@ public class ScrollPosition implements Serializable {
return top;
}
- public void setTop(Integer top) {
+ public void setTop(final Integer top) {
this.top = top;
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java
index 904b070..81232ef 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java
@@ -79,7 +79,7 @@ public class SelectItem extends javax.faces.model.SelectItem implements Visual {
/**
* Alias name for description.
*/
- public void setTip(String tip) {
+ public void setTip(final String tip) {
setDescription(tip);
}
@@ -107,7 +107,7 @@ public class SelectItem extends javax.faces.model.SelectItem implements Visual {
}
@Override
- public void setCustomClass(CustomClass customClass) {
+ public void setCustomClass(final CustomClass customClass) {
this.customClass = customClass;
}
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 e210e23..f9b322e 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
@@ -115,7 +115,7 @@ public class SheetState implements Serializable, ScrollPositionState {
}
public boolean isDefinedColumnWidths() {
- for (Integer columnWidth : columnWidths) {
+ for (final Integer columnWidth : columnWidths) {
if(columnWidth < 0) {
return false;
}
@@ -178,7 +178,7 @@ public class SheetState implements Serializable, ScrollPositionState {
return toBeSorted;
}
- public void setToBeSorted(boolean toBeSorted) {
+ public void setToBeSorted(final boolean toBeSorted) {
this.toBeSorted = toBeSorted;
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
index 05f035b..f22439f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
@@ -53,7 +53,7 @@ public class TobagoRenderKit extends RenderKit {
private Map<Key, Renderer> renderers = new HashMap<>();
public TobagoRenderKit() {
- RenderKitFactory rkFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+ final RenderKitFactory rkFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
htmlBasicRenderKit =
rkFactory.getRenderKit(FacesContext.getCurrentInstance(), RenderKitFactory.HTML_BASIC_RENDER_KIT);
if (LOG.isDebugEnabled()) {
@@ -113,12 +113,12 @@ public class TobagoRenderKit extends RenderKit {
}
@Override
- public void addClientBehaviorRenderer(String type, ClientBehaviorRenderer renderer) {
+ public void addClientBehaviorRenderer(final String type, final ClientBehaviorRenderer renderer) {
htmlBasicRenderKit.addClientBehaviorRenderer(type, renderer);
}
@Override
- public ClientBehaviorRenderer getClientBehaviorRenderer(String type) {
+ public ClientBehaviorRenderer getClientBehaviorRenderer(final String type) {
return htmlBasicRenderKit.getClientBehaviorRenderer(type);
}
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 150ac9e..8fe4d3d 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
@@ -634,7 +634,7 @@ public enum BootstrapClass implements CssItem {
}
public BootstrapClass[] generate(final UIComponent child) {
- ArrayList<BootstrapClass> result = new ArrayList<>(10);
+ final ArrayList<BootstrapClass> result = new ArrayList<>(10);
final Map<String, Object> attributes = child.getAttributes();
generate(result, extraSmall, attributes, Attributes.overwriteExtraSmall);
generate(result, small, attributes, Attributes.overwriteSmall);
@@ -659,7 +659,7 @@ public enum BootstrapClass implements CssItem {
private void generate(
final List<BootstrapClass> result, final MeasureList tokens,
final Map<String, Object> attributes, final Attributes attribute) {
- Object overwrite = attributes.get(attribute.name());
+ final Object overwrite = attributes.get(attribute.name());
if (overwrite != null) {
final Measure measure = Measure.valueOf(overwrite.toString(), Measure.Unit.SEG);
@@ -674,7 +674,7 @@ public enum BootstrapClass implements CssItem {
private Measure getSegmentMeasure(final Measure measure) {
if (measure != null && Measure.Unit.SEG.equals(measure.getUnit())) {
- int number = (int) measure.getValue();
+ final int number = (int) measure.getValue();
if (number < 1) {
LOG.warn("Segment values must been between 1 and 12. Use '1' instead of '{}'.", number);
return new Measure(1, Measure.Unit.SEG);
@@ -688,7 +688,7 @@ public enum BootstrapClass implements CssItem {
private void generate(final List<BootstrapClass> result, final MarginTokens margins,
final Map<String, Object> attributes, final Attributes attribute) {
- Object overwrite = attributes.get(attribute.name());
+ final Object overwrite = attributes.get(attribute.name());
if (overwrite != null) {
final Margin margin = MarginTokens.parseToken((String) overwrite);
@@ -712,7 +712,7 @@ public enum BootstrapClass implements CssItem {
}
}
- public static BootstrapClass valueOf(Measure measure, Attributes attributes) {
+ public static BootstrapClass valueOf(final Measure measure, final Attributes attributes) {
final String size = getSizeSuffix(attributes);
if (measure != null) {
@@ -729,7 +729,7 @@ public enum BootstrapClass implements CssItem {
return null;
}
- public static BootstrapClass valueOf(Margin margin, Attributes attribute) {
+ public static BootstrapClass valueOf(final Margin margin, final Attributes attribute) {
final String size = getSizeSuffix(attribute);
switch (margin) {
@@ -744,7 +744,7 @@ public enum BootstrapClass implements CssItem {
}
}
- private static String getSizeSuffix(Attributes attribute) {
+ private static String getSizeSuffix(final Attributes attribute) {
switch (attribute) {
case extraLarge:
case marginExtraLarge:
@@ -775,7 +775,7 @@ public enum BootstrapClass implements CssItem {
}
}
- public static CssItem valueOf(AlignItems alignItems) {
+ public static CssItem valueOf(final AlignItems alignItems) {
if (alignItems == null) {
return null;
} else {
@@ -797,7 +797,7 @@ public enum BootstrapClass implements CssItem {
}
}
- public static CssItem valueOf(JustifyContent justifyContent) {
+ public static CssItem valueOf(final JustifyContent justifyContent) {
if (justifyContent == null) {
return null;
} else {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
index 81b158b..a5d60cb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
@@ -90,7 +90,7 @@ public class CustomClass implements CssItem {
* @deprecated since 4.0.0
*/
@Deprecated
- public static CustomClass valueOf(String text) {
+ public static CustomClass valueOf(final String text) {
return new CustomClass(text);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java
index 5e71815..265c071 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java
@@ -49,7 +49,7 @@ public class FontAwesomeIconEncoder implements IconEncoder {
static {
ICONS = new EnumMap<>(Icons.class);
- for (Icons icon : Icons.values()) {
+ for (final Icons icon : Icons.values()) {
ICONS.put(icon, new FontAwesomeCssItem("fa-" + icon.name().toLowerCase().replaceAll("_", "-")));
}
}
@@ -70,7 +70,7 @@ public class FontAwesomeIconEncoder implements IconEncoder {
if (icon == null) {
return null;
}
- CssItem result = ICONS.get(icon);
+ final CssItem result = ICONS.get(icon);
if (result == null) {
LOG.warn("Missing icon: '" + icon + "'");
}
@@ -89,7 +89,7 @@ public class FontAwesomeIconEncoder implements IconEncoder {
private String name;
- FontAwesomeCssItem(String name) {
+ FontAwesomeCssItem(final String name) {
this.name = name;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Styles.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Styles.java
index c518d07..58b43cf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Styles.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Styles.java
@@ -65,9 +65,9 @@ public enum Styles {
cssName = createCssName(chars);
}
- private String createCssName(char[] chars) {
- StringBuilder builder = new StringBuilder(chars.length + 1);
- for (char c : chars) {
+ private String createCssName(final char[] chars) {
+ final StringBuilder builder = new StringBuilder(chars.length + 1);
+ for (final char c : chars) {
if (Character.isLowerCase(c)) {
builder.append(c);
} else {
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 c7fc764..bf235aa 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
@@ -237,7 +237,7 @@ public enum TobagoClass implements CssItem {
* @deprecated since 4.0.0, use {@link BootstrapClass#valueOf(AlignItems)}
*/
@Deprecated
- public static CssItem valueOf(AlignItems alignItems) {
+ public static CssItem valueOf(final AlignItems alignItems) {
return BootstrapClass.valueOf(alignItems);
}
@@ -245,7 +245,7 @@ public enum TobagoClass implements CssItem {
* @deprecated since 4.0.0, use {@link BootstrapClass#valueOf(JustifyContent)}
*/
@Deprecated
- public static CssItem valueOf(JustifyContent justifyContent) {
+ public static CssItem valueOf(final JustifyContent justifyContent) {
return BootstrapClass.valueOf(justifyContent);
}
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 ee08bb7..7faf578 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
@@ -221,7 +221,7 @@ public enum DataAttributes implements MarkupLanguageAttributes {
private final String value;
- DataAttributes(String value) {
+ DataAttributes(final String value) {
this.value = value;
}
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 4c1ad8b..16d5222 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
@@ -131,7 +131,7 @@ public enum HtmlAttributes implements MarkupLanguageAttributes {
private final String value;
- HtmlAttributes(String value) {
+ HtmlAttributes(final String value) {
this.value = value;
}
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 992ec1a..6f0fc71 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
@@ -27,7 +27,7 @@ public enum HtmlButtonTypes implements HtmlTypes {
private final String value;
- HtmlButtonTypes(String value) {
+ HtmlButtonTypes(final String value) {
this.value = value;
}
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 2af1b28..2d9626d 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,7 @@ public enum HtmlInputTypes implements HtmlTypes {
private final String value;
- HtmlInputTypes(String value) {
+ HtmlInputTypes(final String value) {
this.value = value;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/IgnoringSanitizer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/IgnoringSanitizer.java
index ff9a9e1..3359ee2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/IgnoringSanitizer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/IgnoringSanitizer.java
@@ -32,12 +32,12 @@ public class IgnoringSanitizer implements Sanitizer {
private static final Logger LOG = LoggerFactory.getLogger(IgnoringSanitizer.class);
@Override
- public String sanitize(String html) {
+ public String sanitize(final String html) {
return html;
}
@Override
- public void setProperties(Properties configuration) {
+ public void setProperties(final Properties configuration) {
LOG.warn("No configuration needed! Got: '{}'", configuration);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
index 31fa1d7..a6c3136 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
@@ -108,7 +108,7 @@ public class ResourceServlet extends HttpServlet {
throws ServletException, IOException {
final String requestURI = request.getRequestURI();
- String resource = requestURI.substring(request.getContextPath().length() + 1);
+ final String resource = requestURI.substring(request.getContextPath().length() + 1);
if (expires != null) {
response.setDateHeader("Last-Modified", 0);
response.setHeader("Cache-Control", "Public, max-age=" + expires);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AjaxUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AjaxUtils.java
index 0399eaf..00d9ffd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AjaxUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AjaxUtils.java
@@ -59,7 +59,7 @@ public class AjaxUtils {
public static void removeRenderIds(final FacesContext facesContext, final String... renderIds) {
final Collection<String> collection = facesContext.getPartialViewContext().getRenderIds();
- for (String renderId : renderIds) {
+ for (final String renderId : renderIds) {
collection.remove(renderId);
}
}
@@ -68,9 +68,9 @@ public class AjaxUtils {
return new HashSet<>(facesContext.getPartialViewContext().getRenderIds());
}
- public static void navigate(FacesContext facesContext, Object outcome) {
+ public static void navigate(final FacesContext facesContext, final Object outcome) {
final Application application = facesContext.getApplication();
- NavigationHandler navigationHandler = application.getNavigationHandler();
+ final NavigationHandler navigationHandler = application.getNavigationHandler();
navigationHandler.handleNavigation(facesContext, null, outcome.toString());
facesContext.renderResponse();
}
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 1ab9124..b2272a2 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
@@ -216,7 +216,7 @@ public final class ComponentUtils {
return null;
}
- public static <T> T findAncestor(UIComponent component, final Class<T> type) {
+ public static <T> T findAncestor(final UIComponent component, final Class<T> type) {
UIComponent c = component;
while (c != null) {
if (type.isAssignableFrom(c.getClass())) {
@@ -419,7 +419,7 @@ public final class ComponentUtils {
public static FacesMessage.Severity getMaximumSeverity(final List<FacesMessage> messages) {
FacesMessage.Severity max = null;
- for (FacesMessage message : messages) {
+ for (final FacesMessage message : messages) {
if (max == null || message.getSeverity().getOrdinal() > max.getOrdinal()) {
max = message.getSeverity();
}
@@ -456,7 +456,7 @@ public final class ComponentUtils {
public static boolean getBooleanAttribute(
final UIComponent component, final Attributes name, final boolean defaultValue) {
- Object bool = component.getAttributes().get(name.getName());
+ final Object bool = component.getAttributes().get(name.getName());
if (bool == null) {
return defaultValue;
} else if (bool instanceof Boolean) {
@@ -809,7 +809,7 @@ public final class ComponentUtils {
}
public static Object getDataAttribute(final UIComponent component, final String name) {
- Map<Object, Object> map = getDataAttributes(component);
+ final Map<Object, Object> map = getDataAttributes(component);
return map != null ? map.get(name) : null;
}
@@ -830,7 +830,7 @@ public final class ComponentUtils {
Class converterType = null;
try {
converterType = valueExpression.getType(facesContext.getELContext());
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignore, seems not to be possible, when EL is a function like #{bean.getName(item.id)}
}
if (converterType == null) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFormat.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFormat.java
index 43414bd..0dde6c5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFormat.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFormat.java
@@ -26,50 +26,50 @@ import javax.faces.context.FacesContext;
*/
public class MessageFormat {
- public static String format(String pattern, Object param0) {
+ public static String format(final String pattern, final Object param0) {
return createMessageFormat(pattern).format(new Object[] {param0});
}
- public static String format(String pattern, Object param0, Object param1) {
+ public static String format(final String pattern, final Object param0, final Object param1) {
return createMessageFormat(pattern).format(new Object[] {param0, param1});
}
- public static String format(String pattern, Object param0, Object param1, Object param2) {
+ public static String format(final String pattern, final Object param0, final Object param1, final Object param2) {
return createMessageFormat(pattern).format(new Object[] {param0, param1, param2});
}
- public static String format(String pattern, Object param0, Object param1, Object param2, Object param3) {
+ public static String format(final String pattern, final Object param0, final Object param1, final Object param2, final Object param3) {
return createMessageFormat(pattern).format(new Object[] {param0, param1, param2, param3});
}
- public static String format(String pattern, Object param0, Object param1, Object param2, Object param3,
- Object param4) {
+ public static String format(final String pattern, final Object param0, final Object param1, final Object param2, final Object param3,
+ final Object param4) {
return createMessageFormat(pattern).format(new Object[] {param0, param1, param2, param3, param4});
}
- public static String format(String pattern, Object param0, Object param1, Object param2, Object param3,
- Object param4, Object param5) {
+ public static String format(final String pattern, final Object param0, final Object param1, final Object param2, final Object param3,
+ final Object param4, final Object param5) {
return createMessageFormat(pattern).format(new Object[] {param0, param1, param2, param3, param4, param5});
}
- public static String format(String pattern, Object param0, Object param1, Object param2, Object param3,
- Object param4, Object param5, Object param6) {
+ public static String format(final String pattern, final Object param0, final Object param1, final Object param2, final Object param3,
+ final Object param4, final Object param5, final Object param6) {
return createMessageFormat(pattern).format(new Object[] {param0, param1, param2, param3, param4, param5, param6});
}
- public static String format(String pattern, Object param0, Object param1, Object param2, Object param3,
- Object param4, Object param5, Object param6, Object param7) {
+ public static String format(final String pattern, final Object param0, final Object param1, final Object param2, final Object param3,
+ final Object param4, final Object param5, final Object param6, final Object param7) {
return createMessageFormat(pattern).format(
new Object[] {param0, param1, param2, param3, param4, param5, param6, param7});
}
- public static String format(String pattern, Object param0, Object param1, Object param2, Object param3,
- Object param4, Object param5, Object param6, Object param7, Object param8) {
+ public static String format(final String pattern, final Object param0, final Object param1, final Object param2, final Object param3,
+ final Object param4, final Object param5, final Object param6, final Object param7, final Object param8) {
return createMessageFormat(pattern).format(
new Object[] {param0, param1, param2, param3, param4, param5, param6, param7, param8});
}
- private static java.text.MessageFormat createMessageFormat(String pattern) {
+ private static java.text.MessageFormat createMessageFormat(final String pattern) {
return new java.text.MessageFormat(pattern, FacesContext.getCurrentInstance().getViewRoot().getLocale());
}
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 2d4a3d2..9105de4 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
@@ -75,11 +75,11 @@ public class WebXmlUtils {
String locationDefault = null;
String location500 = null;
- for (Document document : webXmls) {
+ for (final Document document : webXmls) {
final NodeList errorPages = document.getElementsByTagName("error-page");
for (int i = 0; i < errorPages.getLength(); i++) {
- Node errorPage = errorPages.item(i);
+ final Node errorPage = errorPages.item(i);
String errorCode = null;
String exceptionType = null;
@@ -87,7 +87,7 @@ public class WebXmlUtils {
final NodeList children = errorPage.getChildNodes();
for (int j = 0; j < children.getLength(); j++) {
- Node child = children.item(j);
+ final Node child = children.item(j);
final String name = child.getNodeName();
if ("error-code".equals(name)) {
@@ -122,10 +122,10 @@ public class WebXmlUtils {
private static List<Document> getWebXmls(final FacesContext facesContext)
throws ParserConfigurationException, IOException, SAXException {
- List<Document> webXmls = new ArrayList<>();
+ final List<Document> webXmls = new ArrayList<>();
- DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- for (URL url : getWebXmlUrls(facesContext)) {
+ final DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ for (final URL url : getWebXmlUrls(facesContext)) {
webXmls.add(getWebXml(documentBuilder, url));
}
@@ -133,8 +133,8 @@ public class WebXmlUtils {
}
private static List<URL> getWebXmlUrls(final FacesContext facesContext) throws IOException {
- List<URL> urls = new ArrayList<>();
- ServletContext servletContext = (ServletContext) facesContext.getExternalContext().getContext();
+ final List<URL> urls = new ArrayList<>();
+ final ServletContext servletContext = (ServletContext) facesContext.getExternalContext().getContext();
urls.add(servletContext.getResource("/WEB-INF/web.xml"));
final Enumeration<URL> webFragments = Thread.currentThread().getContextClassLoader()
@@ -149,7 +149,7 @@ public class WebXmlUtils {
private static Document getWebXml(final DocumentBuilder documentBuilder, final URL url)
throws ParserConfigurationException, IOException, SAXException {
if (url != null) {
- URLConnection connection = url.openConnection();
+ final URLConnection connection = url.openConnection();
connection.setUseCaches(false);
InputStream input = null;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandler.java
index 18a70a9..51c4098 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandler.java
@@ -45,7 +45,7 @@ public class AjaxExceptionHandler extends ExceptionHandlerWrapper {
private ExceptionHandler wrapped;
- AjaxExceptionHandler(ExceptionHandler exception) {
+ AjaxExceptionHandler(final ExceptionHandler exception) {
this.wrapped = exception;
}
@@ -85,7 +85,7 @@ public class AjaxExceptionHandler extends ExceptionHandlerWrapper {
renderErrorPage(facesContext, errorPageLocation);
cleanupExceptionQueuedEvents();
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new FacesException(e);
}
} else {
@@ -98,12 +98,12 @@ public class AjaxExceptionHandler extends ExceptionHandlerWrapper {
}
private void renderErrorPage(final FacesContext facesContext, final String errorPageLocation) throws IOException {
- ViewHandler viewHandler = facesContext.getApplication().getViewHandler();
+ final ViewHandler viewHandler = facesContext.getApplication().getViewHandler();
final UIViewRoot viewRoot = viewHandler.createView(facesContext, errorPageLocation);
facesContext.setViewRoot(viewRoot);
facesContext.getPartialViewContext().setRenderAll(true);
- ViewDeclarationLanguage viewDeclarationLanguage = viewHandler
+ final ViewDeclarationLanguage viewDeclarationLanguage = viewHandler
.getViewDeclarationLanguage(facesContext, errorPageLocation);
viewDeclarationLanguage.buildView(facesContext, viewRoot);
facesContext.getApplication().publishEvent(facesContext, PreRenderViewEvent.class, viewRoot);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandlerFactory.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandlerFactory.java
index 4ee7f71..d056a0b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandlerFactory.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandlerFactory.java
@@ -26,7 +26,7 @@ public class AjaxExceptionHandlerFactory extends ExceptionHandlerFactory {
private ExceptionHandlerFactory parent;
- public AjaxExceptionHandlerFactory(ExceptionHandlerFactory parent) {
+ public AjaxExceptionHandlerFactory(final ExceptionHandlerFactory parent) {
this.parent = parent;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/Secret.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/Secret.java
index 2845bf6..af0f650 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/Secret.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/Secret.java
@@ -52,11 +52,11 @@ public final class Secret implements Serializable {
final Map requestParameterMap = facesContext.getExternalContext().getRequestParameterMap();
final String fromRequest = (String) requestParameterMap.get(Secret.KEY);
final Object session = facesContext.getExternalContext().getSession(false);
- Secret secret = getSecret(session);
+ final Secret secret = getSecret(session);
return secret != null && secret.secret.equals(fromRequest);
}
- private static Secret getSecret(Object session) {
+ private static Secret getSecret(final Object session) {
Secret secret = null;
if (session!=null) {
if (session instanceof HttpSession) {
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 d093a73..7b8d979 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
@@ -218,7 +218,7 @@ public abstract class TobagoResponseWriter extends ResponseWriter {
private boolean writeCssItem(final StringBuilder builder, final CssItem... cssItems) {
boolean render = false;
- for (CssItem cssItem : cssItems) {
+ for (final CssItem cssItem : cssItems) {
if (cssItem != null && !"".equals(cssItem.getName())) {
builder.append(cssItem.getName());
builder.append(' ');
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AttributesOfGeneratedUIComponentsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AttributesOfGeneratedUIComponentsUnitTest.java
index 4d563b9..21d4854 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AttributesOfGeneratedUIComponentsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AttributesOfGeneratedUIComponentsUnitTest.java
@@ -39,7 +39,7 @@ public class AttributesOfGeneratedUIComponentsUnitTest extends AbstractGenerated
continue;
}
- String methodName = method.getName();
+ final String methodName = method.getName();
if (!methodName.startsWith("set") || methodName.length() <= 3) {
continue;
}
@@ -51,7 +51,7 @@ public class AttributesOfGeneratedUIComponentsUnitTest extends AbstractGenerated
final Attributes attribute;
try {
attribute = Attributes.valueOf(property);
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
Assert.fail(e.getMessage());
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/RendererTypesUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/RendererTypesUnitTest.java
index a591a96..1133e91 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/RendererTypesUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/RendererTypesUnitTest.java
@@ -37,7 +37,7 @@ public class RendererTypesUnitTest extends EnumUnitTest {
}
@Override
- protected String constantCaseToEnum(String constant) {
+ protected String constantCaseToEnum(final String constant) {
return StringUtils.constantToUpperCamelCase(constant);
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/context/MarkupUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/context/MarkupUnitTest.java
index b36f156..a78a413 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/context/MarkupUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/context/MarkupUnitTest.java
@@ -171,10 +171,10 @@ public class MarkupUnitTest {
@Test
public void testNames() throws IllegalAccessException {
- List<Field> markups = new ArrayList<>();
- List<Field> strings = new ArrayList<>();
+ final List<Field> markups = new ArrayList<>();
+ final List<Field> strings = new ArrayList<>();
- for (Field field : Markup.class.getFields()) {
+ for (final Field field : Markup.class.getFields()) {
if (field.getName().startsWith("STRING")) {
strings.add(field);
} else if (!field.getName().equals("NULL")) {
@@ -184,13 +184,13 @@ public class MarkupUnitTest {
Assert.assertEquals("Is for every markup a string constant defined?", markups.size(), strings.size());
- for (Field markupField : markups) {
- Markup markup = (Markup) markupField.get(null);
+ for (final Field markupField : markups) {
+ final Markup markup = (Markup) markupField.get(null);
boolean pendantFound = false;
- for (Field stringField : strings) {
+ for (final Field stringField : strings) {
if (stringField.getName().equals("STRING_" + markupField.getName())) {
- String string = (String) stringField.get(null);
+ final String string = (String) stringField.get(null);
Assert.assertEquals(markup.toString(), string);
pendantFound = true;
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 591494d..3719736 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
@@ -246,7 +246,7 @@ public class AbstractUIGridLayoutUnitTest extends AbstractTobagoTestBase {
Assert.assertEquals(null, expand[6][1]);
}
- private UIComponent createComponent(String id) {
+ private UIComponent createComponent(final String id) {
return ComponentUtils.createComponent(facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.Panel, id);
}
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 8a33a05..bbbda20 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
@@ -86,7 +86,7 @@ public abstract class AbstractTobagoTestBase extends AbstractJsfTestCase {
servletContext.setAttribute(TobagoConfig.TOBAGO_CONFIG, tobagoConfig);
try {
MimeTypeUtils.init(servletContext);
- } catch (IllegalStateException e) {
+ } catch (final IllegalStateException e) {
// ignoring double call
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/PartUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/PartUtilsUnitTest.java
index 98e21af..37acbc9 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/PartUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/PartUtilsUnitTest.java
@@ -52,7 +52,7 @@ public class PartUtilsUnitTest {
private String contentDisposition;
- PartMock(String contentDisposition) {
+ PartMock(final String contentDisposition) {
this.contentDisposition = contentDisposition;
}
@@ -67,7 +67,7 @@ public class PartUtilsUnitTest {
}
@Override
- public String getHeader(String headerName) {
+ public String getHeader(final String headerName) {
if (headerName.equals("Content-Disposition")) {
return contentDisposition;
} else {
@@ -81,7 +81,7 @@ public class PartUtilsUnitTest {
}
@Override
- public Collection<String> getHeaders(String headerName) {
+ public Collection<String> getHeaders(final String headerName) {
return null;
}
@@ -101,7 +101,7 @@ public class PartUtilsUnitTest {
}
@Override
- public void write(String fileName) throws IOException {
+ public void write(final String fileName) throws IOException {
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
index e218e5b..ae51686 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
@@ -34,14 +34,14 @@ class CssClassUtils {
*/
static List<CssItem> compareCss(final String cssFileName, final CssItem[] cssItems) throws FileNotFoundException {
- List<CssItem> missing = new ArrayList<>();
+ final List<CssItem> missing = new ArrayList<>();
- File cssFile = new File(cssFileName);
+ final File cssFile = new File(cssFileName);
Assert.assertTrue(cssFile.exists());
- String fileContent = new Scanner(cssFile).useDelimiter("\\Z").next();
+ final String fileContent = new Scanner(cssFile).useDelimiter("\\Z").next();
- for (CssItem cssItem : cssItems) {
+ for (final CssItem cssItem : cssItems) {
if (!containsClassName(fileContent, cssItem.getName())) {
missing.add(cssItem);
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/StyleUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/StyleUnitTest.java
index 6bedafc..c94e876 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/StyleUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/StyleUnitTest.java
@@ -32,14 +32,14 @@ public class StyleUnitTest extends AbstractJsfTestCase {
@Test
public void testEncodedEmpty() {
- Style style = new Style();
+ final Style style = new Style();
Assert.assertEquals("Check encoder", "", style.encode());
Assert.assertEquals("Check encoder JSON", "{}", style.encodeJson());
}
@Test
public void testEncodedFull() {
- Style style = new Style();
+ final Style style = new Style();
style.setWidth(Measure.valueOf(110));
style.setHeight(Measure.valueOf(220));
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/TobagoClassUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/TobagoClassUnitTest.java
index 11f7833..5f0712f 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/TobagoClassUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/TobagoClassUnitTest.java
@@ -34,8 +34,8 @@ public class TobagoClassUnitTest {
final String fieldRegex = "[A-Z_]*[A-Z]";
final String nameRegex = "[a-z][a-zA-Z\\-]*[a-z]";
- for (TobagoClass value : TobagoClass.values()) {
- boolean ignoreByTest = TobagoClass.class.getField(value.name()).isAnnotationPresent(Deprecated.class);
+ for (final TobagoClass value : TobagoClass.values()) {
+ final boolean ignoreByTest = TobagoClass.class.getField(value.name()).isAnnotationPresent(Deprecated.class);
if (!ignoreByTest) {
final String field = value.toString();
final String name = value.getName();
@@ -43,12 +43,12 @@ public class TobagoClassUnitTest {
Assert.assertTrue(field.matches(fieldRegex));
Assert.assertTrue(name.matches(nameRegex));
- StringBuilder calculatedName = new StringBuilder();
+ final StringBuilder calculatedName = new StringBuilder();
calculatedName.append("tobago-");
for (int i = 0; i < field.length(); i++) {
- char c = field.charAt(i);
+ final char c = field.charAt(i);
if (c == '_') {
- char nextChar = field.charAt(i + 1);
+ final char nextChar = field.charAt(i + 1);
if (nextChar == '_') {
calculatedName.append("-");
} else {
@@ -73,8 +73,8 @@ public class TobagoClassUnitTest {
final TobagoClass[] allValues = TobagoClass.values();
final List<TobagoClass> toCheck = new ArrayList<>();
- for (TobagoClass value : allValues) {
- boolean ignoreByTest = TobagoClass.class.getField(value.name()).isAnnotationPresent(Deprecated.class);
+ for (final TobagoClass value : allValues) {
+ final boolean ignoreByTest = TobagoClass.class.getField(value.name()).isAnnotationPresent(Deprecated.class);
if (!ignoreByTest) {
toCheck.add(value);
}
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 42699e8..c3c2a24 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
@@ -43,7 +43,7 @@ public class HtmlElementsUnitTest {
public void testVoid() throws IllegalAccessException {
// list from spec.
- List<String> voids = Arrays.asList(
+ final List<String> voids = Arrays.asList(
"area", "base", "br", "col", "command", "embed",
"hr", "img", "input", "keygen", "link", "meta",
"param", "source", "track", "wbr");
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 2a6625a..fe160d5 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
@@ -59,7 +59,7 @@ public class ComponentUtilsUnitTest extends AbstractTobagoTestBase {
public void testGetMaximumSeverity() {
final FacesContext facesContext = FacesContext.getCurrentInstance();
- UIIn input = new UIIn();
+ final UIIn input = new UIIn();
final String inputId = "InputID";
input.setId(inputId);
@@ -81,7 +81,7 @@ public class ComponentUtilsUnitTest extends AbstractTobagoTestBase {
Assert.assertEquals(FacesMessage.SEVERITY_FATAL, ComponentUtils.getMaximumSeverity(input));
- UIOut output = new UIOut();
+ final UIOut output = new UIOut();
final String outputId = "OutputID";
output.setId(outputId);
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/EnumUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/EnumUnitTest.java
index 47a8330..30ddc8f 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/EnumUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/EnumUnitTest.java
@@ -30,11 +30,11 @@ public abstract class EnumUnitTest {
return "[a-z][a-zA-Z]*";
}
- protected String constantCaseToEnum(String constant) {
+ protected String constantCaseToEnum(final String constant) {
return StringUtils.constantToLowerCamelCase(constant);
}
- public <E extends Enum<E>> void testNames(Class<E> enumType)
+ public <E extends Enum<E>> void testNames(final Class<E> enumType)
throws NoSuchFieldException, IllegalAccessException {
final Field[] fields = enumType.getFields();
diff --git a/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java b/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java
index 375365d..6e5d9b8 100644
--- a/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java
+++ b/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java
@@ -44,7 +44,7 @@ public class Hello {
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
}
diff --git a/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/CommandNode.java b/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/CommandNode.java
index 60f7158..feccf02 100644
--- a/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/CommandNode.java
+++ b/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/CommandNode.java
@@ -27,11 +27,11 @@ public class CommandNode extends DefaultMutableTreeNode {
private String action;
private String url;
- public CommandNode(String name) {
+ public CommandNode(final String name) {
this.name = name;
}
- public CommandNode(String name, String action, String url) {
+ public CommandNode(final String name, final String action, final String url) {
this.name = name;
this.action = action;
this.url = url;
diff --git a/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/SolarObject.java b/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/SolarObject.java
index 4d77f56..56daa38 100644
--- a/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/SolarObject.java
+++ b/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/SolarObject.java
@@ -90,7 +90,7 @@ public class SolarObject {
return name;
}
- public void update(AjaxBehaviorEvent event) {
+ public void update(final AjaxBehaviorEvent event) {
LOG.info("AjaxBehaviorEvent called. New value: '{}' event: {}", name, event);
}
@@ -237,8 +237,8 @@ public class SolarObject {
}
// TODO: optimize
- public static SolarObject find(String name) {
- for (SolarObject solarObject : DATA) {
+ public static SolarObject find(final String name) {
+ for (final SolarObject solarObject : DATA) {
if (solarObject.getName().equals(name)) {
return solarObject;
}
@@ -343,18 +343,18 @@ public class SolarObject {
};
static {
- List<Element> sun = Arrays.asList(
+ final List<Element> sun = Arrays.asList(
new Element("Hydrogen", 0.74),
new Element("Helium", 0.25)
);
SUN.setChemicalComposition(sun);
- List<Element> earth = Arrays.asList(
+ final List<Element> earth = Arrays.asList(
new Element("Silica", 0.60),
new Element("Alimina", 0.15),
new Element("Lime", 0.05)
);
EARTH.setChemicalComposition(earth);
- List<Element> moon = Arrays.asList(
+ final List<Element> moon = Arrays.asList(
new Element("Silica", 0.45),
new Element("Alimina", 0.24),
new Element("Lime", 0.16)
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java
index 3b89b1e..51bcfd4 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java
@@ -34,7 +34,7 @@ public class BehaviorController implements Serializable {
return ajax;
}
- public void setAjax(String ajax) {
+ public void setAjax(final String ajax) {
this.ajax = ajax;
}
@@ -42,7 +42,7 @@ public class BehaviorController implements Serializable {
return event;
}
- public void setEvent(String event) {
+ public void setEvent(final String event) {
this.event = event;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BootstrapUtils.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BootstrapUtils.java
index 2a90bde..aa57d31 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BootstrapUtils.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BootstrapUtils.java
@@ -7,7 +7,7 @@ public class BootstrapUtils {
/**
* This method ensures, the used Bootstrap class is really existing.
*/
- public static String valueOf(String name) {
+ public static String valueOf(final String name) {
return BootstrapClass.valueOf(name).getName();
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleBoxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleBoxController.java
index 8f784b8..652abc5 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleBoxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleBoxController.java
@@ -33,7 +33,7 @@ public class CollapsibleBoxController implements Serializable {
return collapsed;
}
- public void setCollapsed(boolean collapsed) {
+ public void setCollapsed(final boolean collapsed) {
this.collapsed = collapsed;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java
index e34fd5b..5f77718 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java
@@ -54,7 +54,7 @@ public class CollapsibleController implements Serializable {
return collapsed;
}
- public void setCollapsed(boolean collapsed) {
+ public void setCollapsed(final boolean collapsed) {
this.collapsed = collapsed;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePanelController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePanelController.java
index e11996a..2390aba 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePanelController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePanelController.java
@@ -33,7 +33,7 @@ public class CollapsiblePanelController implements Serializable {
return panelCollapsed;
}
- public void setPanelCollapsed(boolean panelCollapsed) {
+ public void setPanelCollapsed(final boolean panelCollapsed) {
this.panelCollapsed = panelCollapsed;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePopupController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePopupController.java
index f7dc990..65afba1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePopupController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePopupController.java
@@ -33,7 +33,7 @@ public class CollapsiblePopupController implements Serializable {
return collapsed;
}
- public void setCollapsed(boolean collapsed) {
+ public void setCollapsed(final boolean collapsed) {
this.collapsed = collapsed;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleSectionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleSectionController.java
index 85e9a44..d4981e3 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleSectionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleSectionController.java
@@ -33,7 +33,7 @@ public class CollapsibleSectionController implements Serializable {
return collapsed;
}
- public void setCollapsed(boolean collapsed) {
+ public void setCollapsed(final boolean collapsed) {
this.collapsed = collapsed;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversionController.java
index cb6fa31..a6dcb27 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversionController.java
@@ -33,7 +33,7 @@ public class ConversionController implements Serializable {
return amount;
}
- public void setAmount(double amount) {
+ public void setAmount(final double amount) {
this.amount = amount;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java
index 2a6ca3a..9e5511c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java
@@ -45,7 +45,7 @@ public class CurrentValueController {
try {
this.date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("1969-07-24 16:50:35");
- } catch (ParseException e) {
+ } catch (final ParseException e) {
LOG.error("", e);
}
@@ -66,7 +66,7 @@ public class CurrentValueController {
return calendar.getTime();
}
- public Currency toCurrency(String string) {
+ public Currency toCurrency(final String string) {
return Currency.getInstance(string);
}
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 fc0c6ba..d1755f2 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
@@ -41,10 +41,10 @@ public class DateController implements Serializable {
public DateController() {
once = new Date();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
submitDate = sdf.parse("2016-05-22");
- } catch (ParseException e) {
+ } catch (final ParseException e) {
LOG.error("", e);
}
}
@@ -53,7 +53,7 @@ public class DateController implements Serializable {
return once;
}
- public void setOnce(Date once) {
+ public void setOnce(final Date once) {
this.once = once;
}
@@ -61,7 +61,7 @@ public class DateController implements Serializable {
return onchange;
}
- public void setOnchange(Date onchange) {
+ public void setOnchange(final Date onchange) {
this.onchange = onchange;
}
@@ -73,7 +73,7 @@ public class DateController implements Serializable {
return submitDate;
}
- public void setSubmitDate(Date submitDate) {
+ public void setSubmitDate(final Date submitDate) {
this.submitDate = submitDate;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java
index a66fbe5..22cb122 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java
@@ -37,7 +37,7 @@ public class DefaultCommandController implements Serializable {
return value1;
}
- public void setValue1(String value1) {
+ public void setValue1(final String value1) {
this.value1 = value1;
}
@@ -45,7 +45,7 @@ public class DefaultCommandController implements Serializable {
return value2;
}
- public void setValue2(String value2) {
+ public void setValue2(final String value2) {
this.value2 = value2;
}
@@ -53,7 +53,7 @@ public class DefaultCommandController implements Serializable {
return value3;
}
- public void setValue3(String value3) {
+ public void setValue3(final String value3) {
this.value3 = value3;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DeltaSpikeClientWindowConfig.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DeltaSpikeClientWindowConfig.java
index 6d74eb4..eda0768 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DeltaSpikeClientWindowConfig.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DeltaSpikeClientWindowConfig.java
@@ -28,7 +28,7 @@ import javax.faces.context.FacesContext;
public class DeltaSpikeClientWindowConfig extends DefaultClientWindowConfig {
@Override
- public ClientWindowRenderMode getClientWindowRenderMode(FacesContext facesContext) {
+ public ClientWindowRenderMode getClientWindowRenderMode(final FacesContext facesContext) {
String path = facesContext.getExternalContext().getRequestPathInfo();
if (path == null) {
path = facesContext.getExternalContext().getRequestServletPath();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DemoController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DemoController.java
index 5a39e66..2c1b822 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DemoController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DemoController.java
@@ -108,7 +108,7 @@ public class DemoController implements Serializable {
final Salutation[] salutations = Salutation.values();
final SelectItem[] items = new SelectItem[salutations.length];
for (int i = 0; i < items.length; i++) {
- String label = DemoBundle.getString(FacesContext.getCurrentInstance(), salutations[i].getKey());
+ final String label = DemoBundle.getString(FacesContext.getCurrentInstance(), salutations[i].getKey());
if (LOG.isTraceEnabled()) {
LOG.trace("label = " + label + "");
}
@@ -120,7 +120,7 @@ public class DemoController implements Serializable {
private static SelectItem[] getSelectItems(final Selectable[] keys) {
final SelectItem[] items = new SelectItem[keys.length];
for (int i = 0; i < items.length; i++) {
- String label = DemoBundle.getString(FacesContext.getCurrentInstance(), keys[i].name());
+ final String label = DemoBundle.getString(FacesContext.getCurrentInstance(), keys[i].name());
if (LOG.isTraceEnabled()) {
LOG.trace("label = " + label + "");
}
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 7e3a4fd..3d31995 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
@@ -240,7 +240,7 @@ public class EventController implements Serializable {
private final String tagName;
private final Collection<String> eventNames = new TreeSet<>();
- EventsOnComponent(UIComponentBase component) {
+ EventsOnComponent(final UIComponentBase component) {
final String simpleName = component.getClass().getSimpleName();
tagName = simpleName.substring(2, 3).toLowerCase() + simpleName.substring(3);
if (component.getEventNames() != null) {
@@ -309,11 +309,11 @@ public class EventController implements Serializable {
}
public String getSpecialEvents() {
- Set<String> specialEventNames = new TreeSet<>();
+ final Set<String> specialEventNames = new TreeSet<>();
- for (String eventName : eventNames) {
+ for (final String eventName : eventNames) {
boolean isSpecialEvent = true;
- for (CommonEvent commonEvent : CommonEvent.values()) {
+ for (final CommonEvent commonEvent : CommonEvent.values()) {
if (eventName.equals(commonEvent.name())) {
isSpecialEvent = false;
}
@@ -327,11 +327,11 @@ public class EventController implements Serializable {
return specialEventNames.size() > 0 ? concatStrings(specialEventNames) : "";
}
- private String concatStrings(Set<String> strings) {
- StringBuilder stringBuilder = new StringBuilder();
+ private String concatStrings(final Set<String> strings) {
+ final StringBuilder stringBuilder = new StringBuilder();
int i = 0;
- for (String string : strings) {
+ for (final String string : strings) {
i++;
stringBuilder.append(string);
if (i < strings.size()) {
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 50febdb..3142811 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
@@ -31,10 +31,10 @@ import java.io.StringWriter;
public class ExceptionController implements Serializable {
public String getStackTrace() {
- Throwable exception = (Throwable) FacesContext.getCurrentInstance().getExternalContext()
+ final Throwable exception = (Throwable) FacesContext.getCurrentInstance().getExternalContext()
.getRequestMap().get("javax.servlet.error.exception");
- StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter(stringWriter);
+ final StringWriter stringWriter = new StringWriter();
+ final PrintWriter printWriter = new PrintWriter(stringWriter);
if(exception != null) {
exception.printStackTrace(printWriter);
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java
index 7879200..80d92bc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java
@@ -47,11 +47,11 @@ public class ExceptionHandlerController {
return value;
}
- public void setValue(String value) {
+ public void setValue(final String value) {
this.value = value;
}
- public void update(AjaxBehaviorEvent event) {
+ public void update(final AjaxBehaviorEvent event) {
if (((String) event.getComponent().getAttributes().get("value")).contains("x")) {
throw new RuntimeException("This exception is thrown, because the input value was 'x'.");
}
@@ -66,11 +66,11 @@ public class ExceptionHandlerController {
return sheetState;
}
- public void setSheetState(SheetState sheetState) {
+ public void setSheetState(final SheetState sheetState) {
this.sheetState = sheetState;
}
- public void preRenderViewListener(ComponentSystemEvent event) {
+ public void preRenderViewListener(final ComponentSystemEvent event) {
if (sheetState != null && sheetState.getFirst() > 20) {
sheetState.setFirst(0);
throw new NullPointerException("This exception is thrown, because page 7 or higher is selected.");
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 cabecfd..4856fda 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
@@ -70,7 +70,7 @@ public class ExecuteController implements Serializable {
return value1;
}
- public void setValue1(String value1) {
+ public void setValue1(final String value1) {
this.value1 = value1;
}
@@ -78,7 +78,7 @@ public class ExecuteController implements Serializable {
return value2;
}
- public void setValue2(String value2) {
+ public void setValue2(final String value2) {
this.value2 = value2;
}
@@ -86,7 +86,7 @@ public class ExecuteController implements Serializable {
return value3;
}
- public void setValue3(String value3) {
+ public void setValue3(final String value3) {
this.value3 = value3;
}
@@ -94,7 +94,7 @@ public class ExecuteController implements Serializable {
return value4;
}
- public void setValue4(String value4) {
+ public void setValue4(final String value4) {
this.value4 = value4;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java
index c848aae..76f66bf 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java
@@ -47,7 +47,7 @@ public class ForEachController implements Serializable {
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
@@ -55,7 +55,7 @@ public class ForEachController implements Serializable {
return length;
}
- public void setLength(String length) {
+ public void setLength(final String length) {
this.length = length;
}
@@ -63,7 +63,7 @@ public class ForEachController implements Serializable {
return discharge;
}
- public void setDischarge(String discharge) {
+ public void setDischarge(final String discharge) {
this.discharge = discharge;
}
@@ -93,7 +93,7 @@ public class ForEachController implements Serializable {
private int length;
private int discharge;
- public River(String name, int length, int discharge) {
+ public River(final String name, final int length, final int discharge) {
this.name = name;
this.length = length;
this.discharge = discharge;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormAjaxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormAjaxController.java
index 0cf81c6..8eca99d 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormAjaxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormAjaxController.java
@@ -35,7 +35,7 @@ public class FormAjaxController implements Serializable {
return outerValue;
}
- public void setOuterValue(String outerValue) {
+ public void setOuterValue(final String outerValue) {
this.outerValue = outerValue;
}
@@ -43,7 +43,7 @@ public class FormAjaxController implements Serializable {
return innerValue1;
}
- public void setInnerValue1(String innerValue1) {
+ public void setInnerValue1(final String innerValue1) {
this.innerValue1 = innerValue1;
}
@@ -51,7 +51,7 @@ public class FormAjaxController implements Serializable {
return innerValue2;
}
- public void setInnerValue2(String innerValue2) {
+ public void setInnerValue2(final String innerValue2) {
this.innerValue2 = innerValue2;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java
index fdfe5f9..0c92c1a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java
@@ -39,7 +39,7 @@ public class FormController implements Serializable {
return value1;
}
- public void setValue1(String value1) {
+ public void setValue1(final String value1) {
this.value1 = value1;
}
@@ -47,7 +47,7 @@ public class FormController implements Serializable {
return value2;
}
- public void setValue2(String value2) {
+ public void setValue2(final String value2) {
this.value2 = value2;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormRequiredController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormRequiredController.java
index 9d1154c..d3c9cda 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormRequiredController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormRequiredController.java
@@ -35,7 +35,7 @@ public class FormRequiredController implements Serializable {
return outerValue;
}
- public void setOuterValue(String outerValue) {
+ public void setOuterValue(final String outerValue) {
this.outerValue = outerValue;
}
@@ -43,7 +43,7 @@ public class FormRequiredController implements Serializable {
return innerValue1;
}
- public void setInnerValue1(String innerValue1) {
+ public void setInnerValue1(final String innerValue1) {
this.innerValue1 = innerValue1;
}
@@ -51,7 +51,7 @@ public class FormRequiredController implements Serializable {
return innerValue2;
}
- public void setInnerValue2(String innerValue2) {
+ public void setInnerValue2(final String innerValue2) {
this.innerValue2 = innerValue2;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
index bbed56b..75a390b 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
@@ -67,7 +67,7 @@ public class GroupController implements Serializable {
return newMessage;
}
- public void setNewMessage(String newMessage) {
+ public void setNewMessage(final String newMessage) {
this.newMessage = newMessage;
}
@@ -80,22 +80,22 @@ public class GroupController implements Serializable {
return sendTo;
}
- public void setSendTo(String sendTo) {
+ public void setSendTo(final String sendTo) {
this.sendTo = sendTo;
}
- public void sendToListener(AjaxBehaviorEvent event) {
+ public void sendToListener(final AjaxBehaviorEvent event) {
LOG.info("AjaxBehaviorEvent called.");
if (event != null && event.getComponent() instanceof AbstractUICommand) {
- AbstractUICommand command = (AbstractUICommand) event.getComponent();
+ final AbstractUICommand command = (AbstractUICommand) event.getComponent();
sendTo = command.getLabel();
LOG.info("AjaxBehaviorEvent called. Current label: '{}'", sendTo);
}
}
- public void compute(AjaxBehaviorEvent event) {
+ public void compute(final AjaxBehaviorEvent event) {
LOG.info("AjaxBehaviorEvent called.");
compute();
}
@@ -119,7 +119,7 @@ public class GroupController implements Serializable {
return value;
}
- public void setValue(double value) {
+ public void setValue(final double value) {
this.value = value;
}
@@ -131,7 +131,7 @@ public class GroupController implements Serializable {
return currency;
}
- public void setCurrency(Currency currency) {
+ public void setCurrency(final Currency currency) {
this.currency = currency;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java
index 063e19b..25430c0 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java
@@ -34,7 +34,7 @@ public class InController {
private String changeValue;
- public void update(AjaxBehaviorEvent event) {
+ public void update(final AjaxBehaviorEvent event) {
LOG.info("AjaxBehaviorEvent called. Current value: '{}'", changeValue);
}
@@ -42,7 +42,7 @@ public class InController {
return changeValue;
}
- public void setChangeValue(String changeValue) {
+ public void setChangeValue(final String changeValue) {
this.changeValue = changeValue;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
index 8761e12..978f652 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
@@ -125,12 +125,12 @@ public class LocaleController implements Serializable {
final String suffix
= StringUtils.isNotBlank(language) && StringUtils.isNotBlank(country) ? "_" + language + "_" + country : "";
String url = "/image/country" + suffix + ".png";
- ServletContext servletContext =
+ final ServletContext servletContext =
(ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
URL resource = null;
try {
resource = servletContext.getResource(url);
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
// ignore
}
if (resource == null) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java
index a0c8bae..e829e5a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java
@@ -87,7 +87,7 @@ public class Login {
return username;
}
- public void setUsername(String username) {
+ public void setUsername(final String username) {
this.username = username;
}
@@ -95,7 +95,7 @@ public class Login {
return password;
}
- public void setPassword(String password) {
+ public void setPassword(final String password) {
this.password = password;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java
index 4be7c77..3794842 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java
@@ -77,7 +77,7 @@ public class ManifestReader {
format.setTimeZone(TimeZone.getTimeZone("UTC"));
try {
buildTime = format.parse(attributes.getValue("Build-Time"));
- } catch (ParseException e) {
+ } catch (final ParseException e) {
LOG.error("Can't parse '" + attributes.getValue("Build-Time") + "'", e);
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessageLayoutController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessageLayoutController.java
index 74476e7..352a689 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessageLayoutController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessageLayoutController.java
@@ -36,7 +36,7 @@ public class MessageLayoutController implements Serializable {
return component;
}
- public void setComponent(UIComponent component) {
+ public void setComponent(final UIComponent component) {
this.component = component;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MetaController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MetaController.java
index c14586c..fbc8242 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MetaController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MetaController.java
@@ -14,7 +14,7 @@ public class MetaController implements Serializable {
return formatDetection;
}
- public void setFormatDetection(boolean formatDetection) {
+ public void setFormatDetection(final boolean formatDetection) {
this.formatDetection = formatDetection;
}
}
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 3dcf7d2..4e385d0 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
@@ -57,7 +57,7 @@ public class NavigationNode extends DefaultMutableTreeNode implements Comparable
String t;
try {
t = DemoBundle.getString(FacesContext.getCurrentInstance(), key);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Not found key '{}' in bundle", key);
t = name;
}
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 9f0f3f9..53f35e3 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
@@ -137,7 +137,7 @@ public class NavigationState implements Serializable {
return viewSource;
}
- public void setViewSource(boolean viewSource) {
+ public void setViewSource(final boolean viewSource) {
this.viewSource = viewSource;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
index 72ae677..57e0c62 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
@@ -127,7 +127,7 @@ public class NavigationTree implements Serializable {
return result;
}
- public NavigationNode findByViewId(String viewId) {
+ public NavigationNode findByViewId(final String viewId) {
if (viewId != null) {
final Enumeration enumeration = root.depthFirstEnumeration();
while (enumeration.hasMoreElements()) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OldLinksServlet.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OldLinksServlet.java
index 2e4c00e..17176cb 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OldLinksServlet.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OldLinksServlet.java
@@ -33,13 +33,13 @@ public class OldLinksServlet extends HttpServlet {
private static final Logger LOG = LoggerFactory.getLogger(OldLinksServlet.class);
- protected void doPost(HttpServletRequest request,
- HttpServletResponse response)
+ protected void doPost(final HttpServletRequest request,
+ final HttpServletResponse response)
throws ServletException, IOException {
doGet(request, response);
}
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
throws ServletException, IOException {
response.setStatus(HttpServletResponse.SC_FOUND);
final String redirect = request.getContextPath() + request.getPathInfo() + '?' + request.getQueryString();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PanelController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PanelController.java
index 70e1415..34ed728 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PanelController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PanelController.java
@@ -38,7 +38,7 @@ public class PanelController implements Serializable {
return text;
}
- public void setText(String text) {
+ public void setText(final String text) {
this.text = text;
}
}
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 2d3d849..7224415 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
@@ -74,7 +74,7 @@ public class PartialReloadController {
return logAndNavigate(null);
}
- public void navigateAction(AjaxBehaviorEvent event) {
+ public void navigateAction(final AjaxBehaviorEvent event) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
if (navigationState == null) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PlanetExample.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PlanetExample.java
index fa34fd5..7d69175 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PlanetExample.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PlanetExample.java
@@ -57,7 +57,7 @@ public abstract class PlanetExample {
return planet;
}
- public void setPlanet(int planet) {
+ public void setPlanet(final int planet) {
this.planet = planet;
}
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 5ad1b92..50e05bf 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
@@ -36,7 +36,7 @@ public class PopupController implements Serializable {
return popup1Collapsed;
}
- public void setPopup1Collapsed(boolean popup1Collapsed) {
+ public void setPopup1Collapsed(final boolean popup1Collapsed) {
this.popup1Collapsed = popup1Collapsed;
}
@@ -52,7 +52,7 @@ public class PopupController implements Serializable {
return popup1Text;
}
- public void setPopup1Text(String popup1Text) {
+ public void setPopup1Text(final String popup1Text) {
this.popup1Text = popup1Text;
}
@@ -60,7 +60,7 @@ public class PopupController implements Serializable {
return popup2Text;
}
- public void setPopup2Text(String popup2Text) {
+ public void setPopup2Text(final String popup2Text) {
this.popup2Text = popup2Text;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PrettyUrlForMenuNavigationHandler.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PrettyUrlForMenuNavigationHandler.java
index b766ad8..7d6af6a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PrettyUrlForMenuNavigationHandler.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PrettyUrlForMenuNavigationHandler.java
@@ -38,7 +38,7 @@ public class PrettyUrlForMenuNavigationHandler extends NavigationHandler {
}
@Override
- public void handleNavigation(final FacesContext facesContext, final String fromAction, String outcome) {
+ public void handleNavigation(final FacesContext facesContext, final String fromAction, final String outcome) {
if (StringUtils.startsWith(outcome, "/content/")) {
final ViewHandler viewHandler = facesContext.getApplication().getViewHandler();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java
index ea097f7..4de100b 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java
@@ -43,7 +43,7 @@ public class ProgressController implements Serializable {
}
public void addProgress() {
- int value = progress.getValue();
+ final int value = progress.getValue();
if (value >= progress.getMaximum()) {
progress.setValue(0);
@@ -61,17 +61,17 @@ public class ProgressController implements Serializable {
}
public double getCurrentHours() {
- SimpleDateFormat sdf = new SimpleDateFormat("HH");
+ final SimpleDateFormat sdf = new SimpleDateFormat("HH");
return Double.valueOf(sdf.format(getCurrentDate()));
}
public double getCurrentMinutes() {
- SimpleDateFormat sdf = new SimpleDateFormat("mm");
+ final SimpleDateFormat sdf = new SimpleDateFormat("mm");
return Double.valueOf(sdf.format(getCurrentDate()));
}
public double getCurrentSeconds() {
- SimpleDateFormat sdf = new SimpleDateFormat("ss");
+ final SimpleDateFormat sdf = new SimpleDateFormat("ss");
return Double.valueOf(sdf.format(getCurrentDate()));
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
index b2e3852..6d6fb60 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
@@ -35,7 +35,7 @@ public class RoleController implements Serializable {
return text;
}
- public void setText(String text) {
+ public void setText(final String text) {
this.text = text;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java
index 3e5a81c..9ec3009 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java
@@ -38,7 +38,7 @@ public class SelectBooleanCheckboxController implements Serializable {
return a;
}
- public void setA(boolean a) {
+ public void setA(final boolean a) {
this.a = a;
}
@@ -46,7 +46,7 @@ public class SelectBooleanCheckboxController implements Serializable {
return b;
}
- public void setB(boolean b) {
+ public void setB(final boolean b) {
this.b = b;
}
@@ -54,7 +54,7 @@ public class SelectBooleanCheckboxController implements Serializable {
return c;
}
- public void setC(boolean c) {
+ public void setC(final boolean c) {
this.c = c;
}
@@ -62,7 +62,7 @@ public class SelectBooleanCheckboxController implements Serializable {
return d;
}
- public void setD(boolean d) {
+ public void setD(final boolean d) {
this.d = d;
}
@@ -70,7 +70,7 @@ public class SelectBooleanCheckboxController implements Serializable {
return e;
}
- public void setE(boolean e) {
+ public void setE(final boolean e) {
this.e = e;
}
@@ -78,7 +78,7 @@ public class SelectBooleanCheckboxController implements Serializable {
return f;
}
- public void setF(boolean f) {
+ public void setF(final boolean f) {
this.f = f;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectItemModel.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectItemModel.java
index 2fe3211..5e9fb39 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectItemModel.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectItemModel.java
@@ -80,7 +80,7 @@ public class SelectItemModel implements Serializable {
return currency2;
}
- public void setCurrency2(Currency currency2) {
+ public void setCurrency2(final Currency currency2) {
this.currency2 = currency2;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java
index 580c746..e56b27d 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java
@@ -36,13 +36,13 @@ public class SelectManyCheckboxController implements Serializable {
return animals;
}
- public void setAnimals(List<String> animals) {
+ public void setAnimals(final List<String> animals) {
this.animals = animals;
}
public String getAnimal() {
String retValue = "";
- for (String s : animals) {
+ for (final String s : animals) {
retValue = retValue.concat(s + " ");
}
return retValue;
@@ -52,13 +52,13 @@ public class SelectManyCheckboxController implements Serializable {
return numbers;
}
- public void setNumbers(List<String> numbers) {
+ public void setNumbers(final List<String> numbers) {
this.numbers = numbers;
}
public int getResult() {
int result = 0;
- for (String number : numbers) {
+ for (final String number : numbers) {
result += Integer.valueOf(number);
}
return result;
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 e1133c9..1b9fbd9 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
@@ -49,13 +49,13 @@ public class SelectManyListboxController implements Serializable {
return celestials;
}
- public void setCelestials(List<String> celestials) {
+ public void setCelestials(final List<String> celestials) {
this.celestials = celestials;
}
public String getCelestial() {
String retValue = "";
- for (String s : celestials) {
+ for (final String s : celestials) {
retValue = retValue.concat(s);
}
return retValue;
@@ -69,7 +69,7 @@ public class SelectManyListboxController implements Serializable {
return selectedDeserts;
}
- public void setSelectedDeserts(List<String> selectedDeserts) {
+ public void setSelectedDeserts(final List<String> selectedDeserts) {
this.selectedDeserts = selectedDeserts;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyShuttleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyShuttleController.java
index e58370c..3c825ab 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyShuttleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyShuttleController.java
@@ -49,7 +49,7 @@ public class SelectManyShuttleController implements Serializable {
return selectedPlanets;
}
- public void setSelectedPlanets(SolarObject[] selectedPlanets) {
+ public void setSelectedPlanets(final SolarObject[] selectedPlanets) {
this.selectedPlanets = selectedPlanets;
}
@@ -65,7 +65,7 @@ public class SelectManyShuttleController implements Serializable {
return selectedStars;
}
- public void setSelectedStars(String[] selectedStars) {
+ public void setSelectedStars(final String[] selectedStars) {
this.selectedStars = selectedStars;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java
index d578857..9980f51 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java
@@ -33,7 +33,7 @@ public class SelectOneChoiceController extends PlanetExample implements Serializ
return person;
}
- public void setPerson(String person) {
+ public void setPerson(final String person) {
this.person = person;
}
}
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 38a820a..b08f3dc 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
@@ -47,7 +47,7 @@ public class SelectOneListboxController implements Serializable {
return river;
}
- public void setRiver(String river) {
+ public void setRiver(final String river) {
this.river = river;
}
@@ -59,7 +59,7 @@ public class SelectOneListboxController implements Serializable {
return mountain;
}
- public void setMountain(String mountain) {
+ public void setMountain(final String mountain) {
this.mountain = mountain;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java
index 152e5cb..0d82a3a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java
@@ -35,7 +35,7 @@ public class SelectOneRadioController extends PlanetExample implements Serializa
return numberOne;
}
- public void setNumberOne(int numberOne) {
+ public void setNumberOne(final int numberOne) {
this.numberOne = numberOne;
}
@@ -43,7 +43,7 @@ public class SelectOneRadioController extends PlanetExample implements Serializa
return numberTwo;
}
- public void setNumberTwo(int numberTwo) {
+ public void setNumberTwo(final int numberTwo) {
this.numberTwo = numberTwo;
}
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 8209e5e..215c486 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
@@ -56,7 +56,7 @@ public class SheetConfig {
sheetPagePagingPosition = ShowPosition.right;
sheetPagingPositionItems = createSheetItems(ShowPosition.values());
final Set<Selectable> selectableSupportedBySheet = new HashSet<>();
- for (Selectable selectable : Selectable.values()) {
+ for (final Selectable selectable : Selectable.values()) {
if (selectable.isSupportedBySheet()) {
selectableSupportedBySheet.add(selectable);
}
@@ -187,7 +187,7 @@ public class SheetConfig {
return showDirectLinksArrows;
}
- public void setShowDirectLinksArrows(boolean showDirectLinksArrows) {
+ public void setShowDirectLinksArrows(final boolean showDirectLinksArrows) {
this.showDirectLinksArrows = showDirectLinksArrows;
}
@@ -195,7 +195,7 @@ public class SheetConfig {
return showPageRangeArrows;
}
- public void setShowPageRangeArrows(boolean showPageRangeArrows) {
+ public void setShowPageRangeArrows(final boolean showPageRangeArrows) {
this.showPageRangeArrows = showPageRangeArrows;
}
}
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 421b574..c8b721e 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
@@ -51,15 +51,15 @@ public class SheetController implements Serializable {
private static final SelectItem[] SHEET_SELECTABLE;
static {
- List<Selectable> collect = new ArrayList<>();
- for (Selectable selectable : Selectable.values()) {
+ final List<Selectable> collect = new ArrayList<>();
+ for (final Selectable selectable : Selectable.values()) {
if (selectable.isSupportedBySheet()) {
collect.add(selectable);
}
}
SHEET_SELECTABLE = new SelectItem[collect.size()];
for (int i = 0; i < collect.size(); i++) {
- Selectable selectable = collect.get(i);
+ final Selectable selectable = collect.get(i);
SHEET_SELECTABLE[i] = new SelectItem(selectable, selectable.name());
}
}
@@ -78,8 +78,8 @@ public class SheetController implements Serializable {
hugeSolarList = new ArrayList<>();
for (int i = 1; i <= 12; i++) {
- for (SolarObject solarObject : solarList) {
- SolarObject solarObjectClone = new SolarObject(solarObject);
+ for (final SolarObject solarObject : solarList) {
+ final SolarObject solarObjectClone = new SolarObject(solarObject);
solarObjectClone.setName(solarObject.getName() + " (" + i + ". entry)");
hugeSolarList.add(solarObjectClone);
}
@@ -98,7 +98,7 @@ public class SheetController implements Serializable {
return sheetState;
}
- public void setSheetState(SheetState sheetState) {
+ public void setSheetState(final SheetState sheetState) {
this.sheetState = sheetState;
}
@@ -122,7 +122,7 @@ public class SheetController implements Serializable {
return automaticLayout;
}
- public void setAutomaticLayout(boolean automaticLayout) {
+ public void setAutomaticLayout(final boolean automaticLayout) {
this.automaticLayout = automaticLayout;
}
@@ -130,11 +130,11 @@ public class SheetController implements Serializable {
return markup;
}
- public void setMarkup(List<Markup> markup) {
+ public void setMarkup(final List<Markup> markup) {
this.markup = markup;
}
- public void setColumnEventSample(int columnEventSample) {
+ public void setColumnEventSample(final int columnEventSample) {
this.columnEventSample = columnEventSample;
}
@@ -147,7 +147,7 @@ public class SheetController implements Serializable {
final DateTimeConverter dateTimeConverter = new DateTimeConverter() {
@Override
- public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value) {
+ public Object getAsObject(final FacesContext facesContext, final UIComponent uiComponent, final String value) {
final Date date = (Date) super.getAsObject(facesContext, uiComponent, value);
final Calendar calendar = GregorianCalendar.getInstance(facesContext.getViewRoot().getLocale());
calendar.setTime(date);
@@ -155,7 +155,7 @@ public class SheetController implements Serializable {
}
@Override
- public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value) {
+ public String getAsString(final FacesContext facesContext, final UIComponent uiComponent, final Object value) {
final Calendar calendar = GregorianCalendar.getInstance(facesContext.getViewRoot().getLocale());
calendar.set(Calendar.YEAR, (Integer) value);
final Date date = calendar.getTime();
@@ -171,7 +171,7 @@ public class SheetController implements Serializable {
return selectable;
}
- public void setSelectable(Selectable selectable) {
+ public void setSelectable(final Selectable selectable) {
this.selectable = 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 b8f57b4..bc9b37f 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
@@ -73,8 +73,8 @@ public class SheetFilterController extends SheetController implements Serializab
new SelectItem(new DistanceRange(1000000, Integer.MAX_VALUE), "1000000 < x")
};
- Set<Integer> years = new TreeSet<>();
- for (SolarObject solarObject : getSolarList()) {
+ final Set<Integer> years = new TreeSet<>();
+ for (final SolarObject solarObject : getSolarList()) {
if (solarObject.getDiscoverYear() != null) {
years.add(solarObject.getDiscoverYear());
}
@@ -84,8 +84,8 @@ public class SheetFilterController extends SheetController implements Serializab
minYearItems[0] = new SelectItem(0, "min");
maxYearItems[0] = new SelectItem(Integer.MAX_VALUE, "max");
int i = 1;
- for (Integer year : years) {
- SelectItem selectItem = new SelectItem(year, String.valueOf(year));
+ for (final Integer year : years) {
+ final SelectItem selectItem = new SelectItem(year, String.valueOf(year));
minYearItems[i] = selectItem;
maxYearItems[i] = selectItem;
@@ -134,7 +134,7 @@ public class SheetFilterController extends SheetController implements Serializab
return null;
}
- public void filter(AjaxBehaviorEvent event) {
+ public void filter(final AjaxBehaviorEvent event) {
filter();
}
@@ -162,7 +162,7 @@ public class SheetFilterController extends SheetController implements Serializab
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
@@ -170,7 +170,7 @@ public class SheetFilterController extends SheetController implements Serializab
return orbit;
}
- public void setOrbit(String orbit) {
+ public void setOrbit(final String orbit) {
this.orbit = orbit;
}
@@ -178,7 +178,7 @@ public class SheetFilterController extends SheetController implements Serializab
return distance;
}
- public void setDistance(DistanceRange distance) {
+ public void setDistance(final DistanceRange distance) {
this.distance = distance;
}
@@ -186,7 +186,7 @@ public class SheetFilterController extends SheetController implements Serializab
return discoverer;
}
- public void setDiscoverer(String discoverer) {
+ public void setDiscoverer(final String discoverer) {
this.discoverer = discoverer;
}
@@ -194,7 +194,7 @@ public class SheetFilterController extends SheetController implements Serializab
return minYear;
}
- public void setMinYear(Integer minYear) {
+ public void setMinYear(final Integer minYear) {
this.minYear = minYear;
}
@@ -202,7 +202,7 @@ public class SheetFilterController extends SheetController implements Serializab
return maxYear;
}
- public void setMaxYear(Integer maxYear) {
+ public void setMaxYear(final Integer maxYear) {
this.maxYear = maxYear;
}
@@ -210,7 +210,7 @@ public class SheetFilterController extends SheetController implements Serializab
return nameSuggestionQuery;
}
- public void setNameSuggestionQuery(String nameSuggestionQuery) {
+ public void setNameSuggestionQuery(final String nameSuggestionQuery) {
this.nameSuggestionQuery = nameSuggestionQuery;
}
@@ -219,7 +219,7 @@ public class SheetFilterController extends SheetController implements Serializab
LOG.info("Creating items for substring: '" + substring + "'");
final List<String> result = new ArrayList<>();
for (final SolarObject solarObject : getSolarList()) {
- String name = solarObject.getName();
+ final String name = solarObject.getName();
if (StringUtils.containsIgnoreCase(name, substring)) {
result.add(name);
}
@@ -233,13 +233,13 @@ public class SheetFilterController extends SheetController implements Serializab
private int max;
private final String label;
- DistanceRange(int min, int max) {
+ DistanceRange(final int min, final int max) {
this.min = min;
this.max = max;
label = String.valueOf(min) + " < x ≤ " + String.valueOf(max);
}
- DistanceRange(int min, int max, String label) {
+ DistanceRange(final int min, final int max, final String label) {
this.min = min;
this.max = max;
this.label = label;
@@ -280,13 +280,13 @@ public class SheetFilterController extends SheetController implements Serializab
public Object getAsObject(final FacesContext context, final UIComponent component, final String value)
throws ConverterException {
try {
- for (SelectItem distanceItem : distanceItems) {
+ for (final SelectItem distanceItem : distanceItems) {
if (distanceItem.getLabel().equals(value)) {
return distanceItem.getValue();
}
}
return distanceItems[0].getValue();
- } catch (RuntimeException e) {
+ } catch (final RuntimeException e) {
LOG.warn("unknown value='" + value + "'", e);
return distanceItems[0].getValue();
}
@@ -296,7 +296,7 @@ public class SheetFilterController extends SheetController implements Serializab
public String getAsString(
final FacesContext context, final UIComponent component, final Object value) throws ConverterException {
if (value instanceof DistanceRange) {
- for (SelectItem distanceItem : distanceItems) {
+ for (final SelectItem distanceItem : distanceItems) {
if (distanceItem.getValue().equals(value)) {
return distanceItem.getLabel();
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
index 445e63b..dcea550 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
@@ -31,7 +31,7 @@ public abstract class SourceFileReader {
private static final Logger LOG = LoggerFactory.getLogger(SourceFileReader.class);
- public String getSource(String filename) {
+ public String getSource(final String filename) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
final ExternalContext externalContext = facesContext.getExternalContext();
final String viewId = facesContext.getViewRoot().getViewId();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SplitLayoutController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SplitLayoutController.java
index c565ca5..3af4f2f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SplitLayoutController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SplitLayoutController.java
@@ -35,7 +35,7 @@ public class SplitLayoutController implements Serializable {
return horizontalLayout;
}
- public void setHorizontalLayout(String horizontalLayout) {
+ public void setHorizontalLayout(final String horizontalLayout) {
this.horizontalLayout = horizontalLayout;
}
@@ -43,7 +43,7 @@ public class SplitLayoutController implements Serializable {
return verticalLayout;
}
- public void setVerticalLayout(String verticalLayout) {
+ public void setVerticalLayout(final String verticalLayout) {
this.verticalLayout = verticalLayout;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java
index e646f58..396c2d0 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java
@@ -50,7 +50,7 @@ public class SuggestController implements Serializable {
return query;
}
- public void setQuery(String query) {
+ public void setQuery(final String query) {
this.query = query;
}
@@ -90,7 +90,7 @@ public class SuggestController implements Serializable {
return selection1;
}
- public void setSelection1(String selection1) {
+ public void setSelection1(final String selection1) {
LOG.info("setSelection1 ->" + selection1);
this.selection1 = selection1;
}
@@ -99,7 +99,7 @@ public class SuggestController implements Serializable {
return selection2;
}
- public void setSelection2(String selection2) {
+ public void setSelection2(final String selection2) {
this.selection2 = selection2;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java
index d3e007f..89588cb 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java
@@ -43,7 +43,7 @@ public class TabController implements Serializable {
return index;
}
- public void setIndex(int index) {
+ public void setIndex(final int index) {
this.index = index;
}
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 cc14903..e901aca 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
@@ -43,7 +43,7 @@ public class TestController implements Serializable {
final String testJsUrl = "/" + getBase() + ".test.js";
try {
return externalContext.getResource(testJsUrl) != null;
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
LOG.error("URL was: " + testJsUrl, e);
}
return false;
@@ -56,20 +56,20 @@ public class TestController implements Serializable {
}
public List<String> getAllPages() {
- List<String> pages = new ArrayList<>();
+ final List<String> pages = new ArrayList<>();
final File rootDir = new File("src/main/webapp/content");
if (rootDir.exists()) {
- for (String page : getXHTMLs(rootDir)) {
+ for (final String page : getXHTMLs(rootDir)) {
pages.add(page.substring(16));
}
}
return pages;
}
- private List<String> getXHTMLs(File dir) {
- List<String> xhtmls = new ArrayList<>();
- for (File file : dir.listFiles()) {
+ private List<String> getXHTMLs(final File dir) {
+ final List<String> xhtmls = new ArrayList<>();
+ for (final File file : dir.listFiles()) {
if (file.isDirectory()) {
xhtmls.addAll(getXHTMLs(file));
} else if (!file.getName().startsWith("x-") && file.getName().endsWith(".xhtml")) {
@@ -80,12 +80,12 @@ public class TestController implements Serializable {
}
public List<TestPage> getTestPages() {
- List<TestPage> testPages = new ArrayList<>();
+ final List<TestPage> testPages = new ArrayList<>();
int idCount = 1;
final File rootDir = new File("src/main/webapp/content");
if (rootDir.exists()) {
- for (String testJs : getTestJs(rootDir)) {
+ for (final String testJs : getTestJs(rootDir)) {
final String base = testJs.substring(16, testJs.length() - 8);
testPages.add(new TestPage("tp" + idCount++, base));
}
@@ -93,9 +93,9 @@ public class TestController implements Serializable {
return testPages;
}
- private List<String> getTestJs(File dir) {
- List<String> testJsFiles = new ArrayList<>();
- for (File file : dir.listFiles()) {
+ private List<String> getTestJs(final File dir) {
+ final List<String> testJsFiles = new ArrayList<>();
+ for (final File file : dir.listFiles()) {
if (file.isDirectory()) {
testJsFiles.addAll(getTestJs(file));
} else if (!file.getName().startsWith("x-") && file.getName().endsWith(".test.js")) {
@@ -109,7 +109,7 @@ public class TestController implements Serializable {
private final String id;
private final String base;
- TestPage(String id, String base) {
+ TestPage(final String id, final String base) {
this.id = id;
this.base = base;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java
index f878ec5..1a26d6e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java
@@ -51,7 +51,7 @@ public class TextareaController implements Serializable {
return longText;
}
- public void setLongText(String longText) {
+ public void setLongText(final String longText) {
this.longText = longText;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java
index 2c07c49..ecab108 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java
@@ -56,7 +56,7 @@ public class ThemeController implements Serializable {
return theme;
}
- public void setTheme(Theme theme) {
+ public void setTheme(final Theme theme) {
this.theme = theme;
}
@@ -64,7 +64,7 @@ public class ThemeController implements Serializable {
return themeItems;
}
- public void setThemeItems(SelectItem[] themeItems) {
+ public void setThemeItems(final SelectItem[] themeItems) {
this.themeItems = themeItems;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TinyMceController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TinyMceController.java
index 9c285cd..4092688 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TinyMceController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TinyMceController.java
@@ -38,7 +38,7 @@ public class TinyMceController extends SourceFileReader implements Serializable
return text;
}
- public void setText(String text) {
+ public void setText(final String text) {
this.text = text;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeCommandTypesController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeCommandTypesController.java
index 432b1f7..0981c08 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeCommandTypesController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeCommandTypesController.java
@@ -46,7 +46,7 @@ public class TreeCommandTypesController implements Serializable {
return actionOneCount;
}
- public void increaseActionCount(String name) {
+ public void increaseActionCount(final String name) {
if ("ActionOne".equals(name)) {
actionOneCount++;
} else if ("ActionTwo".equals(name)) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
index c72de9a..dd59170 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
@@ -48,7 +48,7 @@ public class TreeController implements Serializable {
return treeShowRoot;
}
- public void setTreeShowRoot(boolean treeShowRoot) {
+ public void setTreeShowRoot(final boolean treeShowRoot) {
this.treeShowRoot = treeShowRoot;
}
@@ -56,7 +56,7 @@ public class TreeController implements Serializable {
return treeShowRootJunction;
}
- public void setTreeShowRootJunction(boolean treeShowRootJunction) {
+ public void setTreeShowRootJunction(final boolean treeShowRootJunction) {
this.treeShowRootJunction = treeShowRootJunction;
}
@@ -64,7 +64,7 @@ public class TreeController implements Serializable {
return treeIndentRendered;
}
- public void setTreeIndentRendered(boolean treeIndentRendered) {
+ public void setTreeIndentRendered(final boolean treeIndentRendered) {
this.treeIndentRendered = treeIndentRendered;
}
@@ -72,7 +72,7 @@ public class TreeController implements Serializable {
return treeIndentShowJunction;
}
- public void setTreeIndentShowJunction(boolean treeIndentShowJunction) {
+ public void setTreeIndentShowJunction(final boolean treeIndentShowJunction) {
this.treeIndentShowJunction = treeIndentShowJunction;
}
}
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 9fcf8a8..aa213af 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
@@ -56,7 +56,7 @@ public class TreeEditorController implements Serializable {
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
@@ -110,11 +110,11 @@ public class TreeEditorController implements Serializable {
return null;
}
- private DefaultMutableTreeNode cloneNode(DefaultMutableTreeNode node) {
- String nodeName = ((Node) node.getUserObject()).getName();
- DefaultMutableTreeNode resultNode = new DefaultMutableTreeNode(new Node(nodeName));
+ private DefaultMutableTreeNode cloneNode(final DefaultMutableTreeNode node) {
+ final String nodeName = ((Node) node.getUserObject()).getName();
+ final DefaultMutableTreeNode resultNode = new DefaultMutableTreeNode(new Node(nodeName));
- Enumeration children = node.children();
+ final Enumeration children = node.children();
while (children.hasMoreElements()) {
final DefaultMutableTreeNode child = (DefaultMutableTreeNode) children.nextElement();
resultNode.insert(cloneNode(child), resultNode.getChildCount());
@@ -141,11 +141,11 @@ public class TreeEditorController implements Serializable {
return null;
}
- private boolean isBaseNodeContainSelectedNode(DefaultMutableTreeNode base, DefaultMutableTreeNode selected) {
+ private boolean isBaseNodeContainSelectedNode(final DefaultMutableTreeNode base, final DefaultMutableTreeNode selected) {
if (base.equals(selected)) {
return true;
}
- Enumeration children = base.children();
+ final Enumeration children = base.children();
while (children.hasMoreElements()) {
final DefaultMutableTreeNode baseChild = (DefaultMutableTreeNode) children.nextElement();
@@ -157,10 +157,10 @@ public class TreeEditorController implements Serializable {
return false;
}
- private void deselectAllNodes(DefaultMutableTreeNode node) {
+ private void deselectAllNodes(final DefaultMutableTreeNode node) {
((Node) node.getUserObject()).setSelected(false);
- Enumeration children = node.children();
+ final Enumeration children = node.children();
while (children.hasMoreElements()) {
final DefaultMutableTreeNode child = (DefaultMutableTreeNode) children.nextElement();
deselectAllNodes(child);
@@ -170,9 +170,9 @@ public class TreeEditorController implements Serializable {
public String moveUp() {
final DefaultMutableTreeNode node = findFirstSelected();
if (node != null) {
- DefaultMutableTreeNode previousSibling = node.getPreviousSibling();
+ final DefaultMutableTreeNode previousSibling = node.getPreviousSibling();
if (previousSibling != null) {
- DefaultMutableTreeNode parent = (DefaultMutableTreeNode) node.getParent();
+ final DefaultMutableTreeNode parent = (DefaultMutableTreeNode) node.getParent();
parent.insert(node, parent.getIndex(previousSibling));
} else {
FacesContext.getCurrentInstance().addMessage(null,
@@ -185,9 +185,9 @@ public class TreeEditorController implements Serializable {
public String moveDown() {
final DefaultMutableTreeNode node = findFirstSelected();
if (node != null) {
- DefaultMutableTreeNode nextSibling = node.getNextSibling();
+ final DefaultMutableTreeNode nextSibling = node.getNextSibling();
if (nextSibling != null) {
- DefaultMutableTreeNode parent = (DefaultMutableTreeNode) node.getParent();
+ final DefaultMutableTreeNode parent = (DefaultMutableTreeNode) node.getParent();
parent.insert(node, parent.getIndex(nextSibling));
} else {
FacesContext.getCurrentInstance().addMessage(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 40dd440..ad210ad 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
@@ -46,22 +46,22 @@ public class TreeSelectController implements Serializable {
return selectable;
}
- public void setSelectable(String selectable) {
+ public void setSelectable(final String selectable) {
this.selectable = selectable;
resetSelection(sample);
}
- public void resetSelection(DefaultMutableTreeNode node) {
- Node userObject = (Node) node.getUserObject();
+ public void resetSelection(final DefaultMutableTreeNode node) {
+ final Node userObject = (Node) node.getUserObject();
userObject.setSelected(false);
for (int i = 0; i < node.getChildCount(); i++) {
- DefaultMutableTreeNode child = (DefaultMutableTreeNode) node.getChildAt(i);
+ final DefaultMutableTreeNode child = (DefaultMutableTreeNode) node.getChildAt(i);
resetSelection(child);
}
}
public String getSelectedNodes() {
- StringBuilder stringBuilder = new StringBuilder();
+ final StringBuilder stringBuilder = new StringBuilder();
buildSelectedNodesString(stringBuilder, sample);
if (stringBuilder.length() > 2) {
return stringBuilder.substring(2); // Remove ', '.
@@ -70,13 +70,13 @@ public class TreeSelectController implements Serializable {
}
}
- private void buildSelectedNodesString(StringBuilder stringBuilder, DefaultMutableTreeNode node) {
- Node userObject = (Node) node.getUserObject();
+ private void buildSelectedNodesString(final StringBuilder stringBuilder, final DefaultMutableTreeNode node) {
+ final Node userObject = (Node) node.getUserObject();
if (userObject.isSelected()) {
stringBuilder.append(", " + userObject.getName());
}
for (int i = 0; i < node.getChildCount(); i++) {
- DefaultMutableTreeNode child = (DefaultMutableTreeNode) node.getChildAt(i);
+ final DefaultMutableTreeNode child = (DefaultMutableTreeNode) node.getChildAt(i);
buildSelectedNodesString(stringBuilder, child);
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UniversalLoggingInfo.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UniversalLoggingInfo.java
index 6a03120..f86d2d2 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UniversalLoggingInfo.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UniversalLoggingInfo.java
@@ -130,7 +130,7 @@ public class UniversalLoggingInfo {
return testCategory;
}
- public void setTestCategory(String testCategory) {
+ public void setTestCategory(final String testCategory) {
if (testCategory != null) {
this.testCategory = testCategory;
} else {
@@ -148,8 +148,8 @@ public class UniversalLoggingInfo {
private String factoryMethod;
private boolean usesString; // is false it uses "Object" for logging
- public LoggingInfo(String id, String factoryClassName, String factoryMethod,
- String category, boolean usesString, 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;
@@ -159,16 +159,16 @@ public class UniversalLoggingInfo {
}
public void logDemo() {
- for (String call : calls) {
+ for (final String call : calls) {
try {
invoke(id, logger, call);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.println("Ignoring: " + e);
}
}
}
- private void invoke(String id, Object logger, String name) throws Exception {
+ private void invoke(final String id, final Object logger, final String name) throws Exception {
final Class clazz = usesString ? String.class : Object.class;
final Method method = logger.getClass().getMethod(name, clazz);
method.invoke(logger, "Hello " + id + ", this is the level: " + name);
@@ -182,27 +182,27 @@ public class UniversalLoggingInfo {
return activeLevels;
}
- protected void reset(String category) {
+ protected void reset(final String category) {
logger = null;
try {
final Method method = Class.forName(factoryClassName).getMethod(factoryMethod, String.class);
logger = method.invoke(null, category);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.println("Ignoring: " + e);
}
if (logger != null) {
activeLevels = "";
- for (String call : calls) {
+ for (final String call : calls) {
try {
if (checkLevel(category, call)) {
activeLevels += call + ":+ ";
} else {
activeLevels += call + ":- ";
}
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.println(e.getMessage());
e.printStackTrace();
activeLevels += call + ":? ";
@@ -213,7 +213,7 @@ public class UniversalLoggingInfo {
}
}
- private boolean checkLevel(String category, String level)
+ private boolean checkLevel(final String category, final String level)
throws NoSuchMethodException, ClassNotFoundException, InvocationTargetException, IllegalAccessException {
final Method method = Class.forName(factoryClassName).getMethod(factoryMethod, String.class);
@@ -232,7 +232,7 @@ public class UniversalLoggingInfo {
}
if (SLF4J.equals(id) || JCL.equals(id)) {
- String methodName = "is" + level.substring(0, 1).toUpperCase() + level.substring(1) + "Enabled";
+ final String methodName = "is" + level.substring(0, 1).toUpperCase() + level.substring(1) + "Enabled";
final Object hasLevel = c.getClass().getMethod(methodName).invoke(c);
return (Boolean) hasLevel;
}
@@ -240,7 +240,7 @@ public class UniversalLoggingInfo {
throw new IllegalStateException();
}
- private boolean checkLevelGeneric(String level, Object c, String clazz, String enabledMethod, String levelMethod)
+ private boolean checkLevelGeneric(final String level, final Object c, final String clazz, final String enabledMethod, final String levelMethod)
throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
final Class<?> levelClass = Class.forName(clazz);
final Method isLoggable = c.getClass().getMethod(enabledMethod, levelClass);
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 824121a..5372bb5 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
@@ -56,17 +56,17 @@ public class UploadController implements Serializable {
}
public String uploadMulti() {
- for (Part part : fileMulti) {
+ for (final Part part : fileMulti) {
upload(part);
}
return null;
}
- public void uploadAjax(AjaxBehaviorEvent event) {
+ public void uploadAjax(final AjaxBehaviorEvent event) {
upload(fileAjax);
}
- private void upload(Part part) {
+ private void upload(final Part part) {
LOG.info("checking file item");
if (part == null || part.getSize() == 0) {
return;
@@ -85,7 +85,7 @@ public class UploadController implements Serializable {
return fileBasic;
}
- public void setFileBasic(Part fileBasic) {
+ public void setFileBasic(final Part fileBasic) {
this.fileBasic = fileBasic;
}
@@ -93,7 +93,7 @@ public class UploadController implements Serializable {
return fileContentType;
}
- public void setFileContentType(Part fileContentType) {
+ public void setFileContentType(final Part fileContentType) {
this.fileContentType = fileContentType;
}
@@ -101,7 +101,7 @@ public class UploadController implements Serializable {
return fileMulti;
}
- public void setFileMulti(Part[] fileMulti) {
+ public void setFileMulti(final Part[] fileMulti) {
this.fileMulti = fileMulti;
}
@@ -109,7 +109,7 @@ public class UploadController implements Serializable {
return fileAjax;
}
- public void setFileAjax(Part fileAjax) {
+ public void setFileAjax(final Part fileAjax) {
this.fileAjax = fileAjax;
}
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 8380120..660189c 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
@@ -37,7 +37,7 @@ public class ValidationController implements Serializable {
return letter;
}
- public void setLetter(String letter) {
+ public void setLetter(final String letter) {
this.letter = letter;
}
@@ -52,11 +52,11 @@ public class ValidationController implements Serializable {
}
}
- public void passwordValidator(FacesContext context, UIComponent component, Object value) throws ValidatorException {
- String password = value.toString();
+ public void passwordValidator(final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+ final String password = value.toString();
- UIInput confirmationField = (UIInput) component.getAttributes().get("confirmationField");
- String confirmationFieldValue = confirmationField.getSubmittedValue().toString();
+ final UIInput confirmationField = (UIInput) component.getAttributes().get("confirmationField");
+ final String confirmationFieldValue = confirmationField.getSubmittedValue().toString();
if (password.isEmpty() || confirmationFieldValue.isEmpty()) {
return;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationJsr303Controller.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationJsr303Controller.java
index a598634..d7833c9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationJsr303Controller.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationJsr303Controller.java
@@ -39,7 +39,7 @@ public class ValidationJsr303Controller implements Serializable {
return required;
}
- public void setRequired(String required) {
+ public void setRequired(final String required) {
this.required = required;
}
@@ -47,7 +47,7 @@ public class ValidationJsr303Controller implements Serializable {
return length;
}
- public void setLength(String length) {
+ public void setLength(final String length) {
this.length = length;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java
index 93b7039..198b226 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java
@@ -30,7 +30,7 @@ public class SimpleTabChangeListener implements TabChangeListener {
private String clientId;
@Override
- public void processTabChange(TabChangeEvent tabChangeEvent) {
+ public void processTabChange(final TabChangeEvent tabChangeEvent) {
count++;
newTabIndex = tabChangeEvent.getNewTabIndex();
oldTabIndex = tabChangeEvent.getOldTabIndex();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
index 984bb7d..9c6fdba 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
@@ -76,7 +76,7 @@ public class FishPond implements Serializable {
return selectedFishId;
}
- public void setSelectedFishId(Integer selectedFishId) {
+ public void setSelectedFishId(final Integer selectedFishId) {
this.selectedFishId = selectedFishId;
LOG.info("setSelectedFishId via setter: '" + selectedFishId + "'");
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DateController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DateController.java
index a22c97f..9e26218 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DateController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DateController.java
@@ -36,7 +36,7 @@ public class DateController implements Serializable {
public DateController() {
try {
once = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS").parse("1980-03-07 21:05:09 012");
- } catch (ParseException e) {
+ } catch (final ParseException e) {
LOG.error("should not happen. ", e);
}
}
@@ -45,7 +45,7 @@ public class DateController implements Serializable {
return once;
}
- public void setOnce(Date once) {
+ public void setOnce(final Date once) {
this.once = once;
}
}
diff --git a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/ArquillianTest.java b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/ArquillianTest.java
index 26f8bb2..7f2a74c 100644
--- a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/ArquillianTest.java
+++ b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/ArquillianTest.java
@@ -68,8 +68,8 @@ public class ArquillianTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
- File pom = new File("tobago-example/tobago-example-demo/pom.xml");
- WebArchive webArchive = ShrinkWrap.create(MavenImporter.class).
+ final File pom = new File("tobago-example/tobago-example-demo/pom.xml");
+ final WebArchive webArchive = ShrinkWrap.create(MavenImporter.class).
loadPomFromFile(pom, "jsf-provided", "!myfaces-2.0").importBuildOutput()
.as(WebArchive.class);
// XXX there should be a proper profile in POM for that
diff --git a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/NavigationUnitTest.java b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/NavigationUnitTest.java
index 0206b7d..dfae818 100644
--- a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/NavigationUnitTest.java
+++ b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/NavigationUnitTest.java
@@ -45,7 +45,7 @@ public class NavigationUnitTest extends AbstractTobagoTestBase {
final NavigationTree navigation = new NavigationTree() {
@Override
protected List<String> locateResourcesInWar(
- ServletContext servletContext, String directory, List<String> result) {
+ final ServletContext servletContext, final String directory, final List<String> result) {
return LIST;
}
};
diff --git a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
index a17d22f..2143d57 100644
--- a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
+++ b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
@@ -73,14 +73,14 @@ public class QUnitTests {
WebArchive webArchive;
try {
webArchive = createWebArchive(new File("tobago-example/tobago-example-demo/pom.xml"));
- } catch (Exception e) {
+ } catch (final Exception e) {
webArchive = createWebArchive(new File("pom.xml")); // Jenkins
}
return disableCSP(webArchive);
}
- private static WebArchive createWebArchive(File pom) {
- WebArchive webArchive = ShrinkWrap.create(MavenImporter.class).
+ private static WebArchive createWebArchive(final File pom) {
+ final WebArchive webArchive = ShrinkWrap.create(MavenImporter.class).
loadPomFromFile(pom, "jsf-provided", "!myfaces-2.0").importBuildOutput()
.as(WebArchive.class);
// XXX there should be a proper profile in POM for that
@@ -88,31 +88,31 @@ public class QUnitTests {
return webArchive;
}
- private static WebArchive disableCSP(WebArchive webArchive) {
+ private static WebArchive disableCSP(final WebArchive webArchive) {
try {
final InputStream inputStream = webArchive.get("WEB-INF/tobago-config.xml").getAsset().openStream();
- StringWriter stringWriter = new StringWriter();
+ final StringWriter stringWriter = new StringWriter();
IOUtils.copy(inputStream, stringWriter, Charset.defaultCharset());
- String modifiedTobagoConfig = stringWriter.toString()
+ final String modifiedTobagoConfig = stringWriter.toString()
.replace("<content-security-policy mode=\"on\">", "<content-security-policy mode=\"off\">");
- File tobagoConfigXml = new File("target/tobago-config.xml");
+ final File tobagoConfigXml = new File("target/tobago-config.xml");
FileUtils.writeStringToFile(tobagoConfigXml, modifiedTobagoConfig, Charset.defaultCharset());
webArchive.addAsWebInfResource(tobagoConfigXml);
- } catch (IOException e) {
+ } catch (final IOException e) {
LOG.error("could not modify tobago-config.xml", e);
}
return webArchive;
}
- private void setupBrowser(String base, boolean accessTest) throws UnsupportedEncodingException {
+ private void setupBrowser(final String base, final boolean accessTest) throws UnsupportedEncodingException {
LOG.info("setup browser for: " + base + ".xhtml | accessTest=" + accessTest);
browser.get(contextPath + "test.xhtml?base=" + URLEncoder.encode(base, "UTF-8")
+ (accessTest ? "&accessTest=true" : ""));
}
- private void runStandardTest(String page) throws UnsupportedEncodingException, InterruptedException {
+ private void runStandardTest(final String page) throws UnsupportedEncodingException, InterruptedException {
testedPages.add(page);
if (!ignorePages().contains(page)) {
@@ -123,23 +123,23 @@ public class QUnitTests {
}
}
- private void checkQUnitResults(String page) throws InterruptedException {
+ private void checkQUnitResults(final String page) throws InterruptedException {
final boolean timeout = waitForTest(page);
- List<WebElement> testCases = qunitTests.findElements(By.xpath("li"));
+ final List<WebElement> testCases = qunitTests.findElements(By.xpath("li"));
Assert.assertTrue("There must be at least one test case.", testCases.size() > 0);
final String textContent = qunitTests.getAttribute("textContent");
- boolean testFailed = timeout || (textContent != null
+ final boolean testFailed = timeout || (textContent != null
&& textContent.contains(" msfailed@ ") || textContent.contains("Expected:") || textContent.contains("Result:"));
int testCaseCount = 1;
- StringBuilder stringBuilder = new StringBuilder();
+ final StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(qunitTestresult.getAttribute("textContent"));
stringBuilder.append("\n");
if (testFailed) {
- for (WebElement testCase : testCases) {
+ for (final WebElement testCase : testCases) {
final String testName = getText(testCase, "test-name");
final String testStatus = testCase.getAttribute("class").toUpperCase();
@@ -152,10 +152,10 @@ public class QUnitTests {
stringBuilder.append(getText(testCase, "runtime"));
stringBuilder.append(")\n");
- WebElement assertList = testCase.findElement(By.className("qunit-assert-list"));
- List<WebElement> asserts = assertList.findElements(By.tagName("li"));
+ final WebElement assertList = testCase.findElement(By.className("qunit-assert-list"));
+ final List<WebElement> asserts = assertList.findElements(By.tagName("li"));
int assertCount = 1;
- for (WebElement assertion : asserts) {
+ for (final WebElement assertion : asserts) {
final String assertStatus = assertion.getAttribute("class");
stringBuilder.append("- ");
@@ -206,12 +206,12 @@ public class QUnitTests {
}
}
- private boolean waitForTest(String page) throws InterruptedException {
- long endTime = System.currentTimeMillis() + 90000;
+ private boolean waitForTest(final String page) throws InterruptedException {
+ final long endTime = System.currentTimeMillis() + 90000;
String lastStatus = null;
while (System.currentTimeMillis() < endTime) {
try {
- String status = qunitTestresult.getAttribute("textContent");
+ final String status = qunitTestresult.getAttribute("textContent");
if (status == null) {
LOG.info(page + " status=null");
} else if (!status.equals(lastStatus)) {
@@ -221,7 +221,7 @@ public class QUnitTests {
return false;
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
Thread.sleep(200);
}
}
@@ -229,7 +229,7 @@ public class QUnitTests {
return true;
}
- private String getText(WebElement webElement, String className) {
+ private String getText(final WebElement webElement, final String className) {
final List<WebElement> elements = webElement.findElements(By.className(className));
if (elements.size() > 0) {
return elements.get(0).getAttribute("textContent");
@@ -241,17 +241,17 @@ public class QUnitTests {
@AfterClass
public static void checkMissingTests() {
if (testedPages.size() > 1) {
- List<String> pages = getXHTMLs();
+ final List<String> pages = getXHTMLs();
int testablePagesCount = 0;
- StringBuilder stringBuilder = new StringBuilder();
- for (String page : pages) {
+ final StringBuilder stringBuilder = new StringBuilder();
+ for (final String page : pages) {
if (new File(page.substring(0, page.length() - 6) + ".test.js").exists()) {
testablePagesCount++;
- String pathForBrowser = page.substring(page.indexOf("src/main/webapp/") + "src/main/webapp/".length());
+ final String pathForBrowser = page.substring(page.indexOf("src/main/webapp/") + "src/main/webapp/".length());
if (!testedPages.contains(pathForBrowser)) {
- String errorString = "missing testmethod for " + pathForBrowser;
+ final String errorString = "missing testmethod for " + pathForBrowser;
LOG.warn(errorString);
stringBuilder.append("\n");
stringBuilder.append(errorString);
@@ -264,13 +264,13 @@ public class QUnitTests {
@Test
public void testAccessAllPages() throws UnsupportedEncodingException, InterruptedException {
- List<String> pages = getXHTMLs();
+ final List<String> pages = getXHTMLs();
List<WebElement> results;
// Test if 'has no exception' test is correct.
setupBrowser("error/exception", true);
results = qunitTests.findElements(By.xpath("li"));
- for (WebElement result : results) {
+ for (final WebElement result : results) {
if ("has no exception".equals(result.findElement(By.className("test-name")).getText())) {
Assert.assertEquals(result.getAttribute("class"), "fail");
}
@@ -279,14 +279,14 @@ public class QUnitTests {
// Test if 'has no 404' test is correct.
setupBrowser("error/404", true);
results = qunitTests.findElements(By.xpath("li"));
- for (WebElement result : results) {
+ for (final WebElement result : results) {
if ("has no 404".equals(result.findElement(By.className("test-name")).getText())) {
Assert.assertEquals(result.getAttribute("class"), "fail");
}
}
- for (String page : pages) {
- String pathForBrowser = page.substring(page.indexOf("src/main/webapp/") + "src/main/webapp/".length(),
+ for (final String page : pages) {
+ final String pathForBrowser = page.substring(page.indexOf("src/main/webapp/") + "src/main/webapp/".length(),
page.length() - 6);
//TODO: reimplement/remove/cleanup attic tests - currently too much failed
@@ -305,9 +305,9 @@ public class QUnitTests {
return getXHTMLs(rootDir);
}
- private static List<String> getXHTMLs(File dir) {
- List<String> xhtmls = new ArrayList<>();
- for (File file : dir.listFiles()) {
+ private static List<String> getXHTMLs(final File dir) {
+ final List<String> xhtmls = new ArrayList<>();
+ for (final File file : dir.listFiles()) {
if (file.isDirectory()) {
xhtmls.addAll(getXHTMLs(file));
} else if (!file.getName().startsWith("x-") && file.getName().endsWith(".xhtml")) {
@@ -318,7 +318,7 @@ public class QUnitTests {
}
private List<String> ignorePages() {
- List<String> ignore = new ArrayList<>();
+ final List<String> ignore = new ArrayList<>();
// Miscalculation of width.
ignore.add("content/20-component/010-input/50-input-group/group.xhtml");
//PhantomJs miscalculate the height of the dropdown box
@@ -332,211 +332,211 @@ public class QUnitTests {
@Test
public void in() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/010-input/10-in/in.xhtml";
+ final String page = "content/20-component/010-input/10-in/in.xhtml";
runStandardTest(page);
}
@Test
public void suggest() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/010-input/20-suggest/suggest.xhtml";
+ final String page = "content/20-component/010-input/20-suggest/suggest.xhtml";
runStandardTest(page);
}
@Test
public void date() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/010-input/40-date/date.xhtml";
+ final String page = "content/20-component/010-input/40-date/date.xhtml";
runStandardTest(page);
}
@Test
public void group() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/010-input/50-input-group/group.xhtml";
+ final String page = "content/20-component/010-input/50-input-group/group.xhtml";
runStandardTest(page);
}
@Test
public void selectBooleanCheckbox() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.xhtml";
+ final String page = "content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.xhtml";
runStandardTest(page);
}
@Test
public void selectOneChoice() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/030-select/20-selectOneChoice/selectOneChoice.xhtml";
+ final String page = "content/20-component/030-select/20-selectOneChoice/selectOneChoice.xhtml";
runStandardTest(page);
}
@Test
public void selectOneRadio() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/030-select/30-selectOneRadio/selectOneRadio.xhtml";
+ final String page = "content/20-component/030-select/30-selectOneRadio/selectOneRadio.xhtml";
runStandardTest(page);
}
@Test
public void selectOneListbox() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/030-select/40-selectOneListbox/selectOneListbox.xhtml";
+ final String page = "content/20-component/030-select/40-selectOneListbox/selectOneListbox.xhtml";
runStandardTest(page);
}
@Test
public void selectManyCheckbox() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.xhtml";
+ final String page = "content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.xhtml";
runStandardTest(page);
}
@Test
public void buttons() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/040-command/20-buttons/buttons.xhtml";
+ final String page = "content/20-component/040-command/20-buttons/buttons.xhtml";
runStandardTest(page);
}
@Test
public void popup() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/060-popup/popup.xhtml";
+ final String page = "content/20-component/060-popup/popup.xhtml";
runStandardTest(page);
}
@Test
public void sheetSorting() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/080-sheet/10-sort/sheet-sorting.xhtml";
+ final String page = "content/20-component/080-sheet/10-sort/sheet-sorting.xhtml";
runStandardTest(page);
}
@Test
public void sheetEvent() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/080-sheet/30-event/sheet-event.xhtml";
+ final String page = "content/20-component/080-sheet/30-event/sheet-event.xhtml";
runStandardTest(page);
}
@Test
public void treeSelect() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/20-component/090-tree/01-select/tree-select.xhtml";
+ final String page = "content/20-component/090-tree/01-select/tree-select.xhtml";
runStandardTest(page);
}
@Test
public void contentValidation() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/06-validation/00/content-validation.xhtml";
+ final String page = "content/30-concept/06-validation/00/content-validation.xhtml";
runStandardTest(page);
}
@Test
public void validationJsr303() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/06-validation/01/validation-jsr303.xhtml";
+ final String page = "content/30-concept/06-validation/01/validation-jsr303.xhtml";
runStandardTest(page);
}
@Test
public void form() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/08-form/form.xhtml";
+ final String page = "content/30-concept/08-form/form.xhtml";
runStandardTest(page);
}
@Test
public void formRequired() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/08-form/10-required/form-required.xhtml";
+ final String page = "content/30-concept/08-form/10-required/form-required.xhtml";
runStandardTest(page);
}
@Test
public void formAjax() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/08-form/20-ajax/form-ajax.xhtml";
+ final String page = "content/30-concept/08-form/20-ajax/form-ajax.xhtml";
runStandardTest(page);
}
@Test
public void forEach() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/51-for-each/for-each.xhtml";
+ final String page = "content/30-concept/51-for-each/for-each.xhtml";
runStandardTest(page);
}
@Test
public void collapsibleBox() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml";
+ final String page = "content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml";
runStandardTest(page);
}
@Test
public void collapsiblePopup() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml";
+ final String page = "content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml";
runStandardTest(page);
}
@Test
public void collapsiblePanel() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.xhtml";
+ final String page = "content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.xhtml";
runStandardTest(page);
}
@Test
public void collapsibleSection() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.xhtml";
+ final String page = "content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.xhtml";
runStandardTest(page);
}
@Test
public void suggestMethod() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/35-deprecated/15-suggest-method/suggest-method.xhtml";
+ final String page = "content/35-deprecated/15-suggest-method/suggest-method.xhtml";
runStandardTest(page);
}
@Test
public void testDate() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/1040-date/date.xhtml";
+ final String page = "content/40-test/1040-date/date.xhtml";
runStandardTest(page);
}
@Test
public void testSheetTypes() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/3000-sheet/10-sheet-types/sheet-types.xhtml";
+ final String page = "content/40-test/3000-sheet/10-sheet-types/sheet-types.xhtml";
runStandardTest(page);
}
@Test
public void testButtonLink() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/4000-button+link/button+link.xhtml";
+ final String page = "content/40-test/4000-button+link/button+link.xhtml";
runStandardTest(page);
}
@Test
public void testAjaxDropdown() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/4000-button+link/4050-ajax-dropdown/ajax-dropdown.xhtml";
+ final String page = "content/40-test/4000-button+link/4050-ajax-dropdown/ajax-dropdown.xhtml";
runStandardTest(page);
}
@Test
public void testIdMarkup() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/4800-labelLayout/100-id-markup/id-markup.xhtml";
+ final String page = "content/40-test/4800-labelLayout/100-id-markup/id-markup.xhtml";
runStandardTest(page);
}
@Test
public void testLabelLayoutTop() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/4810-labelLayoutTop/labelLayoutTop.xhtml";
+ final String page = "content/40-test/4810-labelLayoutTop/labelLayoutTop.xhtml";
runStandardTest(page);
}
@Test
public void testEvent() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/6000-event/event.xhtml";
+ final String page = "content/40-test/6000-event/event.xhtml";
runStandardTest(page);
}
@Test
public void rendererBaseGetCurrentValue() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/50000-java/10-rendererBase-getCurrentValue/rendererBase-getCurrentValue.xhtml";
+ final String page = "content/40-test/50000-java/10-rendererBase-getCurrentValue/rendererBase-getCurrentValue.xhtml";
runStandardTest(page);
}
@Test
public void ajaxExecute() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/50000-java/20-ajax-execute/ajax-execute.xhtml";
+ final String page = "content/40-test/50000-java/20-ajax-execute/ajax-execute.xhtml";
runStandardTest(page);
}
@Test
public void ajaxSpecialCharacter() throws UnsupportedEncodingException, InterruptedException {
- String page = "content/40-test/50000-java/30-ajax-special-character/ajax-special-character.xhtml";
+ final String page = "content/40-test/50000-java/30-ajax-special-character/ajax-special-character.xhtml";
runStandardTest(page);
}
}
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 695576f..cc62e8b 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
@@ -40,8 +40,8 @@ public class BootstrapClassUnitTest {
final String fieldRegex = "[A-Z][A-Z0-9_]*[A-Z0-9]";
final String nameRegex = "[a-z][a-z0-9\\-]*[a-z0-9]";
- for (BootstrapClass value : BootstrapClass.values()) {
- boolean ignoreByTest = BootstrapClass.class.getField(value.name()).isAnnotationPresent(Deprecated.class);
+ for (final BootstrapClass value : BootstrapClass.values()) {
+ final boolean ignoreByTest = BootstrapClass.class.getField(value.name()).isAnnotationPresent(Deprecated.class);
if (!ignoreByTest) {
final String field = value.toString();
final String name = value.getName();
@@ -49,9 +49,9 @@ public class BootstrapClassUnitTest {
Assert.assertTrue("testing: '" + field + "' matches regexp for consts like FOO_BAR", field.matches(fieldRegex));
Assert.assertTrue("testing: '" + name + "' matches regexp for CSS like foo-bar", name.matches(nameRegex));
- StringBuilder calculatedName = new StringBuilder();
+ final StringBuilder calculatedName = new StringBuilder();
for (int i = 0; i < field.length(); i++) {
- char c = field.charAt(i);
+ final char c = field.charAt(i);
if (c == '_') {
calculatedName.append("-");
} else {
@@ -72,8 +72,8 @@ public class BootstrapClassUnitTest {
final BootstrapClass[] allValues = BootstrapClass.values();
final List<BootstrapClass> toCheck = new ArrayList<>();
- for (BootstrapClass value : allValues) {
- boolean ignoreByTest = BootstrapClass.class.getField(value.name()).isAnnotationPresent(Deprecated.class);
+ for (final BootstrapClass value : allValues) {
+ final boolean ignoreByTest = BootstrapClass.class.getField(value.name()).isAnnotationPresent(Deprecated.class);
if (!ignoreByTest) {
toCheck.add(value);
}
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
index 786eb00..9e205a2 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
@@ -121,7 +121,7 @@ public class ComponentInfo extends TagInfo {
return defaultBehavior;
}
- public void setDefaultBehavior(String defaultBehavior) {
+ public void setDefaultBehavior(final String defaultBehavior) {
this.defaultBehavior = defaultBehavior;
}
}
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 6dad558..4c91337 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
@@ -198,7 +198,7 @@ public class CheckstyleConfigGenerator extends AbstractGenerator {
final Document document)
throws ClassNotFoundException {
- List<String> attributes = new ArrayList<>();
+ final List<String> attributes = new ArrayList<>();
for (final javax.lang.model.element.Element element : getAllMembers(type)) {
if (element instanceof ExecutableElement) {
final ExecutableElement executableElement = (ExecutableElement) element;
@@ -324,19 +324,19 @@ public class CheckstyleConfigGenerator extends AbstractGenerator {
}
protected static String getRegExpForUndefinedAttributes(
- String taglib, String tagName, List<String> attributes) {
+ final String taglib, final String tagName, final List<String> attributes) {
final StringBuilder builder = new StringBuilder();
builder.append("<");
builder.append(taglib);
builder.append(":");
builder.append(tagName);
builder.append("(\\s+(");
- for (String attribute : attributes) {
+ for (final String attribute : attributes) {
builder.append(attribute);
builder.append('|');
}
builder.append("xmlns:\\w*)=\\\"([^\"=<>]*)\\\")*\\s+(?!(");
- for (String attribute : attributes) {
+ for (final String attribute : attributes) {
builder.append(attribute);
builder.append('|');
}
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
index 3c46a7f..89ba2cd 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
@@ -115,7 +115,7 @@ public class ClassesGenerator extends AbstractGenerator {
}
if (componentTag.behaviors().length > 0) {
- for (Behavior behavior : componentTag.behaviors()) {
+ for (final Behavior behavior : componentTag.behaviors()) {
info("*************** ----------------------" + componentTag.behaviors().length);
info("*************** " + behavior.name());
info("*************** " + componentInfo.getBehaviors());
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 b9de598..7303e6d 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
@@ -168,8 +168,8 @@ public class TaglibGenerator extends AbstractGenerator {
}
}
- private void addFunction(Document document, Element taglib, String functionName, String functionClass,
- String functionSignature) {
+ private void addFunction(final Document document, final Element taglib, final String functionName, final String functionClass,
+ final String functionSignature) {
final Element function = document.createElement("function");
taglib.appendChild(function);
addLeafTextElement(functionName, "function-name", function, document);
@@ -341,7 +341,7 @@ public class TaglibGenerator extends AbstractGenerator {
description.append("<p><b>RendererType: </b>");
description.append("<ul>");
boolean first = true;
- for (String rendererType : componentTag.rendererType()) {
+ for (final String rendererType : componentTag.rendererType()) {
description.append("<li>");
description.append(rendererType);
if (first) {
@@ -459,7 +459,7 @@ public class TaglibGenerator extends AbstractGenerator {
parent.appendChild(element);
}
- protected Element createTaglib(final Document document, Taglib taglibAnnotation) {
+ protected Element createTaglib(final Document document, final Taglib taglibAnnotation) {
final Element taglib;
taglib = document.createElement("facelet-taglib");
taglib.setAttribute("id", taglibAnnotation.shortName());
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 03/07: TOBAGO-1782: Clean up * Remove deprecated
code
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 4c8b1df103b453f6580df2982618788c3087f95e
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 29 09:29:32 2017 +0100
TOBAGO-1782: Clean up
* Remove deprecated code
---
.../tobago/internal/ajax/AjaxInternalUtils.java | 80 ----------------------
1 file changed, 80 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
deleted file mode 100644
index 9058f5d..0000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.internal.ajax;
-
-
-import org.apache.myfaces.tobago.internal.util.ResponseUtils;
-
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.Writer;
-
-/**
- * XXX this must be refactored, because of TOBAGO-1524 (see TOBAGO-1563)
- * @deprecated
- */
-@Deprecated
-public final class AjaxInternalUtils {
-
- private AjaxInternalUtils() {
- }
-
- public static boolean redirect(final FacesContext facesContext, final String url) throws IOException {
- redirect((HttpServletResponse) facesContext.getExternalContext().getResponse(), url);
- facesContext.responseComplete();
- return true;
- }
-
- public static void redirect(final HttpServletResponse response, final String url) throws IOException {
- final Writer writer = response.getWriter();
- final String contentType = "application/json; charset=UTF-8";
- ResponseUtils.ensureContentTypeHeader(response, contentType);
- ResponseUtils.ensureNoCacheHeader(response);
- redirectInternal(writer, url);
- }
-
- private static void redirectInternal(final Writer writer, final String url) throws IOException {
- writer.write("{\n \"tobagoAjaxResponse\": true,\n");
- writer.write(" \"responseCode\": 302,\n");
- writer.write(" \"location\": \"");
- writer.write(url);
- writer.write("\"\n}\n");
- writer.flush();
- }
-
- public static void requestNavigationReload(FacesContext facesContext) throws IOException {
- final ExternalContext externalContext = facesContext.getExternalContext();
- final String pathPrefix = externalContext.getRequestContextPath() + externalContext.getRequestServletPath();
- final HttpServletResponse response = (HttpServletResponse) externalContext.getResponse();
- final String contentType = "application/json; charset=UTF-8";
- ResponseUtils.ensureContentTypeHeader(response, contentType);
- ResponseUtils.ensureNoCacheHeader(response);
- final Writer writer = response.getWriter();
- writer.write("{\n \"tobagoAjaxResponse\": true,\n");
- writer.write(" \"responseCode\": " + /*AjaxResponseRenderer.CODE_RELOAD_REQUIRED*/ 309 + ",\n");
- writer.write(" \"location\": \"");
- writer.write(pathPrefix + facesContext.getViewRoot().getViewId());
- writer.write("\"\n}\n");
- writer.flush();
- facesContext.responseComplete();
- }
-}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 05/07: TOBAGO-1782: Clean up * imports * unneeded
null check
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 032da88b5b67a05a462dfeae9be4865323d26e1a
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 29 10:13:14 2017 +0100
TOBAGO-1782: Clean up
* imports
* unneeded null check
---
.../apache/myfaces/tobago/internal/context/DateTimeI18n.java | 2 +-
.../apache/myfaces/tobago/apt/processor/TaglibGenerator.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
index 10f33af..3ae814d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
@@ -53,7 +53,7 @@ public class DateTimeI18n {
for (int i = 0; i < monthNames.length; i++) {
monthNames[i] = dateFormatMMMMM.format(calendar.getTime());
monthNamesShort[i] = dateFormatMMM.format(calendar.getTime());
- calendar.add(java.util.Calendar.MONTH, 1);
+ calendar.add(Calendar.MONTH, 1);
}
final SimpleDateFormat dateFormatEEEEE = new SimpleDateFormat("EEEEE", locale);
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 7303e6d..ef1cd12 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
@@ -284,7 +284,7 @@ public class TaglibGenerator extends AbstractGenerator {
}
final UIComponentTagAttribute attributeTag = typeElement.getAnnotation(UIComponentTagAttribute.class);
if (attributeTag != null) {
- if (null != attributeTag.type() && attributeTag.type().length > 0) {
+ if (attributeTag.type().length > 0) {
description.append("<br />Type: <code>")
.append(attributeTag.type().length == 1 ? attributeTag.type()[0] : Arrays.toString(attributeTag.type()))
.append("</code>");
@@ -440,21 +440,21 @@ public class TaglibGenerator extends AbstractGenerator {
}
}
- protected void addComment(final String text, final org.w3c.dom.Element parent, final Document document) {
+ protected void addComment(final String text, final Element parent, final Document document) {
final Comment comment = document.createComment(text);
parent.appendChild(comment);
}
protected void addLeafTextElement(
- final String text, final String node, final org.w3c.dom.Element parent, final Document document) {
- final org.w3c.dom.Element element = document.createElement(node);
+ final String text, final String node, final Element parent, final Document document) {
+ final Element element = document.createElement(node);
element.appendChild(document.createTextNode(text));
parent.appendChild(element);
}
protected void addLeafCDATAElement(
- final String text, final String node, final org.w3c.dom.Element parent, final Document document) {
- final org.w3c.dom.Element element = document.createElement(node);
+ final String text, final String node, final Element parent, final Document document) {
+ final Element element = document.createElement(node);
element.appendChild(document.createCDATASection(text));
parent.appendChild(element);
}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 01/07: TOBAGO-1782: Clean up * Remove deprecated
code
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 2131eb002611c98e056493ba0a2392ac9544cd28
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 29 09:27:43 2017 +0100
TOBAGO-1782: Clean up
* Remove deprecated code
---
tobago-core/src/main/faces-config/faces-config.xml | 1 -
.../internal/ajax/AjaxNavigationListener.java | 77 --------
.../tobago/internal/ajax/AjaxNavigationState.java | 206 ---------------------
3 files changed, 284 deletions(-)
diff --git a/tobago-core/src/main/faces-config/faces-config.xml b/tobago-core/src/main/faces-config/faces-config.xml
index f116a50..52dfa05 100644
--- a/tobago-core/src/main/faces-config/faces-config.xml
+++ b/tobago-core/src/main/faces-config/faces-config.xml
@@ -35,7 +35,6 @@
</application>
<lifecycle>
- <!--<phase-listener>org.apache.myfaces.tobago.internal.ajax.AjaxNavigationListener</phase-listener>-->
<phase-listener>org.apache.myfaces.tobago.lifecycle.SecretPhaseListener</phase-listener>
</lifecycle>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationListener.java
deleted file mode 100644
index ead8c5a..0000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationListener.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.internal.ajax;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-
-/**
- * XXX this must be refactored, because of TOBAGO-1524 (see TOBAGO-1563)
- * @deprecated
- */
-@Deprecated
-public class AjaxNavigationListener implements PhaseListener {
-
- private static final Logger LOG = LoggerFactory.getLogger(AjaxNavigationListener.class);
-
- @Override
- public void afterPhase(final PhaseEvent phaseEvent) {
- final FacesContext facesContext = phaseEvent.getFacesContext();
- debug(facesContext);
- if (!facesContext.getResponseComplete()) {
- if (phaseEvent.getPhaseId() == PhaseId.RESTORE_VIEW) {
- AjaxNavigationState.afterRestoreView(facesContext);
- } else if (phaseEvent.getPhaseId() == PhaseId.INVOKE_APPLICATION) {
- AjaxNavigationState.afterInvokeApplication(facesContext);
- }
- }
- debug(facesContext);
- }
-
- @Override
- public void beforePhase(final PhaseEvent phaseEvent) {
- final FacesContext facesContext = phaseEvent.getFacesContext();
- debug(facesContext);
- if (!facesContext.getResponseComplete() && phaseEvent.getPhaseId() == PhaseId.RESTORE_VIEW) {
- AjaxNavigationState.beforeRestoreView(facesContext);
- }
- debug(facesContext);
- }
-
- private void debug(FacesContext facesContext) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("### debug getRenderResponse = {}", facesContext.getRenderResponse());
- if (facesContext.getViewRoot() != null) {
- LOG.trace("### debug getViewId = {}", facesContext.getViewRoot().getViewId());
- }
- }
- }
-
- @Override
- public PhaseId getPhaseId() {
- return PhaseId.ANY_PHASE;
- }
-
-}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
deleted file mode 100644
index 6e7bfd9..0000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.internal.ajax;
-
-import org.apache.myfaces.tobago.util.AjaxUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.application.ViewExpiredException;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ExceptionQueuedEvent;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * XXX this must be refactored, because of TOBAGO-1524 (see TOBAGO-1563)
- * @deprecated
- */
-@Deprecated
-public final class AjaxNavigationState {
-
- private static final Logger LOG = LoggerFactory.getLogger(AjaxNavigationState.class);
-
- private static final String SESSION_KEY = "tobago-AjaxNavigationState";
-
- private static final String VIEW_ROOT_KEY = "tobago-AjaxNavigationState-VIEW_ROOT_KEY";
-
- private UIViewRoot viewRoot;
-
- private Map<String, List<FacesMessage>> messages;
-
- private AjaxNavigationState(final FacesContext facesContext) {
- final ExternalContext externalContext = facesContext.getExternalContext();
- externalContext.getSessionMap().put(SESSION_KEY, this);
- viewRoot = facesContext.getViewRoot();
- messages = new HashMap<>();
- final Iterator<String> iterator = facesContext.getClientIdsWithMessages();
- while (iterator.hasNext()) {
- addFacesMessages(facesContext, iterator.next());
- }
- if (LOG.isTraceEnabled()) {
- LOG.trace("Saved viewRoot.getViewId() = \"{}\"", viewRoot.getViewId());
- for (final Map.Entry<String, List<FacesMessage>> entry : messages.entrySet()) {
- for (final FacesMessage message : entry.getValue()) {
- LOG.trace("Saved message \"{}\" : \"{}\"", entry.getKey(), message);
- }
- }
- }
- }
-
- private void addFacesMessages(final FacesContext facesContext, final String clientId) {
- final Iterator<FacesMessage> facesMessages = facesContext.getMessages(clientId);
- while (facesMessages.hasNext()) {
- addFacesMessage(clientId, facesMessages.next());
- }
- }
-
- private void addFacesMessage(final String clientId, final FacesMessage facesMessage) {
- List<FacesMessage> facesMessages = messages.get(clientId);
- if (facesMessages == null) {
- facesMessages = new ArrayList<>();
- messages.put(clientId, facesMessages);
- }
- facesMessages.add(facesMessage);
- }
-
- private void restoreView(final FacesContext facesContext) {
- facesContext.setViewRoot(viewRoot);
- for (final Map.Entry<String, List<FacesMessage>> entry : messages.entrySet()) {
- for (final FacesMessage facesMessage : entry.getValue()) {
- facesContext.addMessage(entry.getKey(), facesMessage);
- }
- }
- facesContext.renderResponse();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Restored viewRoot.getViewId() = \"{}\"", viewRoot.getViewId());
- for (final Map.Entry<String, List<FacesMessage>> entry : messages.entrySet()) {
- for (final FacesMessage message : entry.getValue()) {
- LOG.trace("Restored message \"{}\" : \"{}\"", entry.getKey(), message);
- }
- }
- }
-
- }
-
- public static void storeIncomingView(final FacesContext facesContext) {
- final UIViewRoot viewRoot = facesContext.getViewRoot();
- if (LOG.isTraceEnabled()) {
- if (viewRoot != null) {
- LOG.trace("incoming viewId = '{}'", viewRoot.getViewId());
- } else {
- LOG.trace("incoming viewRoot is null");
- }
- }
- facesContext.getExternalContext().getRequestMap().put(AjaxNavigationState.VIEW_ROOT_KEY, viewRoot);
- }
-
- public static boolean isNavigation(final FacesContext facesContext) {
-
- final UIViewRoot viewRoot = facesContext.getViewRoot();
- if (viewRoot != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("current viewId = '{}'", viewRoot.getViewId());
- }
- } else {
- LOG.warn("current viewRoot is null");
- return false;
- }
-
- final Map<String, Object> requestMap = facesContext.getExternalContext().getRequestMap();
- final UIViewRoot incomingViewRoot = (UIViewRoot) requestMap.get(VIEW_ROOT_KEY);
- if (viewRoot != incomingViewRoot) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("requesting full page reload because of navigation to {} from {}",
- viewRoot.getViewId(), incomingViewRoot.getViewId());
- }
- return true;
- }
- return false;
- }
-
- public static void beforeRestoreView(final FacesContext facesContext) {
- if (facesContext.getExternalContext().getSessionMap().get(AjaxNavigationState.SESSION_KEY) != null) {
- // restoreView phase and afterPhaseListener are executed even if renderResponse is set
- // so we can't call navigationState.restoreView(...) here in before Phase
- // set empty UIViewRoot to prevent executing restore state logic
- facesContext.setViewRoot(new UIViewRoot());
- }
- }
-
- public static void afterRestoreView(final FacesContext facesContext) {
- if (isViewExpiredExceptionThrown(facesContext)) {
- try {
- facesContext.getExceptionHandler().handle();
- } catch (ViewExpiredException e) {
- LOG.debug("Caught: " + e.getMessage(), e);
- try {
- final ExternalContext externalContext = facesContext.getExternalContext();
- final String url = externalContext.getRequestContextPath()
- + externalContext.getRequestServletPath() + externalContext.getRequestPathInfo();
- AjaxInternalUtils.redirect(facesContext, url);
- facesContext.responseComplete();
- } catch (IOException e1) {
- LOG.error("Caught: " + e1.getMessage(), e);
- }
- }
- }
-
- final ExternalContext externalContext = facesContext.getExternalContext();
- if (externalContext.getSessionMap().get(AjaxNavigationState.SESSION_KEY) == null) {
- storeIncomingView(facesContext);
- } else {
- final AjaxNavigationState navigationState
- = (AjaxNavigationState) externalContext.getSessionMap().remove(AjaxNavigationState.SESSION_KEY);
- navigationState.restoreView(facesContext);
- LOG.trace("force render requested navigation view");
- }
- }
-
- private static boolean isViewExpiredExceptionThrown(FacesContext facesContext) {
- final Iterator<ExceptionQueuedEvent> eventIterator
- = facesContext.getExceptionHandler().getUnhandledExceptionQueuedEvents().iterator();
- if (eventIterator.hasNext()) {
- Throwable throwable = eventIterator.next().getContext().getException();
- if (throwable instanceof ViewExpiredException) {
- return true;
- }
- }
- return false;
- }
-
- public static void afterInvokeApplication(FacesContext facesContext) {
- if (AjaxUtils.isAjaxRequest(facesContext) && isNavigation(facesContext)) {
- try {
- facesContext.getExternalContext().getSessionMap().put(SESSION_KEY, new AjaxNavigationState(facesContext));
- AjaxInternalUtils.requestNavigationReload(facesContext);
- } catch (IOException e) {
- LOG.error("Caught: " + e.getMessage(), e);
- }
- }
- }
-}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 06/07: fix docu
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 72e2d6009883ef1e3ec3e633d0345a7397fa85ec
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 29 13:45:14 2017 +0100
fix docu
---
.../tobago/internal/taglib/component/SuggestTagDeclaration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
index 4269103..9152472 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
@@ -68,8 +68,8 @@ public interface SuggestTagDeclaration extends HasIdBindingAndRendered {
* and returns a List<String>, a List<org.apache.myfaces.tobago.model.AutoSuggestItem>
* or a org.apache.myfaces.tobago.model.AutoSuggestItems.
*
- * @deprecated Please use an <code><tc:selectItems></code> tag or a list of <code><tc:selectItem></code>
- * tags (TODO: not implemented yet).
+ * @deprecated since 3.0.0.
+ * Please use an <code><tc:selectItems></code> tag or a list of <code><tc:selectItem></code> tags.
*/
@Deprecated
@TagAttribute
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 02/07: Merge remote-tracking branch 'origin/master'
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 4c725e04b5e8bd7e4d4f494ad18e7cc627381f93
Merge: 2131eb0 e790026
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 29 09:28:13 2017 +0100
Merge remote-tracking branch 'origin/master'
.../org/apache/myfaces/tobago/context/Markup.java | 2 +-
.../internal/renderkit/renderer/BarRenderer.java | 1 -
.../internal/renderkit/renderer/BoxRenderer.java | 1 -
.../renderkit/renderer/ButtonsRenderer.java | 1 -
.../renderkit/renderer/CommandRendererBase.java | 1 -
.../renderkit/renderer/FigureRenderer.java | 1 -
.../internal/renderkit/renderer/FileRenderer.java | 1 -
.../renderkit/renderer/FlowLayoutRenderer.java | 1 -
.../renderkit/renderer/FooterRenderer.java | 1 -
.../renderkit/renderer/HeaderRenderer.java | 1 -
.../internal/renderkit/renderer/ImageRenderer.java | 1 -
.../internal/renderkit/renderer/InRenderer.java | 1 -
.../internal/renderkit/renderer/LabelRenderer.java | 9 --
.../renderkit/renderer/MessagesRenderer.java | 1 -
.../renderkit/renderer/ObjectRenderer.java | 1 -
.../internal/renderkit/renderer/OutRenderer.java | 1 -
.../internal/renderkit/renderer/PageRenderer.java | 1 -
.../internal/renderkit/renderer/PanelRenderer.java | 1 -
.../internal/renderkit/renderer/PopupRenderer.java | 1 -
.../renderkit/renderer/ProgressRenderer.java | 1 -
.../renderkit/renderer/SectionRenderer.java | 1 -
.../renderkit/renderer/SegmentLayoutRenderer.java | 1 -
.../renderer/SelectBooleanCheckboxRenderer.java | 1 -
.../renderer/SelectManyCheckboxRenderer.java | 1 -
.../renderer/SelectManyListboxRenderer.java | 1 -
.../renderer/SelectManyShuttleRenderer.java | 1 -
.../renderer/SelectOneChoiceRenderer.java | 1 -
.../renderer/SelectOneListboxRenderer.java | 1 -
.../renderkit/renderer/SelectOneRadioRenderer.java | 1 -
.../renderkit/renderer/SeparatorRenderer.java | 2 -
.../internal/renderkit/renderer/SheetRenderer.java | 1 -
.../renderkit/renderer/TabGroupRenderer.java | 13 +-
.../renderkit/renderer/TextareaRenderer.java | 1 -
.../renderkit/renderer/TreeLabelRenderer.java | 3 +-
.../renderkit/renderer/TreeListboxRenderer.java | 3 +-
.../renderkit/renderer/TreeNodeRenderer.java | 1 -
.../internal/renderkit/renderer/TreeRenderer.java | 1 -
.../renderkit/renderer/TreeSelectRenderer.java | 3 +-
.../myfaces/tobago/renderkit/css/TobagoClass.java | 6 -
.../apache/myfaces/tobago/util/ComponentUtils.java | 24 ----
tobago-core/src/main/resources/scss/_tobago.scss | 36 ++++-
.../myfaces/tobago/context/MarkupUnitTest.java | 2 +
.../webapp/content/20-component/070-tab/tab.xhtml | 17 ++-
.../tobago-theme-charlotteville/rebuild-theme.log | 151 +++++++++++++-------
.../tobago-bootstrap/_version/css/bootstrap.css | 35 ++++-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-bootstrap/_version/js/bootstrap.min.js | 2 +-
.../tobago-theme-roxborough/rebuild-theme.log | 130 +++++++++++------
.../tobago-bootstrap/_version/css/bootstrap.css | 35 ++++-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-bootstrap/_version/js/bootstrap.min.js | 2 +-
.../tobago-theme-scarborough/rebuild-theme.log | 140 +++++++++++-------
.../tobago-bootstrap/_version/css/bootstrap.css | 35 ++++-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-bootstrap/_version/js/bootstrap.min.js | 2 +-
.../tobago-theme-speyside/rebuild-theme.log | 138 ++++++++++++------
.../tobago-bootstrap/_version/css/bootstrap.css | 48 +++++--
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-bootstrap/_version/js/bootstrap.min.js | 2 +-
.../src/main/scss/_speyside-overwrites.scss | 16 +--
.../tobago-theme-standard/rebuild-theme.log | 156 +++++++++++++--------
.../tobago-bootstrap/_version/css/bootstrap.css | 35 ++++-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-bootstrap/_version/js/bootstrap.min.js | 2 +-
.../tobago-bootstrap/_version/js/tobago-tab.js | 90 ++++--------
.../tobago-bootstrap/_version/js/tobago-utils.js | 49 +++++--
.../tobago-bootstrap/_version/js/tobago.js | 4 +-
77 files changed, 781 insertions(+), 472 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.