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 2022/02/09 11:42:57 UTC

[myfaces-tobago] branch tobago-2.x updated: build: checkstyle enhancements

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch tobago-2.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/tobago-2.x by this push:
     new 28ef3a4  build: checkstyle enhancements
28ef3a4 is described below

commit 28ef3a4317fe6255c381596c550cf98afb26d90c
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Feb 9 12:42:02 2022 +0100

    build: checkstyle enhancements
---
 .../org/apache/myfaces/tobago/ajax/AjaxUtils.java  |   4 +-
 .../tobago/application/ActionListenerImpl.java     |   2 +-
 .../myfaces/tobago/application/ProjectStage.java   |  12 +-
 .../apache/myfaces/tobago/compat/FacesUtilsEL.java |  10 +-
 .../myfaces/tobago/component/Attributes.java       |  84 ++++++++++----
 .../myfaces/tobago/component/ComponentTypes.java   |   3 +
 .../apache/myfaces/tobago/component/Facets.java    |   3 +-
 .../myfaces/tobago/component/InputSuggest2.java    |   2 +-
 .../component/MethodBindingToMethodExpression.java |   8 +-
 .../apache/myfaces/tobago/component/Position.java  |   4 +-
 .../myfaces/tobago/component/RendererTypes.java    |   2 +-
 .../apache/myfaces/tobago/component/Sorter.java    |  16 +--
 .../apache/myfaces/tobago/config/Configurable.java |   9 +-
 .../apache/myfaces/tobago/context/Capability.java  |   5 +-
 .../myfaces/tobago/context/ClientProperties.java   |  31 +++--
 .../org/apache/myfaces/tobago/context/Markup.java  |  21 ++--
 .../myfaces/tobago/context/MarkupConfig.java       |   4 +-
 .../myfaces/tobago/context/MarkupEditor.java       |   8 +-
 .../myfaces/tobago/context/ResourceManager.java    |  29 ++++-
 .../tobago/context/ResourceManagerUtils.java       |  19 ++--
 .../apache/myfaces/tobago/context/ThemeImpl.java   |  20 ++--
 .../myfaces/tobago/context/TobagoBundle.java       |   6 +-
 .../myfaces/tobago/context/TobagoContext.java      |   4 +-
 .../tobago/context/TobagoMessageBundle.java        |   6 +-
 .../tobago/context/TobagoResourceBundle.java       |   6 +-
 .../tobago/context/TransientStateHolder.java       |   4 +-
 .../apache/myfaces/tobago/context/UserAgent.java   |  29 ++---
 .../myfaces/tobago/convert/DurationConverter.java  |   2 +-
 .../myfaces/tobago/convert/ThemeConverter.java     |   4 +-
 .../event/MethodExpressionTabChangeListener.java   |   2 +-
 .../apache/myfaces/tobago/event/PageAction.java    |   3 +-
 .../myfaces/tobago/event/PageActionEvent.java      |   5 +-
 .../myfaces/tobago/event/PopupActionListener.java  |   4 +-
 .../tobago/event/PopupFacetActionListener.java     |   4 +-
 .../tobago/event/ResetFormActionListener.java      |   2 +-
 .../tobago/event/ResetInputActionListener.java     |   4 +-
 .../tobago/event/SheetStateChangeEvent.java        |   2 +-
 .../myfaces/tobago/event/TabChangeEvent.java       |  10 +-
 .../myfaces/tobago/event/TreeExpansionEvent.java   |   2 +-
 .../tobago/event/TreeExpansionListener.java        |   2 +-
 .../ValueExpressionResetInputActionListener.java   |   4 +-
 .../ValueExpressionSheetStateChangeListener.java   |   2 +-
 .../event/ValueExpressionTabChangeListener.java    |   2 +-
 .../myfaces/tobago/facelets/ContentTypeRule.java   |   2 +-
 .../tobago/facelets/DeprecatedDimensionRule.java   |   4 +-
 .../facelets/FixCharacterEncodingFilter.java       |   4 +-
 .../facelets/GridLayoutConstraintHandler.java      |   9 +-
 .../myfaces/tobago/facelets/LoadBundleHandler.java |   2 +-
 .../MetaInfResourcesClasspathResourceResolver.java |   7 +-
 .../tobago/facelets/PopupReferenceHandler.java     |   2 +-
 .../myfaces/tobago/facelets/PositionRule.java      |   4 +-
 .../facelets/ResetInputActionListenerHandler.java  |   2 +-
 .../apache/myfaces/tobago/facelets/Resource.java   |   9 +-
 .../facelets/SheetStateChangeSourceRule.java       |   2 +-
 .../tobago/facelets/SortActionSourceRule.java      |   4 +-
 .../myfaces/tobago/facelets/SuggestMethodRule.java |   2 +-
 .../tobago/facelets/SupportsMarkupRule.java        |   2 +-
 .../facelets/SupportsRenderedPartiallyRule.java    |   2 +-
 .../tobago/facelets/TabChangeSourceRule.java       |   2 +-
 .../extension/MenuRadioExtensionHandler.java       |   2 +-
 .../SelectOneListboxExtensionHandler.java          |   3 +-
 .../extension/TobagoMenuExtensionHandler.java      |   2 +-
 .../tobago/internal/ajax/AjaxInternalUtils.java    |   4 +-
 .../tobago/internal/ajax/AjaxNavigationState.java  |   3 +-
 .../myfaces/tobago/internal/ajax/AjaxRenderer.java |   2 +-
 .../tobago/internal/ajax/AjaxResponseRenderer.java |   5 +-
 .../tobago/internal/component/AbstractUIData.java  |  22 ++--
 .../internal/component/AbstractUIDatePicker.java   |   4 +-
 .../internal/component/AbstractUIFileDrop.java     |   6 +-
 .../internal/component/AbstractUIFlowLayout.java   |   2 +-
 .../internal/component/AbstractUIGridLayout.java   |  12 +-
 .../internal/component/AbstractUIMessages.java     |   4 +-
 .../tobago/internal/component/AbstractUIPage.java  |  15 +--
 .../tobago/internal/component/AbstractUIPopup.java |   2 +-
 .../component/AbstractUISelectBooleanCheckbox.java |   2 +-
 .../component/AbstractUISelectManyShuttle.java     |   2 +-
 .../component/AbstractUISelectOneBase.java         |   2 +-
 .../tobago/internal/component/AbstractUISheet.java |  76 +++++++------
 .../internal/component/AbstractUISheetLayout.java  |   8 +-
 .../internal/component/AbstractUISplitLayout.java  |   9 +-
 .../internal/component/AbstractUITabGroup.java     |   2 +-
 .../component/AbstractUITabGroupLayout.java        |   2 +-
 .../tobago/internal/component/AbstractUITree.java  |  10 +-
 .../internal/component/AbstractUITreeNode.java     |  32 +++---
 .../internal/component/AbstractUITreeSelect.java   |   5 +-
 .../internal/config/ContentSecurityPolicy.java     |   4 +-
 .../tobago/internal/config/RendererConfig.java     |   2 +-
 .../config/TobagoConfigEntityResolver.java         |   3 +
 .../internal/config/TobagoConfigFragment.java      |  12 +-
 .../tobago/internal/config/TobagoConfigMerger.java |   2 +-
 .../internal/config/TobagoConfigVersion.java       |   4 +-
 .../internal/context/ClientPropertiesKey.java      |   4 +-
 .../tobago/internal/context/MeasureValue.java      |   2 +-
 .../tobago/internal/context/ResourceLocator.java   |  33 +++---
 .../internal/context/ResourceManagerImpl.java      | 113 +++++++++++-------
 .../internal/context/ResponseWriterDivider.java    |  32 +++---
 .../tobago/internal/context/StringValue.java       |   2 +-
 .../internal/context/ThemeConfigCacheKey.java      |   4 +-
 .../myfaces/tobago/internal/layout/BankHead.java   |   4 +-
 .../myfaces/tobago/internal/layout/Cell.java       |   4 +-
 .../myfaces/tobago/internal/layout/Grid.java       |  35 +++---
 .../tobago/internal/layout/LayoutContext.java      |   2 +-
 .../tobago/internal/layout/LayoutUtils.java        |   8 +-
 .../myfaces/tobago/internal/layout/MathUtils.java  |   7 +-
 .../myfaces/tobago/internal/package-info.java      |   5 +-
 .../tobago/internal/taglib/TobagoELTag.java        |   2 -
 .../internal/taglib/component/AttributeTag.java    |  33 ++----
 .../taglib/component/BoxToolBarTagDeclaration.java |   2 +-
 .../taglib/component/CellTagDeclaration.java       |   9 +-
 .../taglib/component/ColumnNodeTagDeclaration.java |   4 +-
 .../taglib/component/ColumnTagDeclaration.java     |  12 +-
 .../taglib/component/CommandTagDeclaration.java    |   7 +-
 .../internal/taglib/component/ConverterTag.java    |  16 ++-
 .../taglib/component/DataAttributeTag.java         |  10 +-
 .../taglib/component/DatePickerTagDeclaration.java |  10 +-
 .../taglib/component/DateTagDeclaration.java       |   8 +-
 .../component/ExtensionPanelDeclaration.java       |   2 +-
 .../taglib/component/FileDropTagDeclaration.java   |  13 +--
 .../taglib/component/FileTagDeclaration.java       |   4 +-
 .../taglib/component/FlowLayoutTagDeclaration.java |  13 +--
 .../taglib/component/FormTagDeclaration.java       |  10 +-
 .../taglib/component/GridLayoutConstraintTag.java  |   4 +-
 .../taglib/component/ImageTagDeclaration.java      |   5 +-
 .../taglib/component/InTagDeclaration.java         |   8 +-
 .../internal/taglib/component/LoadBundleTag.java   |  22 ++--
 .../taglib/component/MediatorTagDeclaration.java   |   4 +-
 .../taglib/component/MenuBarTagDeclaration.java    |   8 +-
 .../component/MenuCommandTagDeclaration.java       |   2 +-
 .../taglib/component/MessagesTagDeclaration.java   |  24 ++--
 .../taglib/component/ObjectTagDeclaration.java     |   8 +-
 .../taglib/component/OutTagDeclaration.java        |  10 +-
 .../taglib/component/PageTagDeclaration.java       |  28 +++--
 .../taglib/component/PanelTagDeclaration.java      |   9 +-
 .../taglib/component/PopupReferenceTag.java        |  11 +-
 .../taglib/component/PopupTagDeclaration.java      |  10 +-
 .../taglib/component/ProgressTagDeclaration.java   |   6 +-
 .../taglib/component/ReloadTagDeclaration.java     |   6 +-
 .../component/ResetInputActionListenerTag.java     |  12 +-
 .../taglib/component/ScriptTagDeclaration.java     |   1 +
 .../SelectBooleanCheckboxTagDeclaration.java       |  10 +-
 .../taglib/component/SelectItemTagDeclaration.java |  11 +-
 .../component/SelectItemsTagDeclaration.java       |  14 +--
 .../component/SelectOneChoiceTagDeclaration.java   |  25 ++--
 .../component/SelectOneListboxTagDeclaration.java  |  25 ++--
 .../component/SelectOneRadioTagDeclaration.java    |  25 ++--
 .../component/SelectReferenceTagDeclaration.java   |   3 +-
 .../taglib/component/SheetTagDeclaration.java      |  56 ++++-----
 .../component/SplitLayoutTagDeclaration.java       |  17 ++-
 .../taglib/component/StyleTagDeclaration.java      |   1 +
 .../taglib/component/SuggestTagDeclaration.java    |  14 +--
 .../taglib/component/TabChangeListenerTag.java     |  20 ++--
 .../taglib/component/TabGroupTagDeclaration.java   |   7 +-
 .../component/TabGroupToolBarTagDeclaration.java   |   2 +-
 .../taglib/component/ToolBarTagDeclaration.java    |  16 +--
 .../taglib/component/TreeDataTagDeclaration.java   |   4 +-
 .../component/TreeListboxTagDeclaration.java       |   3 +-
 .../taglib/component/TreeMenuTagDeclaration.java   |   7 +-
 .../taglib/component/TreeNodeTagDeclaration.java   |   7 +-
 .../taglib/component/TreeSelectTagDeclaration.java |   8 +-
 .../taglib/component/TreeTagDeclaration.java       |   8 +-
 .../taglib/component/ValidateFileItemTag.java      |   4 +-
 .../component/ValidateSubmittedValueLengthTag.java |   7 +-
 .../taglib/component/WizardTagDeclaration.java     |   2 +-
 .../internal/taglib/declaration/Component.java     |  12 +-
 .../internal/taglib/declaration/HasAction.java     |  11 +-
 .../taglib/declaration/HasActionListener.java      |   7 +-
 .../taglib/declaration/HasColumnLayout.java        |   5 +-
 .../internal/taglib/declaration/HasConverter.java  |  10 +-
 .../taglib/declaration/HasCurrentMarkup.java       |   6 +-
 .../internal/taglib/declaration/HasFieldId.java    |   4 +-
 .../tobago/internal/taglib/declaration/HasId.java  |   4 +-
 .../internal/taglib/declaration/HasLabel.java      |   4 +-
 .../internal/taglib/declaration/HasLabelWidth.java |   5 +-
 .../internal/taglib/declaration/HasLink.java       |   2 +-
 .../internal/taglib/declaration/HasMargin.java     |   4 +-
 .../internal/taglib/declaration/HasMarkup.java     |   7 +-
 .../internal/taglib/declaration/HasOnchange.java   |   5 +-
 .../internal/taglib/declaration/HasOnclick.java    |   2 -
 .../taglib/declaration/HasPlaceholder.java         |   5 +-
 .../taglib/declaration/HasRenderedPartially.java   |   6 +-
 .../internal/taglib/declaration/HasResource.java   |  11 +-
 .../internal/taglib/declaration/HasRowLayout.java  |   5 +-
 .../internal/taglib/declaration/HasSanitize.java   |   5 +-
 .../internal/taglib/declaration/HasSpacing.java    |   7 +-
 .../taglib/declaration/HasSuggestMethod.java       |   9 +-
 .../declaration/HasTabChangeListenerType.java      |   3 +-
 .../internal/taglib/declaration/HasTabIndex.java   |  14 +--
 .../internal/taglib/declaration/HasTarget.java     |   3 +-
 .../internal/taglib/declaration/HasValidator.java  |   8 +-
 .../taglib/declaration/HasValueChangeListener.java |   9 +-
 .../tobago/internal/taglib/declaration/HasVar.java |   5 +-
 .../taglib/declaration/IsDefaultCommand.java       |   4 +-
 .../internal/taglib/declaration/IsDraggable.java   |   3 +-
 .../declaration/IsGridLayoutComponentBase.java     |   6 +-
 .../IsGridLayoutComponentWithDimension.java        |  12 +-
 .../taglib/declaration/IsImmediateCommand.java     |   7 +-
 .../tobago/internal/taglib/declaration/IsOmit.java |  10 +-
 .../internal/taglib/declaration/IsPassword.java    |   4 +-
 .../internal/taglib/declaration/IsRendered.java    |   4 +-
 .../internal/taglib/declaration/IsRequired.java    |   5 +-
 .../taglib/declaration/IsRequiredForSelect.java    |   5 +-
 .../internal/taglib/declaration/IsShowRoot.java    |   5 +-
 .../taglib/declaration/IsShowRootJunction.java     |   4 +-
 .../internal/taglib/declaration/IsTransition.java  |   3 +-
 .../taglib/extension/DateExtensionTag.java         |  83 ++++++--------
 .../taglib/extension/ExtensionPanelTag.java        |   6 +-
 .../taglib/extension/FileExtensionTag.java         |  56 ++++-----
 .../internal/taglib/extension/InExtensionTag.java  |  89 +++++++--------
 .../taglib/extension/LabelExtensionTag.java        |  28 ++---
 .../taglib/extension/MenuCheckboxExtensionTag.java |  62 ++++------
 .../taglib/extension/MenuRadioExtensionTag.java    |  68 +++++------
 .../internal/taglib/extension/OutExtensionTag.java |  43 +++----
 .../SelectBooleanCheckboxExtensionTag.java         |  71 +++++-------
 .../extension/SelectManyCheckboxExtensionTag.java  |  67 +++++------
 .../extension/SelectManyListboxExtensionTag.java   |  69 +++++------
 .../extension/SelectManyShuttleExtensionTag.java   |  59 ++++------
 .../extension/SelectOneChoiceExtensionTag.java     |  67 +++++------
 .../extension/SelectOneListboxExtensionTag.java    |  67 +++++------
 .../extension/SelectOneRadioExtensionTag.java      |  68 +++++------
 .../taglib/extension/SeparatorExtensionTag.java    |  18 ++-
 .../taglib/extension/TextareaExtensionTag.java     |  73 +++++-------
 .../taglib/extension/TimeExtensionTag.java         |  73 +++++-------
 .../extension/TobagoExtensionBodyTagSupport.java   |   6 +-
 .../internal/util/ComponentAttributeUtils.java     |  12 +-
 .../tobago/internal/util/DateFormatUtils.java      |   4 +-
 .../myfaces/tobago/internal/util/Deprecation.java  |   7 +-
 .../tobago/internal/util/FacesContextUtils.java    |   4 +-
 .../tobago/internal/util/FindComponentUtils.java   |   5 +-
 .../tobago/internal/util/HtmlWriterUtils.java      |   4 +-
 .../internal/util/JavascriptWriterUtils.java       |   4 +-
 .../tobago/internal/util/JsonWriterUtils.java      |   4 +-
 .../myfaces/tobago/internal/util/NumberUtils.java  |   2 +-
 .../myfaces/tobago/internal/util/PartUtils.java    |  86 ++++++--------
 .../tobago/internal/util/ResponseUtils.java        |   2 +-
 .../tobago/internal/util/ResponseWriterBuffer.java |  18 +--
 .../myfaces/tobago/internal/util/StringUtils.java  |  13 +--
 .../myfaces/tobago/internal/util/WriterUtils.java  |  23 ++--
 .../webapp/DebugResponseWriterWrapper.java         |   9 ++
 .../tobago/internal/webapp/HtmlResponseWriter.java |  13 ++-
 .../tobago/internal/webapp/JsonResponseWriter.java |   8 +-
 .../internal/webapp/TobagoResponseWriterBase.java  |  50 ++++----
 .../webapp/TobagoResponseWriterWrapper.java        |   9 ++
 .../myfaces/tobago/layout/AutoLayoutToken.java     |   2 +-
 .../apache/myfaces/tobago/layout/LayoutBase.java   |  16 +++
 .../apache/myfaces/tobago/layout/LayoutBox.java    |   8 ++
 .../myfaces/tobago/layout/LayoutComponent.java     |   5 +
 .../myfaces/tobago/layout/LayoutContainer.java     |   3 +
 .../org/apache/myfaces/tobago/layout/Measure.java  |   4 +-
 .../myfaces/tobago/layout/MeasureEditor.java       |   8 +-
 .../apache/myfaces/tobago/layout/Orientation.java  |   4 +-
 .../apache/myfaces/tobago/layout/PixelMeasure.java |   8 +-
 .../apache/myfaces/tobago/model/ExpandedState.java |  11 +-
 .../java/org/apache/myfaces/tobago/model/Node.java |  10 +-
 .../org/apache/myfaces/tobago/model/PageState.java |  16 ++-
 .../apache/myfaces/tobago/model/PageStateImpl.java |   4 +-
 .../apache/myfaces/tobago/model/SelectItem.java    |   1 +
 .../apache/myfaces/tobago/model/Selectable.java    |   3 +-
 .../apache/myfaces/tobago/model/SelectedState.java |   7 +-
 .../myfaces/tobago/model/TreeNodeDataModel.java    |  21 ++--
 .../org/apache/myfaces/tobago/model/TreePath.java  |  14 ++-
 .../myfaces/tobago/model/TreeSelectable.java       |   2 +-
 .../org/apache/myfaces/tobago/model/Wizard.java    |   5 +-
 .../myfaces/tobago/portlet/PortletUtils.java       |   4 +-
 .../renderkit/AbstractRendererBaseWrapper.java     |   8 +-
 .../apache/myfaces/tobago/renderkit/HtmlUtils.java |  17 ++-
 .../tobago/renderkit/LabelWithAccessKey.java       |  13 ++-
 .../myfaces/tobago/renderkit/RendererBase.java     |   2 +-
 .../tobago/renderkit/SelectManyRendererBase.java   | 126 +++++++++------------
 .../tobago/renderkit/SelectOneRendererBase.java    |   2 +-
 .../myfaces/tobago/renderkit/css/Classes.java      |  12 +-
 .../apache/myfaces/tobago/renderkit/css/Style.java |  13 +--
 .../tobago/renderkit/html/DataAttributes.java      |  63 +++++++----
 .../tobago/renderkit/html/HtmlAttributes.java      |  52 ++++++---
 .../tobago/renderkit/html/HtmlElements.java        |   3 +
 .../myfaces/tobago/sanitizer/JsoupSanitizer.java   |   2 +-
 .../tobago/servlet/NonFacesRequestServlet.java     |   3 +-
 .../myfaces/tobago/servlet/ResourceServlet.java    |   6 +-
 .../apache/myfaces/tobago/util/BeanComparator.java |   4 +-
 .../apache/myfaces/tobago/util/ComparatorBase.java |   2 +-
 .../apache/myfaces/tobago/util/ComponentUtils.java | 122 ++++++++++----------
 .../myfaces/tobago/util/ContextCallback.java       |   2 +-
 .../myfaces/tobago/util/CreateComponentUtils.java  |  29 ++++-
 .../myfaces/tobago/util/DebugActionListener.java   |   4 +-
 .../tobago/util/DebugNavigationHandler.java        |   2 +-
 .../myfaces/tobago/util/DebugPhaseListener.java    |   8 +-
 .../org/apache/myfaces/tobago/util/DebugUtils.java |   2 +-
 .../myfaces/tobago/util/EncodeAjaxCallback.java    |  24 ++--
 .../apache/myfaces/tobago/util/FacesVersion.java   |   4 +
 .../org/apache/myfaces/tobago/util/LayoutInfo.java |   9 +-
 .../apache/myfaces/tobago/util/LocaleUtils.java    |   6 +-
 .../apache/myfaces/tobago/util/MessageUtils.java   |   4 +-
 .../tobago/util/ProcessValidationsCallback.java    |   2 +-
 .../tobago/util/UpdateModelValuesCallback.java     |   2 +-
 .../tobago/util/ValueBindingComparator.java        |   2 +-
 .../tobago/util/ValueExpressionComparator.java     |   2 +-
 .../myfaces/tobago/util/VariableResolverUtils.java |   8 +-
 .../org/apache/myfaces/tobago/util/XmlUtils.java   |   8 +-
 .../validator/ClearValidatorsActionListener.java   |   7 +-
 .../validator/SubmittedValueLengthValidator.java   |   5 +-
 .../org/apache/myfaces/tobago/webapp/Secret.java   |  10 +-
 .../tobago/webapp/SecretSessionListener.java       |   2 +-
 .../tobago/webapp/TobagoResponseWriter.java        |  18 ++-
 .../myfaces/tobago/component/SorterUnitTest.java   |  50 ++++----
 .../myfaces/tobago/component/UISheetUnitTest.java  |   6 +-
 .../myfaces/tobago/context/MarkupUnitTest.java     |  46 ++++----
 .../myfaces/tobago/context/UserAgentUnitTest.java  |  14 +--
 .../internal/config/AbstractTobagoTestBase.java    |   3 +-
 .../context/ResponseWriterDividerUnitTest.java     |   2 +-
 .../internal/context/ThemeParserUnitTest.java      |   2 +-
 .../tobago/internal/layout/MathUtilsUnitTest.java  |  20 ++--
 .../mock/servlet/MockHttpServletRequest.java       |  11 +-
 .../mock/servlet/MockHttpServletResponse.java      |  15 ++-
 .../internal/mock/servlet/MockHttpSession.java     |   7 +-
 .../internal/mock/servlet/MockPageContext.java     |   6 +-
 .../internal/taglib/component/DummyBean.java       |   4 +-
 .../tobago/internal/util/PartUtilsUnitTest.java    |   2 +-
 .../tobago/layout/IntervalListUnitTest.java        |  38 ++-----
 .../tobago/model/MixedTreeModelUnitTest.java       |  14 +--
 .../apache/myfaces/tobago/model/NodeUnitTest.java  |  15 +--
 .../tobago/renderkit/css/ClassesUnitTest.java      |   4 +-
 .../myfaces/tobago/util/RangeParserUnitTest.java   |   8 +-
 .../webapp/TobagoResponseWriterUnitTest.java       |  13 ++-
 .../tobago/example/addressbook/Address.java        |   2 +-
 .../DerbyShutdownServletContextListener.java       |   2 +-
 .../tobago/example/addressbook/EmailAddress.java   |   2 +-
 .../tobago/example/addressbook/JpaAddressDao.java  |   6 +-
 .../example/addressbook/OpenJpaLoadTimeWeaver.java |   6 +-
 .../tobago/example/addressbook/Picture.java        |   2 +-
 .../tobago/example/addressbook/web/Controller.java |  13 +--
 .../tobago/example/addressbook/web/Layout.java     |   2 +-
 .../example/addressbook/web/PictureServlet.java    |   2 +-
 .../tobago/example/addressbook/Address.java        |   2 +-
 .../DerbyShutdownServletContextListener.java       |   2 +-
 .../tobago/example/addressbook/EmailAddress.java   |   2 +-
 .../tobago/example/addressbook/JpaAddressDao.java  |   6 +-
 .../example/addressbook/OpenJpaLoadTimeWeaver.java |  26 ++---
 .../tobago/example/addressbook/Picture.java        |   2 +-
 .../example/addressbook/web/AppenderModel.java     |   2 +-
 .../tobago/example/addressbook/web/Controller.java |  13 +--
 .../tobago/example/addressbook/web/Layout.java     |   2 +-
 .../example/addressbook/web/LoggingController.java |  39 ++++---
 .../example/addressbook/web/PictureServlet.java    |   2 +-
 .../tobago/example/data/CantorInterval.java        |  20 ++--
 .../apache/myfaces/tobago/example/demo/Bird.java   |   4 +-
 .../tobago/example/demo/BirdController.java        |   6 +-
 ...lePageDeclarationLanguageNavigationHandler.java |   6 +-
 .../tobago/example/demo/NavigationTree.java        |   7 +-
 .../example/demo/PartialReloadController.java      |   2 +-
 .../tobago/example/demo/TobagoDemoController.java  |  10 +-
 .../myfaces/tobago/example/demo/TreeEditor.java    |   2 +-
 .../tobago/example/demo/UniversalLoggingInfo.java  |   6 +-
 .../demo/clientConfig/ClientConfigController.java  |   6 +-
 .../tobago/example/demo/jsp/AbstractConverter.java |   6 +-
 .../tobago/example/demo/jsp/JspTagConverter.java   |   2 +-
 .../tobago/example/demo/jsp/StringExpression.java  |   4 +-
 .../tobago/example/demo/overview/SheetConfig.java  |   2 +-
 .../myfaces/tobago/example/demo/sudoku/Sudoku.java |  10 +-
 .../tobago/example/security/Controller.java        |   8 +-
 .../myfaces/tobago/example/test/Attribute.java     |   2 +-
 .../example/test/ClientConfigController.java       |   8 +-
 .../tobago/example/test/FilterController.java      |   6 +-
 .../myfaces/tobago/example/test/Immediate.java     |  16 +--
 .../example/test/InputSuggestController.java       |   2 +-
 .../myfaces/tobago/example/test/KillSession.java   |   2 +-
 .../myfaces/tobago/example/test/MeasureBean.java   |   2 +-
 .../example/test/PopupReferenceController.java     |   8 +-
 .../apache/myfaces/tobago/example/test/Reload.java |   4 +-
 .../example/test/SelectBooleanCheckboxBean.java    |  50 ++++----
 .../tobago/example/test/SheetSortController.java   |   7 +-
 .../tobago/example/test/TreeController.java        |   2 +-
 .../tobago/example/test/AutomaticSeleniumTest.java |   6 +-
 .../tobago/example/test/TobagoSelenium.java        |  24 ++--
 .../tobago/compat/FacesInvokeOnComponent12.java    |   3 +-
 .../tobago/context/ResourceManagerUtil.java        |   2 +
 .../event/ValueBindingTabChangeListener.java       |   2 +-
 .../internal/lifecycle/PhaseListenerManager.java   |   4 +-
 .../renderkit/html/util/CommandRendererHelper.java |   2 +-
 .../apache/myfaces/tobago/util/StringUtils.java    |   1 +
 .../sandbox/standard/tag/NumberSliderRenderer.java |   4 +-
 .../security/CheckAuthorisationMethodBinding.java  |  12 +-
 .../CheckAuthorisationMethodExpression.java        |   2 +-
 .../myfaces/tobago/renderkit/html/Command.java     |  35 +++---
 .../myfaces/tobago/renderkit/html/JsonUtils.java   |   4 +-
 .../html/standard/standard/tag/BoxRenderer.java    |   2 +-
 .../standard/standard/tag/CalendarRenderer.java    |   4 +-
 .../html/standard/standard/tag/ColumnRenderer.java |  10 +-
 .../standard/standard/tag/DatePickerRenderer.java  |   4 +-
 .../standard/standard/tag/FileDropRenderer.java    |  10 +-
 .../html/standard/standard/tag/FileRenderer.java   |   4 +-
 .../html/standard/standard/tag/ImageRenderer.java  |   4 +-
 .../html/standard/standard/tag/LabelRenderer.java  |   4 +-
 .../html/standard/standard/tag/LinkRenderer.java   |   2 +-
 .../standard/standard/tag/MediatorRenderer.java    |   6 +-
 .../standard/standard/tag/MenuCommandRenderer.java |   4 +-
 .../html/standard/standard/tag/OutRenderer.java    |   4 +-
 .../html/standard/standard/tag/PanelRenderer.java  |   6 +-
 .../standard/tag/SelectManyCheckboxRenderer.java   |   2 +-
 .../standard/tag/SelectManyListboxRenderer.java    |   2 +-
 .../standard/tag/SelectManyShuttleRenderer.java    |   2 +-
 .../standard/tag/SelectOneChoiceRenderer.java      |   4 +-
 .../standard/tag/SelectOneRadioRenderer.java       |   4 +-
 .../standard/tag/SelectReferenceRenderer.java      |   6 +-
 .../standard/standard/tag/SeparatorRenderer.java   |   6 +-
 .../html/standard/standard/tag/SheetRenderer.java  |  32 +++---
 .../standard/standard/tag/SplitLayoutRenderer.java |  13 +--
 .../standard/standard/tag/SubviewRenderer.java     |   6 +-
 .../standard/standard/tag/SuggestRenderer.java     |   2 +-
 .../standard/tag/TabGroupLayoutRenderer.java       |   4 +-
 .../standard/standard/tag/TabGroupRenderer.java    |   2 +-
 .../html/standard/standard/tag/TabRenderer.java    |   2 +-
 .../standard/standard/tag/TextareaRenderer.java    |   2 +-
 .../standard/standard/tag/ToolBarRendererBase.java |  14 ++-
 .../standard/standard/tag/TreeListboxRenderer.java |   2 +-
 .../html/standard/standard/tag/TreeRenderer.java   |   2 +-
 .../standard/standard/tag/TreeSelectRenderer.java  |   4 +-
 .../standard/standard/tag/VerbatimRenderer.java    |   6 +-
 .../renderkit/html/util/HtmlRendererUtils.java     |  17 ++-
 .../myfaces/tobago/renderkit/util/RenderUtils.java |   2 +-
 .../tobago/renderkit/util/SelectItemUtils.java     |   4 +-
 .../tobago/maven/plugin/IndexThemeMojo.java        |   5 +-
 .../apt/annotation/BodyContentDescription.java     |   5 +-
 .../myfaces/tobago/apt/annotation/Converter.java   |   3 +-
 .../tobago/apt/annotation/DynamicExpression.java   |  16 ++-
 .../tobago/apt/annotation/ExtensionTag.java        |   2 +-
 .../myfaces/tobago/apt/annotation/Facet.java       |   9 +-
 .../myfaces/tobago/apt/annotation/Preliminary.java |   6 +-
 .../tobago/apt/annotation/TagAttribute.java        |   8 +-
 .../myfaces/tobago/apt/annotation/Taglib.java      |   6 +-
 .../tobago/apt/annotation/UIComponentTag.java      |  11 +-
 .../apt/annotation/UIComponentTagAttribute.java    |  20 ++--
 .../myfaces/tobago/apt/annotation/Validator.java   |   3 +-
 .../tobago/apt/annotation/ValidatorTag.java        |   1 +
 .../tobago/apt/generate/ComponentPropertyInfo.java |   4 +-
 .../myfaces/tobago/apt/generate/PropertyInfo.java  |   4 +-
 .../tobago/apt/processor/ClassesGenerator.java     |   4 +-
 .../tobago/apt/processor/TaglibGenerator.java      |   2 +-
 436 files changed, 2476 insertions(+), 2542 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
index 95c07c6..dd19aa5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
@@ -104,11 +104,11 @@ public final class AjaxUtils {
     boolean added = false;
 
     if (clientIds.hasNext()) { // messages in the partial part
-      for (final String componentClientId: list) {
+      for (final String componentClientId : list) {
         added = AjaxInternalUtils.addNextPossibleAjaxComponent(context, componentClientId);
       }
     } else {  // checking for an existing shown error on page
-      for (final String componentClientId: list) {
+      for (final String componentClientId : list) {
         if (context.getExternalContext().getRequestParameterMap().containsKey(
             componentClientId + ComponentUtils.SUB_SEPARATOR + "messagesExists")) {
           added = AjaxInternalUtils.addNextPossibleAjaxComponent(context, componentClientId);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
index e811b9c..91cd73e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
@@ -79,7 +79,7 @@ public class ActionListenerImpl implements ActionListener {
       // Retrieve the NavigationHandler instance..
       final NavigationHandler navHandler = application.getNavigationHandler();
       // Invoke nav handling..
-      final String navBinding = (null != expression) ? expression.getExpressionString() : null;
+      final String navBinding = null != expression ? expression.getExpressionString() : null;
       navHandler.handleNavigation(facesContext, navBinding, errorOutcome);
       // Trigger a switch to Render Response if needed
       facesContext.renderResponse();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ProjectStage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ProjectStage.java
index d2a3c48..50b187d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ProjectStage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ProjectStage.java
@@ -21,12 +21,12 @@ package org.apache.myfaces.tobago.application;
 
 
 public enum ProjectStage {
-    Development,
-    Production,
-    SystemTest,
-    UnitTest;
+  Development,
+  Production,
+  SystemTest,
+  UnitTest;
 
-    public static final String PROJECT_STAGE_JNDI_NAME = "java:comp/env/jsf/ProjectStage";
+  public static final String PROJECT_STAGE_JNDI_NAME = "java:comp/env/jsf/ProjectStage";
 
-    public static final String PROJECT_STAGE_PARAM_NAME = "javax.faces.PROJECT_STAGE";
+  public static final String PROJECT_STAGE_PARAM_NAME = "javax.faces.PROJECT_STAGE";
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
index 8cbe0b2..3a1425a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
@@ -55,6 +55,7 @@ public final class FacesUtilsEL {
   /**
    * @deprecated since 2.0.0
    */
+  @Deprecated
   public static boolean invokeOnComponent(
       final FacesContext context, final UIComponent component, final String clientId, final ContextCallback callback) {
     final String thisClientId = component.getClientId(context);
@@ -68,7 +69,7 @@ public final class FacesUtilsEL {
       // Otherwise we know the client id we're looking for is not in this naming container,
       // so for improved performance short circuit and return false.
       if (clientId.startsWith(thisClientId)
-          && (clientId.charAt(thisClientId.length()) == UINamingContainer.getSeparatorChar(context))) {
+          && clientId.charAt(thisClientId.length()) == UINamingContainer.getSeparatorChar(context)) {
         if (invokeOnComponentFacetsAndChildren(context, component, clientId, callback)) {
           return true;
         }
@@ -199,6 +200,7 @@ public final class FacesUtilsEL {
   /**
    * @deprecated since 2.0.0
    */
+  @Deprecated
   public static void setValidator(final EditableValueHolder editableValueHolder, final Object validator) {
     if (validator instanceof MethodExpression) {
       editableValueHolder.addValidator(new MethodExpressionValidator((MethodExpression) validator));
@@ -210,6 +212,7 @@ public final class FacesUtilsEL {
   /**
    * @deprecated since 2.0.0
    */
+  @Deprecated
   public static void setConverter(final ValueHolder valueHolder, final Object converterExpression) {
     if (converterExpression instanceof ValueExpression) {
       final ValueExpression expression = (ValueExpression) converterExpression;
@@ -225,6 +228,7 @@ public final class FacesUtilsEL {
   /**
    * @deprecated since 2.0.0
    */
+  @Deprecated
   public static void setBindingOrExpression(
       final UIComponent component, final String name, final Object valueBindingOrExpression) {
     component.setValueExpression(name, (ValueExpression) valueBindingOrExpression);
@@ -233,6 +237,7 @@ public final class FacesUtilsEL {
   /**
    * @deprecated since 2.0.0
    */
+  @Deprecated
   public static void addBindingOrExpressionTabChangeListener(
       final TabChangeSource source, final String type, final Object bindingOrExpression) {
     if (bindingOrExpression instanceof ValueExpression) {
@@ -243,6 +248,7 @@ public final class FacesUtilsEL {
   /**
    * @deprecated since 2.0.0
    */
+  @Deprecated
   public static Comparator getBindingOrExpressionComparator(
       final FacesContext facesContext, final UIComponent child, final String var, final boolean descending,
       final Comparator comparator) {
@@ -253,6 +259,7 @@ public final class FacesUtilsEL {
   /**
    * @deprecated since 2.0.0
    */
+  @Deprecated
   public static void addBindingOrExpressionPopupActionListener(
       final ActionSource actionSource, final Object bindingOrExpression) {
     actionSource.addActionListener(new ValueExpressionPopupActionListener((ValueExpression) bindingOrExpression));
@@ -261,6 +268,7 @@ public final class FacesUtilsEL {
   /**
    * @deprecated since 2.0.0
    */
+  @Deprecated
   public static void addBindingOrExpressionResetActionListener(
       final ActionSource actionSource, final Object bindingOrExpression) {
     actionSource.addActionListener(new ValueExpressionResetInputActionListener((ValueExpression) bindingOrExpression));
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
index 9718ef2..037d00f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
@@ -33,16 +33,26 @@ public final class Attributes {
   public static final String AUTO_RELOAD = "autoReload";
   public static final String BODY_CONTENT = "bodyContent";
   public static final String BORDER = "border";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String BORDER_BOTTOM = "borderBottom";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String BORDER_LEFT = "borderLeft";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String BORDER_RIGHT = "borderRight";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String BORDER_TOP = "borderTop";
   public static final String CHARSET = "charset";
-  /** @deprecated */
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   public static final String CELLSPACING = "cellspacing";
   public static final String CLIENT_PROPERTIES = "clientProperties";
@@ -52,7 +62,9 @@ public final class Attributes {
   public static final String CONVERTER = "converter";
   public static final String CREATE_SPAN = "createSpan";
   public static final String CSS_CLASSES_BLOCKS = "cssClassesBlocks";
-  /** @deprecated since 2.0.0 */
+  /**
+   * @deprecated since 2.0.0
+   */
   @Deprecated
   public static final String DATE_INPUT_ID = "dateInputId";
   public static final String DATE_STYLE = "dateStyle";
@@ -83,10 +95,14 @@ public final class Attributes {
   public static final String IMMEDIATE = "immediate";
   public static final String IMAGE = "image";
   public static final String INLINE = "inline";
-  /** @deprecated */
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   public static final String INNER_HEIGHT = "innerHeight";
-  /** @deprecated */
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   public static final String INNER_WIDTH = "innerWidth";
   public static final String ITEM_DESCRIPTION = "itemDescription";
@@ -103,16 +119,26 @@ public final class Attributes {
   public static final String LAYOUT_WIDTH = "layoutWidth";
   public static final String LEFT = "left";
   public static final String LINK = "link";
-  /** @deprecated */
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   public static final String MARGIN = "margin";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String MARGIN_BOTTOM = "marginBottom";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String MARGIN_LEFT = "marginLeft";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String MARGIN_RIGHT = "marginRight";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String MARGIN_TOP = "marginTop";
   public static final String MARKED = "marked";
   public static final String MARKUP = "markup";
@@ -133,23 +159,37 @@ public final class Attributes {
   public static final String NAVIGATE = "navigate";
   public static final String NUMBER_STYLE = "numberStyle";
   public static final String OMIT = "omit";
-  /** @deprecated Since 2.0.0. This attribute work not with SCP */
+  /**
+   * @deprecated Since 2.0.0. This attribute work not with SCP
+   */
   @Deprecated
   public static final String ONCHANGE = "onchange";
-  /** @deprecated Since 2.0.0. This attribute work not with SCP */
+  /**
+   * @deprecated Since 2.0.0. This attribute work not with SCP
+   */
   @Deprecated
   public static final String ONCLICK = "onclick";
   public static final String ORDER_BY = "orderBy";
   public static final String ORIENTATION = "orientation";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String PADDING_BOTTOM = "paddingBottom";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String PADDING_LEFT = "paddingLeft";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String PADDING_RIGHT = "paddingRight";
-  /** Used by a layout manager */
+  /**
+   * Used by a layout manager
+   */
   public static final String PADDING_TOP = "paddingTop";
-  /** @deprecated Since 2.0.6. No longer needed. */
+  /**
+   * @deprecated Since 2.0.6. No longer needed.
+   */
   @Deprecated
   public static final String PAGE_MENU = "pageMenu";
   public static final String PASSWORD = "password";
@@ -202,7 +242,9 @@ public final class Attributes {
   public static final String STATE = "state";
   public static final String STATE_PREVIEW = "statePreview";
   public static final String STYLE = "style";
-  /** @deprecated */
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   public static final String STYLE_CLASS = "styleClass";
   public static final String SUPPRESS_TOOLBAR_CONTAINER = "suppressToolbarContainer";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java
index 7bc5fac..9c9d33f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java
@@ -28,6 +28,9 @@ public final class ComponentTypes {
 
   public static final String BOX = "org.apache.myfaces.tobago.Box";
   public static final String BUTTON = "org.apache.myfaces.tobago.Button";
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   public static final String CELL = "org.apache.myfaces.tobago.Cell";
   public static final String COLUMN = "org.apache.myfaces.tobago.Column";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java
index f08f808..cca7044 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java
@@ -48,8 +48,7 @@ public final class Facets {
   }
 
   /**
-   * @deprecated since 2.0.0. Please use {@link #POPUP}
-   * Using compatible names for  backward compatibility.
+   * @deprecated since 2.0.0. Please use {@link #POPUP} Using compatible names for  backward compatibility.
    */
   @Deprecated
   public static final String PICKER_POPUP = POPUP;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
index 1d2160b..43ebf5a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.component;
 import javax.el.MethodExpression;
 
 public interface InputSuggest2 extends InputSuggest {
-  
+
   MethodExpression getSuggestMethodExpression();
 
   void setSuggestMethodExpression(MethodExpression suggestExpression);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
index b418607..3ee172e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
@@ -49,6 +49,7 @@ public class MethodBindingToMethodExpression extends MethodExpression implements
 
   /**
    * Creates a new instance of MethodBindingToMethodExpression
+   *
    * @param methodBinding The MethodBinding to wrap.
    */
   public MethodBindingToMethodExpression(final MethodBinding methodBinding) {
@@ -58,6 +59,7 @@ public class MethodBindingToMethodExpression extends MethodExpression implements
 
   /**
    * Return the wrapped MethodBinding.
+   *
    * @return the wrapped MethodBinding
    */
   public MethodBinding getMethodBinding() {
@@ -142,8 +144,8 @@ public class MethodBindingToMethodExpression extends MethodExpression implements
     }
   }
 
-  public void setTransient(final boolean transientFlag) {
-    this.transientFlag = transientFlag;
+  public void setTransient(final boolean transientParameter) {
+    this.transientFlag = transientParameter;
   }
 
   public boolean isTransient() {
@@ -154,7 +156,7 @@ public class MethodBindingToMethodExpression extends MethodExpression implements
   public int hashCode() {
     final int prime = 31;
     int result = 1;
-    result = prime * result + ((methodBinding == null) ? 0 : methodBinding.hashCode());
+    result = prime * result + (methodBinding == null ? 0 : methodBinding.hashCode());
     return result;
   }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Position.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Position.java
index 5a47d86..860c4e7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Position.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Position.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.component;
 import org.apache.myfaces.tobago.layout.Measure;
 
 /**
- * This interface indicates that the component has a position like e. g. UIPopup.
- * XXX Warning: It is to discussed, if this is a good solution.
+ * This interface indicates that the component has a position like e. g. UIPopup. XXX Warning: It is to discussed, if
+ * this is a good solution.
  */
 public interface Position {
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
index dde8696..e317e02 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
@@ -60,7 +60,7 @@ public final class RendererTypes {
   public static final String SELECT_BOOLEAN_CHECKBOX = "SelectBooleanCheckbox";
   public static final String SELECT_MANY_CHECKBOX = "SelectManyCheckbox";
   public static final String SELECT_MANY_LISTBOX = "SelectManyListbox";
-  public static final String SELECT_MANY_SHUTTLE = "SelectManyShuttle";;
+  public static final String SELECT_MANY_SHUTTLE = "SelectManyShuttle";
   public static final String SELECT_ONE_CHOICE = "SelectOneChoice";
   public static final String SELECT_ONE_RADIO = "SelectOneRadio";
   public static final String SELECT_ONE_LISTBOX = "SelectOneListbox";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
index 35e5b5f..c97f868 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
@@ -99,9 +99,9 @@ public class Sorter {
           if (child.getValueExpression(attributeName) != null) {
             final String var = data.getVar();
             if (var == null) {
-                LOG.error("No sorting performed. Property var of sheet is not set!");
-                unsetSortableAttribute(column);
-                return;
+              LOG.error("No sorting performed. Property var of sheet is not set!");
+              unsetSortableAttribute(column);
+              return;
             }
             String expressionString = child.getValueExpression(attributeName).getExpressionString();
             if (isSimpleProperty(expressionString)) {
@@ -126,9 +126,9 @@ public class Sorter {
               actualComparator = new ValueExpressionComparator(facesContext, var, expression, descending, comparator);
             }
           } else {
-              LOG.error("No sorting performed. No Expression target found for sorting!");
-              unsetSortableAttribute(column);
-              return;
+            LOG.error("No sorting performed. No Expression target found for sorting!");
+            unsetSortableAttribute(column);
+            return;
           }
         } else {
           LOG.error("No sorting performed. Value is not instanceof List or Object[]!");
@@ -229,8 +229,8 @@ public class Sorter {
       if (child instanceof UISelectMany
           || child instanceof UISelectOne
           || child instanceof UISelectBoolean
-          || (child instanceof AbstractUICommand && child.getChildren().isEmpty())
-          || (child instanceof UIInput && RendererTypes.HIDDEN.equals(child.getRendererType()))) {
+          || child instanceof AbstractUICommand && child.getChildren().isEmpty()
+          || child instanceof UIInput && RendererTypes.HIDDEN.equals(child.getRendererType())) {
         continue;
         // look for a better component if any
       }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/Configurable.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/Configurable.java
index b83e990..a477599 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/Configurable.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/Configurable.java
@@ -24,11 +24,12 @@ import org.apache.myfaces.tobago.context.Markup;
 public interface Configurable {
 
   /**
-   * The renderer is an id that is used by Tobago to gather information about the components which are 
-   * configured in the theme configuration files. E. g. the preferredWidth of a component.
+   * The renderer is an id that is used by Tobago to gather information about the components which are configured in the
+   * theme configuration files. E. g. the preferredWidth of a component.
+   *
    * @return The renderer type.
    */
-  String getRendererType();  
-  
+  String getRendererType();
+
   Markup getCurrentMarkup();
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Capability.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Capability.java
index 0d006c6..a27a4eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Capability.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Capability.java
@@ -32,9 +32,8 @@ public enum Capability {
   CONTENT_TYPE_XHTML,
 
   /**
-   * In IE 8 and later, a compatibility mode can be activated in the user agent.
-   * For Tobago pages this should not be activated. So this property can be used to
-   * decide, if a warning should be rendered.
+   * In IE 8 and later, a compatibility mode can be activated in the user agent. For Tobago pages this should not be
+   * activated. So this property can be used to decide, if a warning should be rendered.
    */
   IE_COMPATIBILITY_MODE
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
index 91f64e5..d793c68 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
@@ -33,13 +33,13 @@ import java.io.Serializable;
 import java.util.Locale;
 
 /**
- * The ClientProperties contains data, which are individual for each user.
- * It is stored in the session by default, but the application can override this in the faces-config.xml.
+ * The ClientProperties contains data, which are individual for each user. It is stored in the session by default, but
+ * the application can override this in the faces-config.xml.
  * <p/>
  * The managed bean name which is Tobago using for the instance is {@link #MANAGED_BEAN_NAME}.
  * <p/>
- * Please use {@link ClientProperties#getInstance(javax.faces.context.FacesContext)}
- * to access to the users client properties.
+ * Please use {@link ClientProperties#getInstance(javax.faces.context.FacesContext)} to access to the users client
+ * properties.
  */
 
 public class ClientProperties implements Serializable {
@@ -57,7 +57,9 @@ public class ClientProperties implements Serializable {
   private Theme theme;
   private UserAgent userAgent = UserAgent.DEFAULT;
 
-  /** @deprecated since Tobago 1.5.14 */
+  /**
+   * @deprecated since Tobago 1.5.14
+   */
   @Deprecated
   private boolean debugMode;
 
@@ -67,7 +69,7 @@ public class ClientProperties implements Serializable {
   private Measure pageWidth;
   private Measure pageHeight;
 
-  /** 
+  /**
    * managed bean constructor
    */
   public ClientProperties() {
@@ -120,7 +122,7 @@ public class ClientProperties implements Serializable {
   public Theme getTheme() {
     return theme;
   }
-  
+
   public void setTheme(final Theme theme) {
     this.theme = theme;
     reset();
@@ -135,13 +137,17 @@ public class ClientProperties implements Serializable {
     reset();
   }
 
-  /** @deprecated since Tobago 1.5.14 */
+  /**
+   * @deprecated since Tobago 1.5.14
+   */
   @Deprecated
   public boolean isDebugMode() {
     return debugMode;
   }
 
-  /** @deprecated since Tobago 1.5.14 */
+  /**
+   * @deprecated since Tobago 1.5.14
+   */
   @Deprecated
   public void setDebugMode(final boolean debugMode) {
     this.debugMode = debugMode;
@@ -150,16 +156,17 @@ public class ClientProperties implements Serializable {
   /**
    * @deprecated since 2.0.0, please use {@link javax.faces.component.UIViewRoot#getLocale()}
    */
+  @Deprecated
   public Locale getLocale() {
     Deprecation.LOG.warn("Please get locale via UIViewRoot.");
     return FacesContext.getCurrentInstance().getViewRoot().getLocale();
   }
 
   /**
-   * @deprecated since 2.0.0
-   * This setter should not be called from the application directly,
-   * but via {@link javax.faces.component.UIViewRoot#setLocale(Locale locale)}
+   * @deprecated since 2.0.0 This setter should not be called from the application directly, but via {@link
+   * javax.faces.component.UIViewRoot#setLocale(Locale locale)}
    */
+  @Deprecated
   public void setLocale(final Locale locale) {
     Deprecation.LOG.warn("Please set locale via UIViewRoot.");
     FacesContext.getCurrentInstance().getViewRoot().setLocale(locale);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
index a20107a..0a4094d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
@@ -32,10 +32,9 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * A markup signs a component to be rendered different from the normal.
- * E. g. <code>markup="emphasized"</code> might be rendered bold
- * or a <code>markup="deleted"</code> might be rendered with line-through style.
- * The concrete rendering depends from the theme.
+ * A markup signs a component to be rendered different from the normal. E. g. <code>markup="emphasized"</code> might be
+ * rendered bold or a <code>markup="deleted"</code> might be rendered with line-through style. The concrete rendering
+ * depends from the theme.
  * <p/>
  * The markup can also hold more than one value, e. g. <code>markup="emphasized, deleted"</code>.
  * <p/>
@@ -191,8 +190,8 @@ public final class Markup implements Serializable, Iterable<String> {
   }
 
   /**
-   * Adds one markup to an other.
-   * Attention: The markup itself is not modified, you need to use the result of this operation.
+   * Adds one markup to an other. Attention: The markup itself is not modified, you need to use the result of this
+   * operation.
    */
   public Markup add(final Markup markup) {
     if (markup == null) {
@@ -295,12 +294,12 @@ public final class Markup implements Serializable, Iterable<String> {
     if (value != null) {
       return value.equals(markup);
     }
-    for (final String value : values) {
-        if (value.equals(markup)) {
-          return true;
-        }
+    for (final String v : values) {
+      if (v.equals(markup)) {
+        return true;
       }
-      return false;
+    }
+    return false;
   }
 
   @Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfig.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfig.java
index 2136b4a..91b357b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfig.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfig.java
@@ -19,9 +19,9 @@
 
 package org.apache.myfaces.tobago.context;
 
-import java.util.Set;
-import java.util.HashSet;
 import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
 
 public class MarkupConfig implements Serializable {
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java
index 165af6e..7267ee5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java
@@ -26,8 +26,8 @@ import java.beans.PropertyEditorSupport;
  */
 public class MarkupEditor extends PropertyEditorSupport {
 
-    @Override
-    public void setAsText(final String text) throws IllegalArgumentException {
-        setValue(Markup.valueOf(text));
-    }
+  @Override
+  public void setAsText(final String text) throws IllegalArgumentException {
+    setValue(Markup.valueOf(text));
+  }
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManager.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManager.java
index bd08639..2972266 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManager.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManager.java
@@ -28,29 +28,47 @@ import javax.faces.render.Renderer;
 
 public interface ResourceManager {
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   String getJsp(UIViewRoot viewRoot, String name);
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   String getProperty(UIViewRoot viewRoot, String bundle, String propertyKey);
 
   String getProperty(FacesContext facesContext, String bundle, String propertyKey);
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   Renderer getRenderer(UIViewRoot viewRoot, String rendererType);
 
   Renderer getRenderer(FacesContext facesContext, String rendererType);
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   String[] getScripts(UIViewRoot viewRoot, String name);
 
   String[] getScripts(FacesContext facesContext, String name);
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   String[] getStyles(UIViewRoot viewRoot, String name);
 
   String[] getStyles(FacesContext facesContext, String name);
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   String getThemeProperty(UIViewRoot viewRoot, String bundle, String propertyKey);
 
@@ -58,6 +76,9 @@ public interface ResourceManager {
 
   Measure getThemeMeasure(FacesContext facesContext, String rendererType, Markup markup, String name);
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   String getImage(UIViewRoot viewRoot, String name);
 
@@ -67,6 +88,9 @@ public interface ResourceManager {
   @Deprecated
   String getImage(FacesContext facesContext, String name);
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   String getImage(UIViewRoot viewRoot, String name, boolean ignoreMissing);
 
@@ -75,8 +99,7 @@ public interface ResourceManager {
    * @param nameWithExtension The name with extension
    * @param ignoreMissing if set to false, an error message will be logged, when image is missing
    * @return the full file path
-   *
-   * @deprecated
+   * @deprecated xxx
    */
   @Deprecated
   String getImage(FacesContext facesContext, String nameWithExtension, boolean ignoreMissing);
@@ -91,4 +114,4 @@ public interface ResourceManager {
   String getImage(
       FacesContext facesContext, String name, String extension, boolean ignoreMissing);
 
-  }
+}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java
index 77bc8fa..2d8c662 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java
@@ -96,9 +96,8 @@ public final class ResourceManagerUtils {
   }
 
   /**
-   * Searches for an image and return it with the context path.
-   * The extension of the image will be automatically extended (.png, .gif, .jpg).
-   * A missing image will be logged as an error.
+   * Searches for an image and return it with the context path. The extension of the image will be automatically
+   * extended (.png, .gif, .jpg). A missing image will be logged as an error.
    *
    * @param facesContext the current FacesContext
    * @param name the name of the image without extension
@@ -109,8 +108,8 @@ public final class ResourceManagerUtils {
   }
 
   /**
-   * Searches for an image and return it with the context path.
-   * The extension of the image will be automatically extended (.png, .gif, .jpg)
+   * Searches for an image and return it with the context path. The extension of the image will be automatically
+   * extended (.png, .gif, .jpg)
    *
    * @param facesContext the current FacesContext
    * @param name the name of the image without extension
@@ -195,7 +194,7 @@ public final class ResourceManagerUtils {
   }
 
   public static String getDisabledImage(final FacesContext facesContext, final String image,
-                                                final boolean ignoreMissing) {
+                                        final boolean ignoreMissing) {
     return getImage(facesContext, image + "Disabled", ignoreMissing);
   }
 
@@ -230,10 +229,10 @@ public final class ResourceManagerUtils {
       return true;
     }
     final String upper = value.toUpperCase(Locale.ENGLISH);
-    return (upper.startsWith("/")
+    return upper.startsWith("/")
         || upper.startsWith("HTTP:")
         || upper.startsWith("HTTPS:")
-        || upper.startsWith("FTP:"));
+        || upper.startsWith("FTP:");
   }
 
   public static int indexOfExtension(final String value) {
@@ -254,7 +253,7 @@ public final class ResourceManagerUtils {
   }
 
   public static String getImageOrDisabledImageWithPath(
-          final FacesContext facesContext, final String image, final boolean disabled, final boolean ignoreMissing) {
+      final FacesContext facesContext, final String image, final boolean disabled, final boolean ignoreMissing) {
     String imageWithPath = null;
     if (disabled) {
       imageWithPath = ResourceManagerUtils.getDisabledImageWithPath(facesContext, image, false);
@@ -271,7 +270,7 @@ public final class ResourceManagerUtils {
   }
 
   public static String getImageOrDisabledImage(
-          final FacesContext facesContext, final String image, final boolean disabled, final boolean ignoreMissing) {
+      final FacesContext facesContext, final String image, final boolean disabled, final boolean ignoreMissing) {
     String imageWithPath = null;
     if (disabled) {
       imageWithPath = ResourceManagerUtils.getDisabledImage(facesContext, image, false);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
index fbeb785..6537cb2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
@@ -144,14 +144,14 @@ public class ThemeImpl implements Theme, Serializable {
       renderersConfig = new RenderersConfigImpl();
     }
     if (!renderersConfig.isMerged()) {
-      final ThemeImpl fallback = getFallback();
-      if (fallback != null) {
-        fallback.resolveRendererConfig(rendererConfigFromTobagoConfig);
-        final RenderersConfigImpl fallbackRenderersConfig = fallback.getRenderersConfigImpl();
+      final ThemeImpl fallbackTheme = getFallback();
+      if (fallbackTheme != null) {
+        fallbackTheme.resolveRendererConfig(rendererConfigFromTobagoConfig);
+        final RenderersConfigImpl fallbackRenderersConfig = fallbackTheme.getRenderersConfigImpl();
         if (fallbackRenderersConfig != null) {
           renderersConfig.merge(fallbackRenderersConfig, false);
           if (LOG.isDebugEnabled()) {
-            LOG.debug("merge markupconfig from {} for {}", fallback.getName(), getName());
+            LOG.debug("merge markupconfig from {} for {}", fallbackTheme.getName(), getName());
           }
         }
       }
@@ -167,11 +167,11 @@ public class ThemeImpl implements Theme, Serializable {
 
   public void resolveResources() {
     checkLocked();
-    final ThemeImpl fallback = getFallback();
-    if (fallback != null) {
-      fallback.resolveResources();
-      addResources(fallback.getProductionResources());
-      addResources(fallback.getResources());
+    final ThemeImpl fallbackTheme = getFallback();
+    if (fallbackTheme != null) {
+      fallbackTheme.resolveResources();
+      addResources(fallbackTheme.getProductionResources());
+      addResources(fallbackTheme.getResources());
     }
   }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
index e8fca4f..88babf6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
@@ -28,9 +28,9 @@ import java.util.Enumeration;
 import java.util.ResourceBundle;
 
 /**
- * This class works like the Java resource bundle mechanism for a named resource bundle
- * and adds the functionality of the tobago themes and also supports XML properties files.
- * This class might be used in the faces-config.xml as an alternative to the tc:loadBundle tag.
+ * This class works like the Java resource bundle mechanism for a named resource bundle and adds the functionality of
+ * the tobago themes and also supports XML properties files. This class might be used in the faces-config.xml as an
+ * alternative to the tc:loadBundle tag.
  *
  * @since 1.5.0
  */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
index 9c57f2b..4443119 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
@@ -39,8 +39,8 @@ public class TobagoContext {
   }
 
   /**
-   * Returns the dimension of the page. Might be useful to set the size of a popup.
-   * E. g. <code>width="#{tobagoContext.pageDimension.width.pixel - 100}"</code>
+   * Returns the dimension of the page. Might be useful to set the size of a popup. E. g.
+   * <code>width="#{tobagoContext.pageDimension.width.pixel - 100}"</code>
    */
   public Dimension getPageDimension() {
     final FacesContext facesContext = FacesContext.getCurrentInstance();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoMessageBundle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoMessageBundle.java
index ffc13b9..22ded91 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoMessageBundle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoMessageBundle.java
@@ -20,9 +20,9 @@
 package org.apache.myfaces.tobago.context;
 
 /**
- * This ResourceBundle encapsulate the messages (e. g. validation) of Tobago components.
- * This class works like the Java resource bundle mechanism for the resource bundle "tobago-message"
- * and adds the functionality of the tobago themes and also supports XML properties files.
+ * This ResourceBundle encapsulate the messages (e. g. validation) of Tobago components. This class works like the Java
+ * resource bundle mechanism for the resource bundle "tobago-message" and adds the functionality of the tobago themes
+ * and also supports XML properties files.
  *
  * @since 1.5.0
  */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java
index 1205c5d..ecb84b0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java
@@ -20,9 +20,9 @@
 package org.apache.myfaces.tobago.context;
 
 /**
- * This ResourceBundle encapsulate string resources of Tobago components.
- * This class works like the Java resource bundle mechanism for the resource bundle "tobago"
- * and adds the functionality of the tobago themes and also supports XML properties files.
+ * This ResourceBundle encapsulate string resources of Tobago components. This class works like the Java resource bundle
+ * mechanism for the resource bundle "tobago" and adds the functionality of the tobago themes and also supports XML
+ * properties files.
  */
 public class TobagoResourceBundle extends TobagoBundle {
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
index 82a3a5a..1338239 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
@@ -42,8 +42,8 @@ public class TransientStateHolder implements StateHolder, Serializable {
     return null;
   }
 
-  public void put(final Object object) {
-    this.object = object;
+  public void put(final Object objectParameter) {
+    this.object = objectParameter;
   }
 
   public boolean isEmpty() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
index 9d681cf..35222f8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
@@ -104,6 +104,7 @@ public final class UserAgent implements Serializable {
   /**
    * @deprecated no longer supported, since Tobago 1.5. Please use {@link #PRESTO}.
    */
+  @Deprecated
   public static final UserAgent OPERA = new UserAgent("opera", null);
 
   /**
@@ -189,8 +190,8 @@ public final class UserAgent implements Serializable {
   private final String name;
 
   /**
-   * @deprecated Version shouldn't be used in the future. Use capability instead, even better
-   * use same code on the server when possible and use capability via JavaScript.
+   * @deprecated Version shouldn't be used in the future. Use capability instead, even better use same code on the
+   * server when possible and use capability via JavaScript.
    */
   @Deprecated
   private final String version;
@@ -348,16 +349,16 @@ public final class UserAgent implements Serializable {
         : name;
   }
 
-  private static enum CspHeader {
+  private enum CspHeader {
 
-    NOT_SUPPORTED(new String[] {}),
-    X(new String[] {"Content-Security-Policy", "X-Content-Security-Policy"}),
-    WEBKIT(new String[] {"Content-Security-Policy", "X-WebKit-CSP"}),
-    STANDARD(new String[] {"Content-Security-Policy"});
+    NOT_SUPPORTED(new String[]{}),
+    X(new String[]{"Content-Security-Policy", "X-Content-Security-Policy"}),
+    WEBKIT(new String[]{"Content-Security-Policy", "X-WebKit-CSP"}),
+    STANDARD(new String[]{"Content-Security-Policy"});
 
     private String[] names;
 
-    private CspHeader(final String[] names) {
+    CspHeader(final String[] names) {
       this.names = names;
     }
 
@@ -366,16 +367,16 @@ public final class UserAgent implements Serializable {
     }
   }
 
-  private static enum CsproHeader {
+  private enum CsproHeader {
 
-    NOT_SUPPORTED(new String[] {}),
-    X(new String[] {"Content-Security-Policy-Report-Only", "X-Content-Security-Policy-Report-Only"}),
-    WEBKIT(new String[] {"Content-Security-Policy-Report-Only", "X-WebKit-CSP-Report-Only"}),
-    STANDARD(new String[] {"Content-Security-Policy-Report-Only"});
+    NOT_SUPPORTED(new String[]{}),
+    X(new String[]{"Content-Security-Policy-Report-Only", "X-Content-Security-Policy-Report-Only"}),
+    WEBKIT(new String[]{"Content-Security-Policy-Report-Only", "X-WebKit-CSP-Report-Only"}),
+    STANDARD(new String[]{"Content-Security-Policy-Report-Only"});
 
     private String[] names;
 
-    private CsproHeader(final String[] names) {
+    CsproHeader(final String[] names) {
       this.names = names;
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
index 4dbb216..408d5e8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
@@ -19,9 +19,9 @@
 
 package org.apache.myfaces.tobago.convert;
 
+import org.apache.myfaces.tobago.component.Attributes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.component.Attributes;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
index 6c766e2..4bd4701 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
@@ -19,10 +19,10 @@
 
 package org.apache.myfaces.tobago.convert;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.myfaces.tobago.config.TobagoConfig;
 import org.apache.myfaces.tobago.context.Theme;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
index cfa4837..e873843 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
@@ -40,7 +40,7 @@ public class MethodExpressionTabChangeListener implements TabChangeListener, Sta
   }
 
   public void processTabChange(final TabChangeEvent actionEvent) throws AbortProcessingException {
-     FacesUtilsEL.invokeMethodExpression(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
+    FacesUtilsEL.invokeMethodExpression(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
   }
 
   public void restoreState(final FacesContext context, final Object state) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageAction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageAction.java
index 250934d..368e47a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageAction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageAction.java
@@ -63,7 +63,7 @@ public enum PageAction {
   public String getToken() {
     return token;
   }
-  
+
   private static final Map<String, PageAction> MAPPING;
 
   static {
@@ -75,7 +75,6 @@ public enum PageAction {
   }
 
   /**
-   * 
    * @param name Name of the PageAction
    * @return The matching page action (can't be null).
    * @throws IllegalArgumentException When the name doesn't match any PageAction.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java
index 0718f3e..001aae9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java
@@ -20,8 +20,8 @@
 package org.apache.myfaces.tobago.event;
 
 
-import javax.faces.event.ActionEvent;
 import javax.faces.component.UIComponent;
+import javax.faces.event.ActionEvent;
 
 
 public class PageActionEvent extends ActionEvent {
@@ -48,8 +48,7 @@ public class PageActionEvent extends ActionEvent {
   }
 
   /**
-   * Returns the value for action types {@link PageAction#TO_ROW}
-   * and {@link PageAction#TO_PAGE}.
+   * Returns the value for action types {@link PageAction#TO_ROW} and {@link PageAction#TO_PAGE}.
    */
   public int getValue() {
     return value;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
index 2a7ec81..da49c76 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
@@ -19,10 +19,10 @@
 
 package org.apache.myfaces.tobago.event;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.myfaces.tobago.internal.component.AbstractUIPopup;
 import org.apache.myfaces.tobago.util.ComponentUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.faces.component.StateHolder;
 import javax.faces.context.FacesContext;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java
index ecfbc1e..b0dbc33 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java
@@ -19,10 +19,10 @@
 
 package org.apache.myfaces.tobago.event;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.internal.component.AbstractUIPopup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java
index bc03180..1047ffa 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java
@@ -25,7 +25,7 @@ import javax.faces.event.AbortProcessingException;
 import javax.faces.event.ActionEvent;
 import java.io.Serializable;
 
-public class ResetFormActionListener extends AbstractResetInputActionListener implements Serializable{
+public class ResetFormActionListener extends AbstractResetInputActionListener implements Serializable {
 
   public void processAction(final ActionEvent actionEvent) throws AbortProcessingException {
     UIComponent component = actionEvent.getComponent();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java
index 908e8bb..90beae1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java
@@ -29,7 +29,7 @@ import java.util.Collection;
 
 public class ResetInputActionListener extends AbstractResetInputActionListener implements StateHolder {
 
-  private String [] clientIds;
+  private String[] clientIds;
 
   public ResetInputActionListener() {
   }
@@ -39,7 +39,7 @@ public class ResetInputActionListener extends AbstractResetInputActionListener i
   }
 
   public ResetInputActionListener(final Collection<String> clientIds) {
-     this.clientIds = clientIds.toArray(new String[clientIds.size()]);
+    this.clientIds = clientIds.toArray(new String[clientIds.size()]);
   }
 
   public void processAction(final ActionEvent event) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
index 132f0d3..80f004b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
@@ -20,8 +20,8 @@
 package org.apache.myfaces.tobago.event;
 
 import javax.faces.component.UIComponent;
-import javax.faces.event.FacesListener;
 import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesListener;
 
 public class SheetStateChangeEvent extends ActionEvent {
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
index 7e3c882..2875237 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
@@ -35,7 +35,7 @@ public class TabChangeEvent extends ActionEvent {
     this.oldTabIndex = oldTabIndex;
     this.newTabIndex = newTabIndex;
   }
-  
+
   /**
    * @deprecated Please use {@link TabChangeEvent(UIComponent, Integer, Integer)}
    */
@@ -76,8 +76,8 @@ public class TabChangeEvent extends ActionEvent {
    * @deprecated Not supported anymore
    */
   @Deprecated
-  public void setOldState(final Object oldTabIndex) {
-    this.oldTabIndex = oldTabIndex instanceof Integer ? (Integer) oldTabIndex : -1;
+  public void setOldState(final Object oldTabIndexParameter) {
+    this.oldTabIndex = oldTabIndexParameter instanceof Integer ? (Integer) oldTabIndexParameter : -1;
   }
 
   /**
@@ -92,7 +92,7 @@ public class TabChangeEvent extends ActionEvent {
    * @deprecated Not supported anymore
    */
   @Deprecated
-  public void setNewState(final Object newTabIndex) {
-    this.newTabIndex = newTabIndex instanceof Integer ? (Integer) newTabIndex : -1;
+  public void setNewState(final Object newTabIndexParameter) {
+    this.newTabIndex = newTabIndexParameter instanceof Integer ? (Integer) newTabIndexParameter : -1;
   }
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
index 9ddad16..67c2553 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
@@ -43,7 +43,7 @@ public class TreeExpansionEvent extends FacesEvent {
   public void processListener(final FacesListener facesListener) {
     if (facesListener instanceof TreeExpansionListener) {
       if (oldExpanded && !newExpanded) {
-   //todo     ((TreeExpansionListener) facesListener).treeCollapsed(this);
+        //todo     ((TreeExpansionListener) facesListener).treeCollapsed(this);
         ((TreeExpansionListener) facesListener).treeExpanded(this);
       } else if (!oldExpanded && newExpanded) {
         ((TreeExpansionListener) facesListener).treeExpanded(this);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
index 5eedf7a..92234c0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.event;
 
 import javax.faces.event.FacesListener;
 
-public interface TreeExpansionListener  extends FacesListener {
+public interface TreeExpansionListener extends FacesListener {
 
   void treeExpanded(TreeExpansionEvent event);
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
index 57fa451..0518c8b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
@@ -50,11 +50,11 @@ public class ValueExpressionResetInputActionListener extends AbstractResetInputA
 
   public void processAction(final ActionEvent event) {
     final Object obj = clientIdsExpression.getValue(FacesContext.getCurrentInstance().getELContext());
-    final String [] clientIds;
+    final String[] clientIds;
     if (obj instanceof String[]) {
       clientIds = (String[]) obj;
     } else if (obj instanceof String) {
-      clientIds= StringUtils.split((String) obj, ", ");
+      clientIds = StringUtils.split((String) obj, ", ");
     } else {
       LOG.error("Ignore unknown value of " + obj + " for reset.");
       return;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
index afd5e9b..fea23c9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
@@ -93,7 +93,7 @@ public class ValueExpressionSheetStateChangeListener implements SheetStateChange
   private SheetStateChangeListener createSheetStateChangeListener(final String className) {
     try {
       final Class clazz = getClass().getClassLoader().loadClass(className);
-      return ((SheetStateChangeListener) clazz.newInstance());
+      return (SheetStateChangeListener) clazz.newInstance();
     } catch (final Exception e) {
       LOG.error("", e);
     }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
index 788d760..9e700dd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
@@ -93,7 +93,7 @@ public class ValueExpressionTabChangeListener implements TabChangeListener, Stat
   private TabChangeListener createTabChangeListener(final String className) {
     try {
       final Class clazz = getClass().getClassLoader().loadClass(className);
-      return ((TabChangeListener) clazz.newInstance());
+      return (TabChangeListener) clazz.newInstance();
     } catch (final Exception e) {
       LOG.error("", e);
     }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
index 89be81e..341772b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
@@ -43,7 +43,7 @@ public class ContentTypeRule extends MetaRule {
 
     private final TagAttribute attribute;
 
-    public ContentTypeRuleMapper(final TagAttribute attribute) {
+    ContentTypeRuleMapper(final TagAttribute attribute) {
       this.attribute = attribute;
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java
index 3d79d0b..21e87c6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java
@@ -32,7 +32,7 @@ import javax.faces.view.facelets.MetadataTarget;
 import javax.faces.view.facelets.TagAttribute;
 
 public class DeprecatedDimensionRule extends MetaRule {
-  
+
   public static final DeprecatedDimensionRule INSTANCE = new DeprecatedDimensionRule();
 
   public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
@@ -71,7 +71,7 @@ public class DeprecatedDimensionRule extends MetaRule {
 
     public void applyMetadata(final FaceletContext ctx, final Object instance) {
       if (attribute.isLiteral()) {
-         ((DeprecatedDimension) instance).setHeight(Measure.parse(attribute.getValue()));
+        ((DeprecatedDimension) instance).setHeight(Measure.parse(attribute.getValue()));
       } else {
         final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
         ((UIComponent) instance).setValueExpression(Attributes.HEIGHT, expression);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
index be94af8..9f928d7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
@@ -20,11 +20,11 @@
 package org.apache.myfaces.tobago.facelets;
 
 import javax.servlet.Filter;
+import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.FilterChain;
 import java.io.IOException;
 
 public class FixCharacterEncodingFilter implements Filter {
@@ -33,7 +33,7 @@ public class FixCharacterEncodingFilter implements Filter {
   }
 
   public void doFilter(final ServletRequest servletRequest,
-      final ServletResponse servletResponse, final FilterChain filterChain)
+                       final ServletResponse servletResponse, final FilterChain filterChain)
       throws IOException, ServletException {
     if (servletRequest.getCharacterEncoding() == null) {
       servletRequest.setCharacterEncoding("UTF-8");
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
index 676b019..61abb17 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
@@ -95,12 +95,13 @@ public class GridLayoutConstraintHandler extends TagHandler {
     paddingBottom = getAttribute(Attributes.PADDING_BOTTOM);
   }
 
-  public void apply(final FaceletContext faceletContext, UIComponent parent) throws IOException {
+  public void apply(final FaceletContext faceletContext, final UIComponent parentComponent) throws IOException {
+    UIComponent parent = parentComponent;
     if (parent.getParent() != null && parent.getParent() instanceof UIExtensionPanel) {
-       parent = parent.getParent();
+      parent = parent.getParent();
     } else if (parent.getAttributes().get("tobago.panel") != null
-         && parent.getAttributes().get("tobago.panel") instanceof UIExtensionPanel) {
-       parent = (UIComponent) parent.getAttributes().get("tobago.panel");
+        && parent.getAttributes().get("tobago.panel") instanceof UIExtensionPanel) {
+      parent = (UIComponent) parent.getAttributes().get("tobago.panel");
     }
     if (parent instanceof LayoutBase) {
       final LayoutBase component = (LayoutBase) parent;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
index ca817d6..4afbc97 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
@@ -47,6 +47,6 @@ public class LoadBundleHandler extends TagHandler {
     // TODO find a better way
     facesContext.getExternalContext().
         getSessionMap().put(var.getValue(faceletContext), map);
-        //getRequestMap().put(var.getValue(faceletContext), map);
+    //getRequestMap().put(var.getValue(faceletContext), map);
   }
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
index 30a0f1d..60b825a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
@@ -25,8 +25,8 @@ import org.slf4j.LoggerFactory;
 import java.net.URL;
 
 /**
- * Provides facelets from the directory "META-INF/resources/" of any jar file in the classpath.
- * With the Servlet 3.0 specification this is no longer needed.
+ * Provides facelets from the directory "META-INF/resources/" of any jar file in the classpath. With the Servlet 3.0
+ * specification this is no longer needed.
  * <p/>
  * To configure this ResourceResolver put this code into the web.xml file:
  * <pre>
@@ -49,7 +49,8 @@ public class MetaInfResourcesClasspathResourceResolver extends DefaultResourceRe
     }
   }
 
-  public URL resolveUrl(String path) {
+  public URL resolveUrl(final String pathParameter) {
+    String path = pathParameter;
     URL url = super.resolveUrl(path);
     if (LOG.isDebugEnabled()) {
       LOG.debug("default   url='" + url + "'");
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
index ddb5eac..8d9f68d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
@@ -47,7 +47,7 @@ public class PopupReferenceHandler extends TagHandler {
     if (parent instanceof ActionSource) {
       if (ComponentHandler.isNew(parent)) {
         final ActionSource actionSource = (ActionSource) parent;
-        if (forComponent.isLiteral())  {
+        if (forComponent.isLiteral()) {
           actionSource.addActionListener(new PopupActionListener(forComponent.getValue()));
         } else {
           final ValueExpression forValueExpression = forComponent.getValueExpression(faceletContext, String.class);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java
index 885ac2f..acbb804 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java
@@ -32,7 +32,7 @@ import javax.faces.view.facelets.MetadataTarget;
 import javax.faces.view.facelets.TagAttribute;
 
 public class PositionRule extends MetaRule {
-  
+
   public static final PositionRule INSTANCE = new PositionRule();
 
   public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
@@ -71,7 +71,7 @@ public class PositionRule extends MetaRule {
 
     public void applyMetadata(final FaceletContext ctx, final Object instance) {
       if (attribute.isLiteral()) {
-         ((Position) instance).setTop(Measure.parse(attribute.getValue()));
+        ((Position) instance).setTop(Measure.parse(attribute.getValue()));
       } else {
         final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
         ((UIComponent) instance).setValueExpression(Attributes.TOP, expression);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
index ce10e94..4047660 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
@@ -51,7 +51,7 @@ public class ResetInputActionListenerHandler extends TagHandler {
         final ActionSource actionSource = (ActionSource) parent;
         if (execute == null) {
           actionSource.addActionListener(new ResetFormActionListener());
-        } else if (execute.isLiteral())  {
+        } else if (execute.isLiteral()) {
           actionSource.addActionListener(new ResetInputActionListener(ComponentUtils.splitList(execute.getValue())));
         } else {
           final ValueExpression forValueExpression = execute.getValueExpression(faceletContext, String.class);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
index 61ed904..ee96070 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
@@ -47,14 +47,13 @@ public final class Resource {
    * Get an URL of an internal resource. First, {@link javax.faces.context.ExternalContext#getResource(String)} is
    * checked for an non-null URL return value. In the case of a null return value (as it is the case for Weblogic 8.1
    * for a packed war), a URL with a special URL handler is constructed, which can be used for <em>opening</em> a
-   * serlvet resource later. Internally, this special URL handler will call
-   * {@link javax.servlet.ServletContext#getResourceAsStream(String)} when an inputstream is requested.
-   * This works even on Weblogic 8.1
+   * serlvet resource later. Internally, this special URL handler will call {@link
+   * javax.servlet.ServletContext#getResourceAsStream(String)} when an inputstream is requested. This works even on
+   * Weblogic 8.1
    *
-   * @param ctx  the faces context from which to retrieve the resource
+   * @param ctx the faces context from which to retrieve the resource
    * @param path an URL path
    * @return an url representing the URL and on which getInputStream() can be called to get the resource
-   * @throws java.net.MalformedURLException
    */
   public static URL getResourceUrl(final FacesContext ctx, final String path) throws MalformedURLException {
     final ExternalContext externalContext = ctx.getExternalContext();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
index 5b75934..4c46d05 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
@@ -48,7 +48,7 @@ public class SheetStateChangeSourceRule extends MetaRule {
 
     private final TagAttribute attribute;
 
-    public SheetStateChangeListenerMapper(final TagAttribute attribute) {
+    SheetStateChangeListenerMapper(final TagAttribute attribute) {
       this.attribute = attribute;
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
index bfc6753..c67e11d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
@@ -36,7 +36,7 @@ public class SortActionSourceRule extends MetaRule {
   public static final SortActionSourceRule INSTANCE = new SortActionSourceRule();
 
   public Metadata applyRule(final String name, final TagAttribute attribute,
-      final MetadataTarget metadataTarget) {
+                            final MetadataTarget metadataTarget) {
     if (metadataTarget.isTargetInstanceOf(SortActionSource.class)) {
       if ("sortActionListener".equals(name)) {
         return new SortActionListenerMapper(attribute);
@@ -49,7 +49,7 @@ public class SortActionSourceRule extends MetaRule {
 
     private final TagAttribute attribute;
 
-    public SortActionListenerMapper(final TagAttribute attribute) {
+    SortActionListenerMapper(final TagAttribute attribute) {
       this.attribute = attribute;
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
index 9ccb0b1..5304e18 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
@@ -55,7 +55,7 @@ public class SuggestMethodRule extends MetaRule {
   static final class SuggestMethodMapper extends Metadata {
     private final TagAttribute attribute;
 
-    public SuggestMethodMapper(final TagAttribute attribute) {
+    SuggestMethodMapper(final TagAttribute attribute) {
       this.attribute = attribute;
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
index a3ff01e..01e486f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
@@ -48,7 +48,7 @@ public class SupportsMarkupRule extends MetaRule {
 
     private final TagAttribute attribute;
 
-    public SupportsMarkupMapper(final TagAttribute attribute) {
+    SupportsMarkupMapper(final TagAttribute attribute) {
       this.attribute = attribute;
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java
index e10c65f..fdbc32c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java
@@ -48,7 +48,7 @@ public class SupportsRenderedPartiallyRule extends MetaRule {
 
     private final TagAttribute attribute;
 
-    public SupportsRenderedPartiallyMapper(final TagAttribute attribute) {
+    SupportsRenderedPartiallyMapper(final TagAttribute attribute) {
       this.attribute = attribute;
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
index 3985a24..520a623 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
@@ -45,7 +45,7 @@ public class TabChangeSourceRule extends MetaRule {
 
     private final TagAttribute attribute;
 
-    public TabChangeListenerMapper(final TagAttribute attribute) {
+    TabChangeListenerMapper(final TagAttribute attribute) {
       this.attribute = attribute;
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java
index 8f809f5..2337994 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java
@@ -57,5 +57,5 @@ public class MenuRadioExtensionHandler extends TobagoMenuExtensionHandler {
   protected String getFacetName() {
     return Facets.RADIO;
   }
-  
+
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java
index 2c8b86b..c58deae 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java
@@ -19,10 +19,11 @@
 
 package org.apache.myfaces.tobago.facelets.extension;
 
-import javax.faces.view.facelets.ComponentConfig;
 import org.apache.myfaces.tobago.component.RendererTypes;
 import org.apache.myfaces.tobago.component.UISelectOneListbox;
 
+import javax.faces.view.facelets.ComponentConfig;
+
 public class SelectOneListboxExtensionHandler extends TobagoLabelExtensionHandler {
 
   public SelectOneListboxExtensionHandler(final ComponentConfig config) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
index 8866236..1cd9467 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
@@ -89,7 +89,7 @@ public abstract class TobagoMenuExtensionHandler extends ComponentHandler {
 
   protected MetaRuleset createSubComponentMetaRuleset(final Class aClass) {
     final MetaRuleset metaRuleset = super.createMetaRuleset(aClass);
-    final TagAttribute [] attrs = tag.getAttributes().getAll();
+    final TagAttribute[] attrs = tag.getAttributes().getAll();
     for (int i = 0; i < attrs.length; i++) {
       final TagAttribute attr = attrs[i];
       if (!(attr.getLocalName().equals(Attributes.CONVERTER)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
index 54f876f..97ec942 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
@@ -64,7 +64,7 @@ public final class AjaxInternalUtils {
     }
     //if (compClass != null && !(compClass.isAssignableFrom(uiComponent.getClass())))
     // why isAssignableFrom with additional getClass method call if isInstance does the same?
-    if (compClass != null && !(compClass.isInstance(uiComponent))) {
+    if (compClass != null && !compClass.isInstance(uiComponent)) {
       throw new IllegalArgumentException("uiComponent : "
           + uiComponent.getClass().getName() + " is not instance of "
           + compClass.getName() + " as it should be");
@@ -106,7 +106,7 @@ public final class AjaxInternalUtils {
   }
 
   public static List<String> getMessagesClientIds(final FacesContext facesContext) {
-     return (List<String>) facesContext.getAttributes().get(TOBAGO_MESSAGES_CLIENT_IDS);
+    return (List<String>) facesContext.getAttributes().get(TOBAGO_MESSAGES_CLIENT_IDS);
   }
 
   public static List<String> getMessagesComponentIds(final FacesContext facesContext) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
index 6932eac..13e7b69 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
@@ -20,7 +20,6 @@
 package org.apache.myfaces.tobago.internal.ajax;
 
 import org.apache.myfaces.tobago.ajax.AjaxUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -165,7 +164,7 @@ public final class AjaxNavigationState {
         try {
           final ExternalContext externalContext = facesContext.getExternalContext();
           final String url = externalContext.getRequestContextPath()
-                       + externalContext.getRequestServletPath() + externalContext.getRequestPathInfo();
+              + externalContext.getRequestServletPath() + externalContext.getRequestPathInfo();
           AjaxUtils.redirect(facesContext, url);
           facesContext.responseComplete();
         } catch (IOException e1) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java
index 740343f..4074d56 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java
@@ -27,5 +27,5 @@ import java.io.IOException;
  * !! copy of sandbox org.apache.myfaces.custom.ajax.api.AjaxRenderer !!
  */
 public interface AjaxRenderer {
-    void encodeAjax(FacesContext context, UIComponent component) throws IOException;
+  void encodeAjax(FacesContext context, UIComponent component) throws IOException;
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
index 3d7c915..d4ac64e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
@@ -74,7 +74,7 @@ public class AjaxResponseRenderer {
   }
 
   private void renderComponent(final FacesContext facesContext, final RenderKit renderKit, final String charset,
-      final String clientId, final UIComponent component)
+                               final String clientId, final UIComponent component)
       throws IOException {
     final PrintWriter writer = getPrintWriter(facesContext);
     final JsonResponseWriter jsonWriter = getJsonResponseWriter(renderKit, writer, charset);
@@ -116,7 +116,8 @@ public class AjaxResponseRenderer {
   }
 
   private static void ensureContentTypeHeader(
-      final FacesContext facesContext, String charset, final String contentType) {
+      final FacesContext facesContext, final String charsetParameter, final String contentType) {
+    String charset = charsetParameter;
     final StringBuilder sb = new StringBuilder(contentType);
     if (charset == null) {
       charset = "UTF-8";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
index 1a492c0..e039b24 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
@@ -104,11 +104,11 @@ public abstract class AbstractUIData extends javax.faces.component.UIData {
   }
 
   /**
-   * Creates the TreeDataModel which should be used.
-   * Override this method to use a custom model for an unsupported tree model.
-   * (Currently Tobago supports {@link TreeNode} out of the box.
-   * @param value The reference to the data model
-   *              (comes from the value attribute of the {@link javax.faces.component.UIData})
+   * Creates the TreeDataModel which should be used. Override this method to use a custom model for an unsupported tree
+   * model. (Currently Tobago supports {@link TreeNode} out of the box.
+   *
+   * @param value The reference to the data model (comes from the value attribute of the {@link
+   * javax.faces.component.UIData})
    * @param showRoot comes from the showRoot attribute.
    */
   protected void createTreeDataModel(final Object value, final boolean showRoot) {
@@ -133,8 +133,8 @@ public abstract class AbstractUIData extends javax.faces.component.UIData {
   public abstract SelectedState getSelectedState();
 
   /**
-   * @deprecated The name of this method is ambiguous.
-   * You may use the inverse of {@link #isRowsUnlimited()}. Deprecated since 1.5.5.
+   * @deprecated The name of this method is ambiguous. You may use the inverse of {@link #isRowsUnlimited()}. Deprecated
+   * since 1.5.5.
    */
   @Deprecated
   public boolean hasRows() {
@@ -174,10 +174,10 @@ public abstract class AbstractUIData extends javax.faces.component.UIData {
   }
 
   /**
-   * The value describes, if the UIData renderer creates container elements to hold the row information.
-   * This information is important for the TreeNodeRenderer to set the visible state in the output or not.
-   * Typically the Sheet returns true and a Tree returns false, because the sheet renders the HTML TR tags,
-   * the the sheet also is responsible for the visible state.
+   * The value describes, if the UIData renderer creates container elements to hold the row information. This
+   * information is important for the TreeNodeRenderer to set the visible state in the output or not. Typically the
+   * Sheet returns true and a Tree returns false, because the sheet renders the HTML TR tags, the the sheet also is
+   * responsible for the visible state.
    */
   public boolean isRendersRowContainer() {
     return false;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDatePicker.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDatePicker.java
index 69a6b05..202f039 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDatePicker.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDatePicker.java
@@ -32,8 +32,8 @@ import javax.faces.event.FacesEvent;
 import javax.faces.render.Renderer;
 
 /**
- * @deprecated Since 2.0.0. It's no longer needed, because this is resolved by JavaScript now.
- * Set backward compatibility mode via classic-date-time-picker.
+ * @deprecated Since 2.0.0. It's no longer needed, because this is resolved by JavaScript now. Set backward
+ * compatibility mode via classic-date-time-picker.
  */
 @Deprecated
 public abstract class AbstractUIDatePicker extends AbstractUILink implements OnComponentCreated {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFileDrop.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFileDrop.java
index a6f1b04..e0db76e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFileDrop.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFileDrop.java
@@ -19,11 +19,10 @@
 
 package org.apache.myfaces.tobago.internal.component;
 
+import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
-
 import javax.faces.component.ActionSource2;
 import javax.faces.event.ActionListener;
 
@@ -53,6 +52,7 @@ public abstract class AbstractUIFileDrop extends AbstractUIFile implements Suppo
   enum PropertyKeys {height}
 
   public abstract String getDropZoneId();
+
   public abstract String getVisibleType();
 
   public void addActionListener(ActionListener listener) {
@@ -64,7 +64,7 @@ public abstract class AbstractUIFileDrop extends AbstractUIFile implements Suppo
   }
 
   public ActionListener[] getActionListeners() {
-    return (ActionListener[]) ((ActionListener[]) this.getFacesListeners(ActionListener.class));
+    return (ActionListener[]) this.getFacesListeners(ActionListener.class);
   }
 
   // not a file drop attribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
index 5da45a2..39b4ad5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
@@ -37,7 +37,7 @@ public abstract class AbstractUIFlowLayout extends AbstractUILayoutBase implemen
   }
 
   public void mainProcessing(final Orientation orientation) {
-    
+
   }
 
   public void postProcessing(final Orientation orientation) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
index 11d03a2..78013c8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
@@ -166,7 +166,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
           }
 
           if (token instanceof AutoLayoutToken || token instanceof RelativeLayoutToken) {
-            if ((component.isRendered() || isRigid())) {
+            if (component.isRendered() || isRigid()) {
               if (origin.getSpan(orientation) == 1) {
                 intervalList.add(new Interval(component, orientation));
               } else {
@@ -190,7 +190,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
           } else {
             heads[i].setCurrent(Measure.valueOf(100));
             LOG.warn("Found an 'auto' token in {} definition, but there is no component inside with span = 1! "
-                + "So the value for 'auto' can't be evaluated (clientId={}). Using 100px.",
+                    + "So the value for 'auto' can't be evaluated (clientId={}). Using 100px.",
                 orientation == Orientation.HORIZONTAL ? "columns" : "rows",
                 getClientId(getFacesContext()));
           }
@@ -416,8 +416,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
   }
 
   /**
-   * Compute the sum of the space between the cells.
-   * There is one "space" less than cells that are not void.
+   * Compute the sum of the space between the cells. There is one "space" less than cells that are not void.
    */
   private Measure computeSpacing(final Orientation orientation, final int startIndex, final int length) {
 
@@ -425,7 +424,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
 
     int count = 0;
     for (int i = startIndex; i < startIndex + length; i++) {
-      if ((heads[i].isRendered())
+      if (heads[i].isRendered()
           && (heads[i].getCurrent() == null || heads[i].getCurrent().greaterThan(Measure.ZERO))) {
         count++;
       }
@@ -445,6 +444,9 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
 
   public abstract void setColumns(String columns);
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public abstract Measure getCellspacing();
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
index 41acf4c..fa7c5bb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
@@ -56,7 +56,7 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
 
   private List<Item> collectMessageList(final FacesContext facesContext, final Iterator clientIds) {
     final List<Item> messages = new ArrayList<Item>();
-    while(clientIds.hasNext()) {
+    while (clientIds.hasNext()) {
       final String clientId = (String) clientIds.next();
       final Iterator<FacesMessage> i = facesContext.getMessages(clientId);
       while (i.hasNext()) {
@@ -121,7 +121,7 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
   public abstract String getFor();
 */
 
-  public static enum OrderBy {
+  public enum OrderBy {
 
     OCCURRENCE,
     SEVERITY;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
index 2c8a8e5..0d61780 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
@@ -160,14 +160,13 @@ public abstract class AbstractUIPage extends AbstractUIForm
   }
 
   private void decodeActionComponent(
-      final FacesContext facesContext, final AbstractUIPage page, final Map<String,
-      UIComponent> ajaxComponents) {
-    final String actionId = page.getActionId();
+      final FacesContext facesContext, final AbstractUIPage page, final Map<String, UIComponent> ajaxComponents) {
+    final String id = page.getActionId();
     UIComponent actionComponent = null;
-    if (actionId != null) {
-      actionComponent = findComponent(actionId);
+    if (id != null) {
+      actionComponent = findComponent(id);
       if (actionComponent == null && FacesVersion.supports20() && FacesVersion.isMyfaces()) {
-        final String bugActionId = actionId.replaceAll(":\\d+:", ":");
+        final String bugActionId = id.replaceAll(":\\d+:", ":");
         try {
           actionComponent = findComponent(bugActionId);
           //LOG.info("command = \"" + actionComponent + "\"", new Exception());
@@ -188,7 +187,7 @@ public abstract class AbstractUIPage extends AbstractUIForm
         component = component.getParent();
       }
     }
-    invokeOnComponent(facesContext, actionId, APPLY_REQUEST_VALUES_CALLBACK);
+    invokeOnComponent(facesContext, id, APPLY_REQUEST_VALUES_CALLBACK);
   }
 
 
@@ -322,6 +321,7 @@ public abstract class AbstractUIPage extends AbstractUIForm
   /**
    * @deprecated since 1.5.7 and 2.0.0
    */
+  @Deprecated
   public String getDefaultActionId() {
     Deprecation.LOG.error("The default action handling has been changed!");
     return null;
@@ -330,6 +330,7 @@ public abstract class AbstractUIPage extends AbstractUIForm
   /**
    * @deprecated since 1.5.7 and 2.0.0
    */
+  @Deprecated
   public void setDefaultActionId(final String defaultActionId) {
     Deprecation.LOG.error("The default action handling has been changed!");
   }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
index 11341aa..15a9224 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
@@ -196,7 +196,7 @@ public abstract class AbstractUIPopup extends AbstractUIPanelBase
   public boolean isLayoutChildren() {
     return isRendered();
   }
-  
+
   public abstract Measure getWidth();
 
   public abstract void setWidth(Measure width);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
index 95511fd..864e424 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
@@ -36,7 +36,7 @@ public abstract class AbstractUISelectBooleanCheckbox extends UISelectBoolean
       value = getValue();
     }
     if (value instanceof Boolean) {
-      return ((Boolean) value);
+      return (Boolean) value;
     } else {
       return value != null && Boolean.valueOf(value.toString());
     }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
index d6f9757..0fcbaef 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
@@ -26,6 +26,6 @@ public abstract class AbstractUISelectManyShuttle extends AbstractUISelectMany {
   public abstract String getUnselectedLabel();
 
   public boolean hasLabel() {
-     return getSelectedLabel() != null || getUnselectedLabel() != null;
+    return getSelectedLabel() != null || getUnselectedLabel() != null;
   }
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
index 921a70d..1a79779 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
@@ -33,7 +33,7 @@ public abstract class AbstractUISelectOneBase extends javax.faces.component.UISe
   public static final String MESSAGE_VALUE_REQUIRED = "tobago.SelectOne.MESSAGE_VALUE_REQUIRED";
 
   public void validate(final FacesContext facesContext) {
-    if (isRequired()  && !isReadonly()) {
+    if (isRequired() && !isReadonly()) {
       final Object submittedValue = getSubmittedValue();
       if (submittedValue == null || "".equals(submittedValue)) {
         if (getRequiredMessage() != null) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
index 9a2291d..17f6967 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
@@ -76,13 +76,15 @@ public abstract class AbstractUISheet extends AbstractUIData
 
   /**
    * @see org.apache.myfaces.tobago.component.Facets
-   * @deprecated Please use Facets instead. Will be removed after Tobago 1.5.0 */
+   * @deprecated Please use Facets instead. Will be removed after Tobago 1.5.0
+   */
   @Deprecated
   public static final String FACET_SORTER = "sorter";
   public static final String SORTER_ID = "sorter";
   /**
    * @see org.apache.myfaces.tobago.component.Attributes
-   * @deprecated Please use Attributes instead. Will be removed after Tobago 1.5.0 */
+   * @deprecated Please use Attributes instead. Will be removed after Tobago 1.5.0
+   */
   @Deprecated
   public static final String ATTR_SCROLL_POSITION = "attrScrollPosition";
 
@@ -106,8 +108,8 @@ public abstract class AbstractUISheet extends AbstractUIData
 
   @Override
   public void encodeBegin(final FacesContext facesContext) throws IOException {
-    final SheetState state = getSheetState(facesContext);
-    final int first = state.getFirst();
+    final SheetState sheetState = getSheetState(facesContext);
+    final int first = sheetState.getFirst();
     if (first > -1 && (!hasRowCount() || first < getRowCount())) {
       final ValueExpression expression = getValueExpression(Attributes.FIRST);
       if (expression != null) {
@@ -161,21 +163,21 @@ public abstract class AbstractUISheet extends AbstractUIData
   }
 
   /**
-   * Remove the (by user) resized column widths. An application may provide a button to access it.
-   * Since 1.0.26.
+   * Remove the (by user) resized column widths. An application may provide a button to access it. Since 1.0.26.
    */
   public void resetColumnWidths() {
-    final SheetState state = getState();
-    if (state != null) {
-      state.setColumnWidths(null);
+    final SheetState sheetState = getState();
+    if (sheetState != null) {
+      sheetState.setColumnWidths(null);
     }
     getAttributes().remove(Attributes.WIDTH_LIST_STRING);
   }
 
   /**
-   * @deprecated The name of this method is ambiguous.
-   * You may use {@link #getLastRowIndexOfCurrentPage()}. Deprecated since 1.5.5.
+   * @deprecated The name of this method is ambiguous. You may use {@link #getLastRowIndexOfCurrentPage()}. Deprecated
+   * since 1.5.5.
    */
+  @Deprecated
   public int getLast() {
     final int last = getFirst() + getRows();
     return last < getRowCount() ? last : getRowCount();
@@ -183,8 +185,9 @@ public abstract class AbstractUISheet extends AbstractUIData
 
   /**
    * The rowIndex of the last row on the current page plus one (because of zero based iterating).
-   * @throws IllegalArgumentException If the number of rows in the model returned
-   * by {@link #getRowCount()} is -1 (undefined).
+   *
+   * @throws IllegalArgumentException If the number of rows in the model returned by {@link #getRowCount()} is -1
+   * (undefined).
    */
   public int getLastRowIndexOfCurrentPage() {
     if (!hasRowCount()) {
@@ -211,10 +214,10 @@ public abstract class AbstractUISheet extends AbstractUIData
     if (hasRowCount() && first >= getRowCount()) {
       return getPages() - 1; // last page
     } else {
-      return (first / rows);
+      return first / rows;
     }
   }
-  
+
   /**
    * @return returns the current page (based by 1).
    * @deprecated Please use {@link #getCurrentPage()} which returns the value zero-based. Deprecated since 1.5.5.
@@ -226,8 +229,9 @@ public abstract class AbstractUISheet extends AbstractUIData
 
   /**
    * The number of pages to render.
-   * @throws IllegalArgumentException If the number of rows in the model returned
-   * by {@link #getRowCount()} is -1 (undefined).
+   *
+   * @throws IllegalArgumentException If the number of rows in the model returned by {@link #getRowCount()} is -1
+   * (undefined).
    */
   public int getPages() {
     if (isRowsUnlimited()) {
@@ -265,8 +269,8 @@ public abstract class AbstractUISheet extends AbstractUIData
   }
 
   /**
-   * @return Should the paging controls be rendered? Either because of the need of paging or because
-   * the show is enforced by {@link #isShowPagingAlways()}
+   * @return Should the paging controls be rendered? Either because of the need of paging or because the show is
+   * enforced by {@link #isShowPagingAlways()}
    */
   public boolean isPagingVisible() {
     return isShowPagingAlways() || needMoreThanOnePage();
@@ -300,8 +304,8 @@ public abstract class AbstractUISheet extends AbstractUIData
   }
 
   /**
-   * @deprecated The name of this method is ambiguous.
-   * You may use {@link #getFirstRowIndexOfLastPage()}. Deprecated since 1.5.5.
+   * @deprecated The name of this method is ambiguous. You may use {@link #getFirstRowIndexOfLastPage()}. Deprecated
+   * since 1.5.5.
    */
   @Deprecated
   public int getLastPageIndex() {
@@ -313,11 +317,12 @@ public abstract class AbstractUISheet extends AbstractUIData
   }
 
   /**
-   * Determines the beginning of the last page in the model.
-   * If the number of rows to display on one page is unlimited, the value is 0 (there is only one page).
+   * Determines the beginning of the last page in the model. If the number of rows to display on one page is unlimited,
+   * the value is 0 (there is only one page).
+   *
    * @return The index of the first row of the last paging page.
-   * @throws IllegalArgumentException If the number of rows in the model returned
-   * by {@link #getRowCount()} is -1 (undefined).
+   * @throws IllegalArgumentException If the number of rows in the model returned by {@link #getRowCount()} is -1
+   * (undefined).
    */
   public int getFirstRowIndexOfLastPage() {
     if (isRowsUnlimited()) {
@@ -340,8 +345,8 @@ public abstract class AbstractUISheet extends AbstractUIData
   }
 
   private void updateSheetState(final FacesContext facesContext) {
-    final SheetState state = getSheetState(facesContext);
-    if (state != null) {
+    final SheetState sheetState = getSheetState(facesContext);
+    if (sheetState != null) {
       // ensure sortActionListener
 //      getSortActionListener();
 //      state.setSortedColumn(sortActionListener != null ? sortActionListener.getColumn() : -1);
@@ -349,9 +354,9 @@ public abstract class AbstractUISheet extends AbstractUIData
       final Map attributes = getAttributes();
       //noinspection unchecked
       final List<Integer> list = (List<Integer>) attributes.get(Attributes.SELECTED_LIST_STRING);
-      state.setSelectedRows(list != null ? list : Collections.<Integer>emptyList());
-      state.setColumnWidths((String) attributes.get(Attributes.WIDTH_LIST_STRING));
-      state.setScrollPosition((Integer[]) attributes.get(Attributes.SCROLL_POSITION));
+      sheetState.setSelectedRows(list != null ? list : Collections.<Integer>emptyList());
+      sheetState.setColumnWidths((String) attributes.get(Attributes.WIDTH_LIST_STRING));
+      sheetState.setScrollPosition((Integer[]) attributes.get(Attributes.SCROLL_POSITION));
       attributes.remove(Attributes.SELECTED_LIST_STRING);
       attributes.remove(Attributes.SCROLL_POSITION);
     }
@@ -390,7 +395,7 @@ public abstract class AbstractUISheet extends AbstractUIData
       if (all || child.isRendered()) {
         if (child instanceof AbstractUIColumn) {
           result.add((AbstractUIColumn) child);
-        } else if (child instanceof AbstractUIData){
+        } else if (child instanceof AbstractUIData) {
           // ignore nested sheets
         } else {
           findColumns(child, result, all);
@@ -459,7 +464,8 @@ public abstract class AbstractUISheet extends AbstractUIData
     }
   }
 
-  protected void sort(FacesContext facesContext, SortActionEvent event) {
+  protected void sort(final FacesContext facesContext, final SortActionEvent eventParameter) {
+    SortActionEvent event = eventParameter;
     final SheetState sheetState = getSheetState(getFacesContext());
     if (sheetState.isToBeSorted()) {
       final MethodExpression expression = getSortActionListenerExpression();
@@ -501,7 +507,6 @@ public abstract class AbstractUISheet extends AbstractUIData
   }
 
 
-
   public Integer[] getScrollPosition() {
     Integer[] scrollPosition = (Integer[]) getAttributes().get(Attributes.SCROLL_POSITION);
     if (scrollPosition == null) {
@@ -516,7 +521,8 @@ public abstract class AbstractUISheet extends AbstractUIData
     return super.findComponent(stripRowIndex(searchId));
   }
 
-  public String stripRowIndex(String searchId) {
+  public String stripRowIndex(final String searchIdParameter) {
+    String searchId = searchIdParameter;
     if (searchId.length() > 0 && Character.isDigit(searchId.charAt(0))) {
       for (int i = 1; i < searchId.length(); ++i) {
         final char c = searchId.charAt(i);
@@ -542,7 +548,7 @@ public abstract class AbstractUISheet extends AbstractUIData
 
     Integer[] scrollPosition = getScrollPosition();
     if (scrollPosition == null) {
-      scrollPosition = new Integer[] {0, 0};
+      scrollPosition = new Integer[]{0, 0};
     }
     scrollPosition[1] = 0;
     switch (pageEvent.getAction()) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
index 9153f1f..034b378 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
@@ -50,7 +50,7 @@ import java.util.Map;
 
 /**
  * XXX: Not completely implemented yet.
- */ 
+ */
 public abstract class AbstractUISheetLayout extends AbstractUILayoutBase implements LayoutManager {
 
   private static final Logger LOG = LoggerFactory.getLogger(AbstractUISheetLayout.class);
@@ -118,7 +118,7 @@ public abstract class AbstractUISheetLayout extends AbstractUILayoutBase impleme
   public void mainProcessing(final Orientation orientation) {
 
     // find *
-    if (orientation == Orientation.HORIZONTAL && !horizontalAuto 
+    if (orientation == Orientation.HORIZONTAL && !horizontalAuto
         || orientation == Orientation.VERTICAL && !verticalAuto) {
 
       final FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -204,7 +204,7 @@ public abstract class AbstractUISheetLayout extends AbstractUILayoutBase impleme
 
   private LayoutContainer getLayoutContainer() {
     // todo: check with instanceof and do something in the error case
-    return ((LayoutContainer) getParent());
+    return (LayoutContainer) getParent();
   }
 
   @Override
@@ -420,7 +420,7 @@ public abstract class AbstractUISheetLayout extends AbstractUILayoutBase impleme
     rows.addToken(AutoLayoutToken.INSTANCE);
     final Grid grid = new Grid(columns, rows);
 
-    for(final UIComponent child : header.getChildren()) {
+    for (final UIComponent child : header.getChildren()) {
       if (child instanceof LayoutComponent) {
         if (child.isRendered()) {
           final LayoutComponent c = (LayoutComponent) child;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
index 1889c89..4548f31 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
@@ -65,7 +65,9 @@ public abstract class AbstractUISplitLayout extends AbstractUIGridLayout {
   }
 
   // TODO: MathUtils
-  public static int gcd(int a, int b) {
+  public static int gcd(final int aParameter, final int bParameter) {
+    int a = aParameter;
+    int b = bParameter;
     if (a < 0) {
       a = -a;
     }
@@ -102,7 +104,7 @@ public abstract class AbstractUISplitLayout extends AbstractUIGridLayout {
     return orientation == Orientation.HORIZONTAL ? getColumnSpacing() : getRowSpacing();
   }
 
-@Override
+  @Override
   public void setColumns(final String columns) {
   }
 
@@ -142,6 +144,9 @@ public abstract class AbstractUISplitLayout extends AbstractUIGridLayout {
 
   public abstract String getOrientation();
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public abstract Measure getCellspacing();
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
index f5423eb..8dc8c23 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
@@ -255,7 +255,7 @@ public abstract class AbstractUITabGroup extends AbstractUIPanelBase
 
   public boolean isSwitchTypeClient() {
     final String switchType = getSwitchType();
-    return (switchType == null || switchType.equals(SWITCH_TYPE_CLIENT));
+    return switchType == null || switchType.equals(SWITCH_TYPE_CLIENT);
   }
 
   public void removeTabChangeListener(final TabChangeListener listener) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
index f895a4a..5ba52c1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
@@ -127,7 +127,7 @@ public abstract class AbstractUITabGroupLayout extends AbstractUILayoutBase impl
 
   private LayoutContainer getLayoutContainer() {
     // todo: check with instanceof and do something in the error case
-    return ((LayoutContainer) getParent());
+    return (LayoutContainer) getParent();
   }
 
   @Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
index a8fde78..38eb451 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
@@ -210,12 +210,12 @@ public abstract class AbstractUITree extends AbstractUIData
     final ValueExpression expression = getValueExpression(Attributes.STATE);
 
     if (expression != null) {
-      TreeState state = (TreeState) expression.getValue(elContext);
-      if (state == null) {
-        state = new TreeState(new ExpandedState(2), new SelectedState());
-        expression.setValue(elContext, state);
+      TreeState treeState = (TreeState) expression.getValue(elContext);
+      if (treeState == null) {
+        treeState = new TreeState(new ExpandedState(2), new SelectedState());
+        expression.setValue(elContext, treeState);
       }
-      return state;
+      return treeState;
     }
 
     state = new TreeState(new ExpandedState(2), new SelectedState());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
index fe53c60..51c6589 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
@@ -49,8 +49,8 @@ public abstract class AbstractUITreeNode
   }
 
   /**
-   * Returns the level of the tree node inside of the virtual tree. The root node has level 0.
-   * The children of the root note have level 1, and so on.
+   * Returns the level of the tree node inside of the virtual tree. The root node has level 0. The children of the root
+   * note have level 1, and so on.
    */
   public int getLevel() {
     final TreeDataModel model = ComponentUtils.findAncestor(this, AbstractUIData.class).getTreeDataModel();
@@ -178,18 +178,18 @@ public abstract class AbstractUITreeNode
    * @deprecated since 2.0.0
    */
   @Deprecated
-  public MethodBinding getTreeExpansionListener(){
-      Deprecation.LOG.error("treeExpansionListener!");
-      return null;
-    }
+  public MethodBinding getTreeExpansionListener() {
+    Deprecation.LOG.error("treeExpansionListener!");
+    return null;
+  }
 
   /**
    * @deprecated since 2.0.0
    */
   @Deprecated
-  public void setTreeExpansionListener(final MethodBinding treeExpansionListener){
-        Deprecation.LOG.error("treeExpansionListener!");
-      }
+  public void setTreeExpansionListener(final MethodBinding treeExpansionListener) {
+    Deprecation.LOG.error("treeExpansionListener!");
+  }
 
   /**
    * @deprecated since 2.0.0
@@ -220,18 +220,18 @@ public abstract class AbstractUITreeNode
    * @deprecated since 2.0.0
    */
   @Deprecated
-  public  MethodBinding getTreeMarkedListener(){
-        Deprecation.LOG.error("treeMarkedListener!");
-        return null;
-      }
+  public MethodBinding getTreeMarkedListener() {
+    Deprecation.LOG.error("treeMarkedListener!");
+    return null;
+  }
 
   /**
    * @deprecated since 2.0.0
    */
   @Deprecated
-  public  void setTreeMarkedListener(final MethodBinding treeMarkedListener){
-          Deprecation.LOG.error("treeMarkedListener!");
-        }
+  public void setTreeMarkedListener(final MethodBinding treeMarkedListener) {
+    Deprecation.LOG.error("treeMarkedListener!");
+  }
 
   /**
    * @deprecated since 2.0.0
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
index 4eecf43..7ed61d8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
@@ -34,8 +34,9 @@ public abstract class AbstractUITreeSelect extends UISelectBoolean implements Co
   }
 
   /**
-   * The value is stored in the state of the parent UITree, if the value attribute has not a value expression.
-   * The value is stored normally, if there is a value expression.
+   * The value is stored in the state of the parent UITree, if the value attribute has not a value expression. The value
+   * is stored normally, if there is a value expression.
+   *
    * @return Is the value stored in the state of the UITree parent object?
    */
   public boolean isValueStoredInState() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
index 6c2df90..9200cb5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
@@ -63,14 +63,14 @@ public class ContentSecurityPolicy {
     return mode;
   }
 
-  public static enum Mode {
+  public enum Mode {
     ON("on"),
     OFF("off"),
     REPORT_ONLY("report-only");
 
     private final String value;
 
-    private Mode(final String value) {
+    Mode(final String value) {
       this.value = value;
     }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java
index 2212c2e..dbb13fd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java
@@ -65,7 +65,7 @@ public class RendererConfig implements Serializable {
   }
 
   public void merge(final RendererConfig rendererConfig) {
-     supportedMarkups = supportedMarkups.add(rendererConfig.supportedMarkups);
+    supportedMarkups = supportedMarkups.add(rendererConfig.supportedMarkups);
   }
 
   public String toString() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
index 9f14c3b..1b8fbb6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
@@ -35,6 +35,9 @@ public class TobagoConfigEntityResolver extends DefaultHandler {
   private static final String TOBAGO_CONFIG_DTD_1_0_30 = "/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd";
   private static final String TOBAGO_CONFIG_DTD_1_0_34 = "/org/apache/myfaces/tobago/config/tobago-config-1.0.34.dtd";
   protected static final String TOBAGO_CONFIG_XSD_1_5 = "/org/apache/myfaces/tobago/config/tobago-config-1.5.xsd";
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   protected static final String TOBAGO_CONFIG_XSD_1_6 = "/org/apache/myfaces/tobago/config/tobago-config-1.6.xsd";
   protected static final String TOBAGO_CONFIG_XSD_2_0 = "/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
index a50b417..26098eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
@@ -64,8 +64,8 @@ public class TobagoConfigFragment {
     mimeTypes = new HashMap<String, String>();
   }
 
-  public void addSupportedThemeName(final String name) {
-    supportedThemeNames.add(name);
+  public void addSupportedThemeName(final String nameParameter) {
+    supportedThemeNames.add(nameParameter);
   }
 
   public List<String> getSupportedThemeNames() {
@@ -113,16 +113,16 @@ public class TobagoConfigFragment {
     return before;
   }
 
-  public void addBefore(final String name) {
-    before.add(name);
+  public void addBefore(final String nameParameter) {
+    before.add(nameParameter);
   }
 
   public List<String> getAfter() {
     return after;
   }
 
-  public void addAfter(final String name) {
-    after.add(name);
+  public void addAfter(final String nameParameter) {
+    after.add(nameParameter);
   }
 
   public void addThemeDefinition(final ThemeImpl theme) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMerger.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMerger.java
index 4070aea..f1adeca 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMerger.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMerger.java
@@ -37,7 +37,7 @@ public class TobagoConfigMerger {
   private final List<TobagoConfigFragment> list;
 
   public TobagoConfigMerger(final List<TobagoConfigFragment> list) {
-    this.list =    list;
+    this.list = list;
   }
 
   public TobagoConfigImpl merge() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
index 89e77fa..d58d620 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
@@ -32,7 +32,9 @@ import java.net.URL;
 
 public class TobagoConfigVersion extends TobagoConfigEntityResolver {
 
-  /** Schema or DTD? */
+  /**
+   * Schema or DTD?
+   */
   private boolean schema;
 
   private String version;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java
index 4b7cc18..582b45e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java
@@ -32,7 +32,7 @@ import java.util.Map;
 public final class ClientPropertiesKey implements Serializable {
 
   private static final String KEY_IN_FACES_CONTEXT = ClientPropertiesKey.class.getName();
-  
+
   private final String contentType;
   private final Theme theme;
   private final UserAgent userAgent;
@@ -55,7 +55,7 @@ public final class ClientPropertiesKey implements Serializable {
     final Map<Object, Object> attributes = facesContext.getAttributes();
     attributes.remove(KEY_IN_FACES_CONTEXT);
   }
-  
+
   private ClientPropertiesKey(final ClientProperties clientProperties, final UIViewRoot viewRoot) {
     contentType = clientProperties.getContentType();
     theme = clientProperties.getTheme();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java
index 019c51e..759fd5f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java
@@ -58,7 +58,7 @@ public final class MeasureValue {
 
   @Override
   public int hashCode() {
-    return (value != null ? value.hashCode() : 0);
+    return value != null ? value.hashCode() : 0;
   }
 
   @Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
index d07f74c..feefda1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
@@ -45,8 +45,7 @@ import java.util.zip.ZipInputStream;
 
 /**
  * <p>
- * This class helps to locate all resources of the ResourceManager.
- * It will be called in the initialization phase.
+ * This class helps to locate all resources of the ResourceManager. It will be called in the initialization phase.
  * </p>
  * <p>
  * Basically it looks at the following places:
@@ -71,7 +70,7 @@ class ResourceLocator {
   private ResourceManagerImpl resourceManager;
   private ThemeBuilder themeBuilder;
 
-  public ResourceLocator(
+  ResourceLocator(
       final ServletContext servletContext, final ResourceManagerImpl resourceManager, final ThemeBuilder themeBuilder) {
     this.servletContext = servletContext;
     this.resourceManager = resourceManager;
@@ -87,9 +86,9 @@ class ResourceLocator {
   }
 
   private void locateResourcesInWar(
-      final ServletContext servletContext, final ResourceManagerImpl resources, String path)
+      final ServletContext servletContextParameter, final ResourceManagerImpl resources, final String pathParameter)
       throws ServletException {
-
+    String path = pathParameter;
     if (path.startsWith("/WEB-INF/")) {
       return; // ignore
     }
@@ -97,7 +96,7 @@ class ResourceLocator {
     if (path.endsWith("/") && path.length() > 1) {
       path = path.substring(0, path.length() - 1);
     }
-    final Set<String> resourcePaths = servletContext.getResourcePaths(path);
+    final Set<String> resourcePaths = servletContextParameter.getResourcePaths(path);
     if (resourcePaths == null || resourcePaths.isEmpty()) {
       if (LOG.isDebugEnabled()) {
         LOG.debug("Skipping empty resource path: path='{}'", path);
@@ -111,19 +110,19 @@ class ResourceLocator {
           if (LOG.isDebugEnabled()) {
             LOG.debug("childPath dir {}", childPath);
           }
-          locateResourcesInWar(servletContext, resources, childPath);
+          locateResourcesInWar(servletContextParameter, resources, childPath);
         }
       } else {
         //Log.debug("add resc " + childPath);
         if (childPath.endsWith(".properties")) {
-          final InputStream inputStream = servletContext.getResourceAsStream(childPath);
+          final InputStream inputStream = servletContextParameter.getResourceAsStream(childPath);
           try {
             addProperties(inputStream, resources, childPath, false, 0);
           } finally {
             IoUtils.closeQuietly(inputStream);
           }
         } else if (childPath.endsWith(".properties.xml")) {
-          final InputStream inputStream = servletContext.getResourceAsStream(childPath);
+          final InputStream inputStream = servletContextParameter.getResourceAsStream(childPath);
           try {
             addProperties(inputStream, resources, childPath, true, 0);
           } catch (final RuntimeException e) {
@@ -174,8 +173,8 @@ class ResourceLocator {
   }
 
   /**
-   * Searches the /WEB-INF/lib directory for *.jar files which contains /META-INF/resources directory
-   * to hold resources and add them to the ResourceManager.
+   * Searches the /WEB-INF/lib directory for *.jar files which contains /META-INF/resources directory to hold resources
+   * and add them to the ResourceManager.
    *
    * @param resources Resource Manager which collects all the resources.
    * @throws ServletException An error while accessing the resource.
@@ -232,8 +231,6 @@ class ResourceLocator {
     LOG.info("resourceIndex='" + resourceIndex + "'");
 
 
-
-
     final URL resource = findMatchingResourceIndexUrl(themeUrl);
 
 
@@ -246,8 +243,8 @@ class ResourceLocator {
   }
 
   /**
-   * Find a matching tobago-resource-index.txt to the given tobago-config.xml
-   * We look here all possible URL from ClassLoader, because an AppServer may protect direct access...
+   * Find a matching tobago-resource-index.txt to the given tobago-config.xml We look here all possible URL from
+   * ClassLoader, because an AppServer may protect direct access...
    */
   private URL findMatchingResourceIndexUrl(final URL themeUrl) throws IOException {
     final String themeProtocol = themeUrl.getProtocol();
@@ -278,10 +275,11 @@ class ResourceLocator {
   }
 
   private void addResourcesFromZip(
-      final ResourceManagerImpl resources, String fileName, final String protocol,
+      final ResourceManagerImpl resources, final String fileNameParameter, final String protocol,
       final String prefix, final int skipPrefix)
       throws ServletException, IOException {
 
+    String fileName = fileNameParameter;
     final int exclamationPoint = fileName.indexOf("!");
     if (exclamationPoint != -1) {
       fileName = fileName.substring(0, exclamationPoint);
@@ -366,7 +364,8 @@ class ResourceLocator {
     }
   }
 
-  private String ensureSlash(String resourcePath) {
+  private String ensureSlash(final String resourcePathParameter) {
+    String resourcePath = resourcePathParameter;
     if (!resourcePath.startsWith("/")) {
       resourcePath = '/' + resourcePath;
     }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
index 252c806..4aaa84f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
@@ -57,27 +57,27 @@ public class ResourceManagerImpl implements ResourceManager {
   public static final String[] EXT_JPG = new String[]{".jpg"};
   public static final String[] EXT_ICO = new String[]{".ico"};
   public static final String[] EXT_IMAGES = new String[]{".svg", ".png", ".gif", ".jpg"};
-  public static final String[] EXT_JSP= new String[]{".jsp"};
-  public static final String[] EXT_JSPX= new String[]{".jspx"};
-  public static final String[] EXT_XHTML= new String[]{".xhtml"};
-  public static final String[] EXT_SVG= new String[]{".svg"};
+  public static final String[] EXT_JSP = new String[]{".jsp"};
+  public static final String[] EXT_JSPX = new String[]{".jspx"};
+  public static final String[] EXT_XHTML = new String[]{".xhtml"};
+  public static final String[] EXT_SVG = new String[]{".svg"};
 
   private boolean production;
 
-  private final Map<String, String> resourceList 
+  private final Map<String, String> resourceList
       = new ConcurrentHashMap<String, String>(100, 0.75f, 1);
 
-  private final Map<RendererCacheKey, Renderer> rendererCache 
+  private final Map<RendererCacheKey, Renderer> rendererCache
       = new ConcurrentHashMap<RendererCacheKey, Renderer>(100, 0.75f, 1);
-  private final Map<ImageCacheKey, StringValue> imageCache 
+  private final Map<ImageCacheKey, StringValue> imageCache
       = new ConcurrentHashMap<ImageCacheKey, StringValue>(100, 0.75f, 1);
-  private final Map<JspCacheKey, String> jspCache 
+  private final Map<JspCacheKey, String> jspCache
       = new ConcurrentHashMap<JspCacheKey, String>(100, 0.75f, 1);
-  private final Map<MiscCacheKey, String[]> miscCache 
+  private final Map<MiscCacheKey, String[]> miscCache
       = new ConcurrentHashMap<MiscCacheKey, String[]>(100, 0.75f, 1);
-  private final Map<PropertyCacheKey, StringValue> propertyCache 
+  private final Map<PropertyCacheKey, StringValue> propertyCache
       = new ConcurrentHashMap<PropertyCacheKey, StringValue>(100, 0.75f, 1);
-  private final Map<ThemeConfigCacheKey, MeasureValue> themeCache 
+  private final Map<ThemeConfigCacheKey, MeasureValue> themeCache
       = new ConcurrentHashMap<ThemeConfigCacheKey, MeasureValue>(100, 0.75f, 1);
   private final Map<String, String[]> extensionCache
       = new ConcurrentHashMap<String, String[]>(10, 0.75f, 1);
@@ -115,6 +115,9 @@ public class ResourceManagerImpl implements ResourceManager {
     resourceList.put(resourceKey, value);
   }
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public String getJsp(final UIViewRoot viewRoot, final String name) {
     String result = null;
@@ -128,7 +131,7 @@ public class ResourceManagerImpl implements ResourceManager {
         return result;
       }
       try {
-        result = (String) getPaths(clientKey, "",
+        result = (String) getPaths(clientKey,
             JSP, name, EXT_NONE, false, true, true, null, true, false).get(0);
         jspCache.put(cacheKey, result);
       } catch (final Exception e) {
@@ -138,6 +141,11 @@ public class ResourceManagerImpl implements ResourceManager {
     return result;
   }
 
+  /**
+   * {@inheritDoc}
+   *
+   * @deprecated by API
+   */
   @Deprecated
   public String getProperty(final UIViewRoot viewRoot, final String bundle, final String propertyKey) {
     return getProperty(FacesContext.getCurrentInstance(), bundle, propertyKey);
@@ -148,11 +156,11 @@ public class ResourceManagerImpl implements ResourceManager {
     if (bundle != null && propertyKey != null) {
       final ClientPropertiesKey clientKey = ClientPropertiesKey.get(facesContext);
       final PropertyCacheKey cacheKey = new PropertyCacheKey(clientKey, bundle, propertyKey);
-      
+
       StringValue result = propertyCache.get(cacheKey);
       if (result == null) {
         final List properties
-            = getPaths(clientKey, "", PROPERTY, bundle, EXT_NONE, false, true, false, propertyKey, true, false);
+            = getPaths(clientKey, PROPERTY, bundle, EXT_NONE, false, true, false, propertyKey, true, false);
         if (properties != null) {
           result = new StringValue((String) properties.get(0));
         } else {
@@ -165,6 +173,11 @@ public class ResourceManagerImpl implements ResourceManager {
     return null;
   }
 
+  /**
+   * {@inheritDoc}
+   *
+   * @deprecated by API
+   */
   @Deprecated
   public Renderer getRenderer(final UIViewRoot viewRoot, final String rendererType) {
     return getRenderer(FacesContext.getCurrentInstance(), rendererType);
@@ -185,7 +198,7 @@ public class ResourceManagerImpl implements ResourceManager {
       try {
         simpleClassName = getRendererClassName(rendererType);
         final List<Class> classes
-            = getPaths(clientKey, "", TAG, simpleClassName, EXT_NONE, false, true, true, null, false, false);
+            = getPaths(clientKey, TAG, simpleClassName, EXT_NONE, false, true, true, null, false, false);
         if (classes != null && !classes.isEmpty()) {
           final Class clazz = classes.get(0);
           renderer = (Renderer) clazz.newInstance();
@@ -201,16 +214,22 @@ public class ResourceManagerImpl implements ResourceManager {
     }
     return renderer;
   }
-  
+
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public String[] getScripts(final UIViewRoot viewRoot, final String name) {
     return getScripts(FacesContext.getCurrentInstance(), name);
   }
-  
+
   public String[] getScripts(final FacesContext facesContext, final String name) {
     return getStrings(facesContext, name, null);
   }
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public String[] getStyles(final UIViewRoot viewRoot, final String name) {
     return getStyles(FacesContext.getCurrentInstance(), name);
@@ -220,6 +239,9 @@ public class ResourceManagerImpl implements ResourceManager {
     return getStrings(facesContext, name, null);
   }
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public String getThemeProperty(final UIViewRoot viewRoot, final String bundle, final String propertyKey) {
     if (bundle != null && propertyKey != null) {
@@ -230,7 +252,7 @@ public class ResourceManagerImpl implements ResourceManager {
       StringValue result = propertyCache.get(cacheKey);
       if (result == null) {
         final List properties
-            = getPaths(clientKey, "", PROPERTY, bundle, EXT_NONE, false, true, false, propertyKey, true, true);
+            = getPaths(clientKey, PROPERTY, bundle, EXT_NONE, false, true, false, propertyKey, true, true);
         if (properties != null) {
           result = new StringValue((String) properties.get(0));
         } else {
@@ -256,7 +278,7 @@ public class ResourceManagerImpl implements ResourceManager {
     MeasureValue result = themeCache.get(cacheKey);
 
     if (result == null) {
-      final List properties = getPaths(clientKey, "", PROPERTY, "tobago-theme-config", EXT_NONE,
+      final List properties = getPaths(clientKey, PROPERTY, "tobago-theme-config", EXT_NONE,
           false, true, false, rendererType + "." + name, true, true);
 
       Measure measure = null;
@@ -266,7 +288,7 @@ public class ResourceManagerImpl implements ResourceManager {
 
       if (markup != null) {
         for (final String m : markup) {
-          final List mProperties = getPaths(clientKey, "", PROPERTY, "tobago-theme-config", EXT_NONE,
+          final List mProperties = getPaths(clientKey, PROPERTY, "tobago-theme-config", EXT_NONE,
               false, true, false, rendererType + "[" + m + "]" + "." + name, true, true);
           if (mProperties != null) {
             final Measure summand = Measure.valueOf(mProperties.get(0));
@@ -285,16 +307,27 @@ public class ResourceManagerImpl implements ResourceManager {
     return result.getValue();
   }
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public String getImage(final UIViewRoot viewRoot, final String name) {
     return getImage(FacesContext.getCurrentInstance(), name);
   }
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public String getImage(final FacesContext facesContext, final String name) {
     return getImage(facesContext, name, false);
   }
 
+  /**
+   * {@inheritDoc}
+   *
+   * @deprecated by API
+   */
   @Deprecated
   public String getImage(final UIViewRoot viewRoot, final String name, final boolean ignoreMissing) {
     return getImage(FacesContext.getCurrentInstance(), name, ignoreMissing);
@@ -302,6 +335,8 @@ public class ResourceManagerImpl implements ResourceManager {
 
   /**
    * {@inheritDoc}
+   *
+   * @deprecated by API
    */
   @Deprecated
   public String getImage(
@@ -336,7 +371,7 @@ public class ResourceManagerImpl implements ResourceManager {
       StringValue result = imageCache.get(cacheKey);
       if (result == null) {
         final List paths
-            = getPaths(clientKey, "", null, name, extensions, false, true, true, null, true, ignoreMissing);
+            = getPaths(clientKey, null, name, extensions, false, true, true, null, true, ignoreMissing);
         if (paths != null) {
           result = new StringValue((String) paths.get(0));
         } else {
@@ -357,9 +392,10 @@ public class ResourceManagerImpl implements ResourceManager {
   }
 
   private List getPaths(
-      final ClientPropertiesKey clientKey, final String prefix, final String subDir, final String name,
+      final ClientPropertiesKey clientKey, final String subDir, final String name,
       final String[] extensions, final boolean reverseOrder, final boolean single, final boolean returnKey,
-      final String key, final boolean returnStrings, boolean ignoreMissing) {
+      final String key, final boolean returnStrings, final boolean ignoreMissingParameter) {
+    boolean ignoreMissing = ignoreMissingParameter;
     final List matches = new ArrayList();
     final String contentType = clientKey.getContentType();
     final Theme theme = clientKey.getTheme();
@@ -370,20 +406,20 @@ public class ResourceManagerImpl implements ResourceManager {
     for (final String localeSuffix : locales) {
       for (final String extension : extensions) {
         if (production) {
-          boolean found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+          boolean found = checkPath(reverseOrder, returnKey, returnStrings, matches,
               name, MINIMIZE_SUFFIX, localeSuffix, extension, key);
           if (found && (single || !returnStrings)) {
             return matches;
           }
           if (!found) {
-            found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+            found = checkPath(reverseOrder, returnKey, returnStrings, matches,
                 name, null, localeSuffix, extension, key);
             if (found && (single || !returnStrings)) {
               return matches;
             }
           }
         } else {
-          final boolean found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+          final boolean found = checkPath(reverseOrder, returnKey, returnStrings, matches,
               name, null, localeSuffix, extension, key);
           if (found && (single || !returnStrings)) {
             return matches;
@@ -400,14 +436,14 @@ public class ResourceManagerImpl implements ResourceManager {
           for (final String localeSuffix : locales) { // locale loop
             for (final String extension : extensions) { // extensions loop
               if (production) {
-                boolean found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+                boolean found = checkPath(reverseOrder, returnKey, returnStrings, matches,
                     resourceDirectory, contentType, currentTheme, browserType, subDir, name, MINIMIZE_SUFFIX,
                     localeSuffix, extension, key);
                 if (found && (single || !returnStrings)) {
                   return matches;
                 }
                 if (!found) {
-                  found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+                  found = checkPath(reverseOrder, returnKey, returnStrings, matches,
                       resourceDirectory, contentType, currentTheme, browserType, subDir, name, null,
                       localeSuffix, extension, key);
                   if (found && (single || !returnStrings)) {
@@ -415,7 +451,7 @@ public class ResourceManagerImpl implements ResourceManager {
                   }
                 }
               } else {
-                final boolean found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+                final boolean found = checkPath(reverseOrder, returnKey, returnStrings, matches,
                     resourceDirectory, contentType, currentTheme, browserType, subDir, name, null,
                     localeSuffix, extension, key);
                 if (found && (single || !returnStrings)) {
@@ -455,16 +491,12 @@ public class ResourceManagerImpl implements ResourceManager {
   }
 
   private boolean checkPath(
-      final String prefix, final boolean reverseOrder, final boolean returnKey, final boolean returnStrings,
+      final boolean reverseOrder, final boolean returnKey, final boolean returnStrings,
       final List matches, final String name, final String minimizeSuffix, final String localeSuffix,
       final String extension, final String key) {
     String path = makePath(name, minimizeSuffix, localeSuffix, extension, key);
     if (returnStrings && resourceList.containsKey(path)) {
-      final String result =
-          returnKey
-              ? prefix + path
-              : prefix + resourceList.get(path);
-
+      final String result = returnKey ? path : resourceList.get(path);
       if (reverseOrder) {
         matches.add(0, result);
       } else {
@@ -499,7 +531,7 @@ public class ResourceManagerImpl implements ResourceManager {
   }
 
   private boolean checkPath(
-      final String prefix, final boolean reverseOrder, final boolean returnKey, final boolean returnStrings,
+      final boolean reverseOrder, final boolean returnKey, final boolean returnStrings,
       final List matches, final String resourceDirectory, final String contentType, final Theme currentTheme,
       final String browserType, final String subDir, final String name, final String minimizeSuffix,
       final String localeSuffix, final String extension, final String key) {
@@ -507,12 +539,11 @@ public class ResourceManagerImpl implements ResourceManager {
         localeSuffix, extension, key, null);
     if (returnStrings && resourceList.containsKey(path)) {
       final String result;
-      if (prefix.length() == 0 && returnKey && resourceDirectory.equals(currentTheme.getResourcePath())) {
+      if (returnKey && resourceDirectory.equals(currentTheme.getResourcePath())) {
         result = makePath(resourceDirectory, contentType, currentTheme, browserType, subDir, name, minimizeSuffix,
             localeSuffix, extension, key, currentTheme.getVersion());
       } else {
-        result = returnKey
-            ? prefix + path : prefix + resourceList.get(path);
+        result = returnKey ? path : resourceList.get(path);
       }
       if (reverseOrder) {
         matches.add(0, result);
@@ -645,7 +676,7 @@ public class ResourceManagerImpl implements ResourceManager {
         return cacheResult;
       }
       try {
-        final List matches = getPaths(key, "", type,
+        final List matches = getPaths(key, type,
             nameWithoutExtension, extensions, true, false, true, null, true, false);
         if (matches != null) {
           result = (String[]) matches.toArray(new String[matches.size()]);
@@ -664,7 +695,7 @@ public class ResourceManagerImpl implements ResourceManager {
     if (cached != null) {
       extensions = cached;
     } else {
-      extensions = new String[] {extension};
+      extensions = new String[]{extension};
       extensionCache.put(extension, extensions);
       if (LOG.isInfoEnabled()) {
         LOG.info("Adding extension '{}' to cache.", extension);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
index 8b705c0..366956a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
@@ -19,9 +19,9 @@
 
 package org.apache.myfaces.tobago.internal.context;
 
+import org.apache.myfaces.tobago.internal.util.FastStringWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.internal.util.FastStringWriter;
 
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
@@ -31,8 +31,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * In some cases the rendered output must be places in the Response in a different order than it was rendered.
- * The <code>ResponseWriterDivider</code> helps to manage a list of buffers which holds the temporary output.
+ * In some cases the rendered output must be places in the Response in a different order than it was rendered. The
+ * <code>ResponseWriterDivider</code> helps to manage a list of buffers which holds the temporary output.
  *
  * @deprecated Since Tobago 2.0.9, no longer needed.
  */
@@ -43,11 +43,11 @@ public final class ResponseWriterDivider {
 
   private List<ResponseWriter> writers;
   private List<FastStringWriter> buffers;
-  
+
   private ResponseWriter original;
-  
+
   private int current;
-  
+
   private String nameInRequest;
 
   public static ResponseWriterDivider getInstance(final FacesContext facesContext, final String nameInRequest) {
@@ -57,7 +57,7 @@ public final class ResponseWriterDivider {
       divider = new ResponseWriterDivider(facesContext);
       map.put(nameInRequest, divider);
       divider.nameInRequest = nameInRequest;
-      
+
     }
     return divider;
   }
@@ -70,10 +70,10 @@ public final class ResponseWriterDivider {
   }
 
   /**
-   * Create (if needed) and activate a new branch. 
-   * After this call, all output will be stored in this new branch. 
+   * Create (if needed) and activate a new branch. After this call, all output will be stored in this new branch.
    * <p>
    * It is usually needed to get the response writer again with HtmlRendererUtils.getTobagoResponseWriter();
+   *
    * @return true if the branch was not created new. So the branch was already existent.
    */
   public boolean activateBranch(final FacesContext facesContext) {
@@ -95,18 +95,19 @@ public final class ResponseWriterDivider {
     }
     return created;
   }
-  
+
   /**
-   * Passivate the current branch. 
-   * After this call, all output will be written in the former branch (if any) or into the original writer.
+   * Passivate the current branch. After this call, all output will be written in the former branch (if any) or into the
+   * original writer.
    * <p>
    * It is usually needed to get the response writer again with HtmlRendererUtils.getTobagoResponseWriter();
-   * @return true, if the current writer is not the original writer. So the "stack" is at the bottom. 
+   *
+   * @return true, if the current writer is not the original writer. So the "stack" is at the bottom.
    */
   public boolean passivateBranch(final FacesContext facesContext) {
 
     assert writers.size() == buffers.size();
-    
+
     current--;
     if (current >= 0) {
       facesContext.setResponseWriter(writers.get(current));
@@ -124,8 +125,7 @@ public final class ResponseWriterDivider {
   }
 
   /**
-   * Write the collected stuff in the original writer.
-   * This is always the last call on this object.
+   * Write the collected stuff in the original writer. This is always the last call on this object.
    */
   public void writeOutAndCleanUp(final FacesContext facesContext) throws IOException {
     facesContext.setResponseWriter(original);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/StringValue.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/StringValue.java
index 3e8318f..7844385 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/StringValue.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/StringValue.java
@@ -56,6 +56,6 @@ public final class StringValue {
 
   @Override
   public int hashCode() {
-    return (value != null ? value.hashCode() : 0);
+    return value != null ? value.hashCode() : 0;
   }
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeConfigCacheKey.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeConfigCacheKey.java
index f695ccc..675a401 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeConfigCacheKey.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeConfigCacheKey.java
@@ -73,12 +73,12 @@ public final class ThemeConfigCacheKey {
     result = 31 * result + (markup != null ? markup.hashCode() : 0);
     return result;
   }
-  
+
   @Override
   public int hashCode() {
     return hashCode;
   }
-  
+
 
   @Override
   public String toString() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java
index 0f43596..a162f90 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java
@@ -23,8 +23,8 @@ import org.apache.myfaces.tobago.layout.LayoutToken;
 import org.apache.myfaces.tobago.layout.Measure;
 
 /**
- * BankHead represents the head information of a bank like the token for this bank, the computed
- * "current" and "minimum" measure and if it will be rendered. A bank is a generalization for columns and rows.
+ * BankHead represents the head information of a bank like the token for this bank, the computed "current" and "minimum"
+ * measure and if it will be rendered. A bank is a generalization for columns and rows.
  */
 public class BankHead {
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java
index 0926e10..fd85385 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.internal.layout;
 import org.apache.myfaces.tobago.layout.LayoutComponent;
 
 /**
- * To support horizontal and vertical spans, at each position will be a cell as a represantive.
- * Either a "origin cell" for the first position or a "span cell" for spanned other positions.
+ * To support horizontal and vertical spans, at each position will be a cell as a represantive. Either a "origin cell"
+ * for the first position or a "span cell" for spanned other positions.
  */
 public interface Cell {
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
index 5329495..b377dfc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
@@ -19,11 +19,11 @@
 
 package org.apache.myfaces.tobago.internal.layout;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.myfaces.tobago.layout.LayoutTokens;
 import org.apache.myfaces.tobago.layout.Orientation;
 import org.apache.myfaces.tobago.layout.RelativeLayoutToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -57,9 +57,9 @@ public class Grid {
     assert columns.getSize() > 0;
     assert rows.getSize() > 0;
 
-    this.columnCount = columns.getSize(); 
-    this.rowCount = rows.getSize(); 
-    
+    this.columnCount = columns.getSize();
+    this.rowCount = rows.getSize();
+
     this.columnHeads = new BankHead[columnCount];
     for (int i = 0; i < columnCount; i++) {
       columnHeads[i] = new BankHead(columns.get(i));
@@ -75,11 +75,12 @@ public class Grid {
     }
   }
 
-  public void add(final OriginCell cell, int columnSpan, final int rowSpan) {
+  public void add(final OriginCell cell, final int columnSpanParameter, final int rowSpan) {
 
-    assert columnSpan > 0;
+    assert columnSpanParameter > 0;
     assert rowSpan > 0;
 
+    int columnSpan = columnSpanParameter;
     boolean error = false;
 
     if (columnSpan + columnCursor > columnCount) {
@@ -156,9 +157,9 @@ public class Grid {
   public BankHead[] getBankHeads(final Orientation orientation) {
     return orientation == Orientation.HORIZONTAL ? columnHeads : rowHeads;
   }
-  
+
   private void enlarge(final int newRows) {
-    
+
     // process cells
     for (int i = 0; i < newRows; i++) {
       for (int j = 0; j < columnCount; j++) {
@@ -171,7 +172,7 @@ public class Grid {
     System.arraycopy(rowHeads, 0, newRowHeads, 0, rowHeads.length);
     rowHeads = newRowHeads;
     // todo: shorter in jdk 1.6: rowHeads = Arrays.copyOf(rowHeads, rowHeads.length + newRows);
-    
+
     for (int i = rowCount; i < rowCount + newRows; i++) {
       rowHeads[i] = new BankHead(RelativeLayoutToken.DEFAULT_INSTANCE);
     }
@@ -230,18 +231,8 @@ public class Grid {
   }
 
   /**
-   * Prints the state of the grid as an Unicode shape like this:
-   * ┏━┳━┳━┳━┯━┓
-   * ┃█┃█┃█┃█│➞┃
-   * ┠─╂─╊━╇━┿━┫
-   * ┃⬇┃⬇┃█│➞│➞┃
-   * ┣━╉─╊━╈━╈━┫
-   * ┃█┃⬇┃█┃█┃█┃
-   * ┣━╇━╇━╉─╊━┩
-   * ┃█│➞│➞┃⬇┃◌│
-   * ┡━┿━┿━╉─╂─┤
-   * │◌│◌│◌┃⬇┃◌│
-   * └─┴─┴─┺━┹─┘
+   * Prints the state of the grid as an Unicode shape like this: ┏━┳━┳━┳━┯━┓ ┃█┃█┃█┃█│➞┃ ┠─╂─╊━╇━┿━┫ ┃⬇┃⬇┃█│➞│➞┃
+   * ┣━╉─╊━╈━╈━┫ ┃█┃⬇┃█┃█┃█┃ ┣━╇━╇━╉─╊━┩ ┃█│➞│➞┃⬇┃◌│ ┡━┿━┿━╉─╂─┤ │◌│◌│◌┃⬇┃◌│ └─┴─┴─┺━┹─┘
    */
   public String gridAsString() {
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
index 9a4309e..70448c4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
@@ -19,8 +19,8 @@
 
 package org.apache.myfaces.tobago.internal.layout;
 
-import org.apache.myfaces.tobago.internal.util.StringUtils;
 import org.apache.myfaces.tobago.internal.component.AbstractUIGridLayout;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
 import org.apache.myfaces.tobago.layout.LayoutBase;
 import org.apache.myfaces.tobago.layout.LayoutContainer;
 import org.apache.myfaces.tobago.layout.LayoutManager;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
index 7cc33d6..9171d26 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
@@ -66,7 +66,7 @@ public final class LayoutUtils {
       if (child instanceof LayoutComponent) {
         result.add((LayoutComponent) child);
       } else {
-        // Child seems to be transparent for layout, like UIForm. 
+        // Child seems to be transparent for layout, like UIForm.
         // So we try to add the inner components.
         addLayoutChildren(child, result);
       }
@@ -102,7 +102,11 @@ public final class LayoutUtils {
     return orientation == Orientation.HORIZONTAL ? component.getCurrentWidth() : component.getCurrentHeight();
   }
 
-  public static void setCurrentSize(final Orientation orientation, final LayoutBase component, Measure size) {
+  public static void setCurrentSize(
+      final Orientation orientation, final LayoutBase component, final Measure sizeParameter) {
+
+    Measure size = sizeParameter;
+
     if (orientation == Orientation.HORIZONTAL) {
       final Measure width = component.getWidth();
       if (width != null) { // to not override set sizes
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/MathUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/MathUtils.java
index 654eb87..67c4895 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/MathUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/MathUtils.java
@@ -30,10 +30,11 @@ public final class MathUtils {
   }
 
   /**
-   * Adjusts the list of double values to rounded values with the same sum.
-   * E. g. 2.3, 2.4, 2.5, 2.8 -> 2.0, 2.0, 3.0, 3.0
+   * Adjusts the list of double values to rounded values with the same sum. E. g. 2.3, 2.4, 2.5, 2.8 -> 2.0, 2.0, 3.0,
+   * 3.0
    */
-  public static void adjustRemainders(final double[] list, double bias) {
+  public static void adjustRemainders(final double[] list, final double biasParameter) {
+    double bias = biasParameter;
     for (final double ignored : list) {
       final double lastBias;
       if (bias < 0.0) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/package-info.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/package-info.java
index e8539e4..855b2c5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/package-info.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/package-info.java
@@ -20,9 +20,6 @@
 package org.apache.myfaces.tobago.internal;
 
 /**
- * Package of internal classes.
- * <br/>
- * Classes of this package will normally not used by applications directly.
- * <br/>
+ * Package of internal classes. <br/> Classes of this package will normally not used by applications directly. <br/>
  * Classes of this package may be changed without any deprecation warnings.
  */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
index af1fac4..3305456 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
@@ -59,7 +59,6 @@ public abstract class TobagoELTag extends UIComponentELTag {
   }
 
   /**
-   *
    * @deprecated Not supported anymore
    */
   @Deprecated
@@ -70,7 +69,6 @@ public abstract class TobagoELTag extends UIComponentELTag {
   }
 
   /**
-   *
    * @deprecated Not supported anymore
    */
   @Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
index 2899be6..b7d73b2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
@@ -38,8 +38,7 @@ import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
 /**
- * Add an attribute on the UIComponent
- * associated with the closest parent UIComponent custom action.
+ * Add an attribute on the UIComponent associated with the closest parent UIComponent custom action.
  */
 @Tag(name = "attribute")
 @SimpleTag(
@@ -67,7 +66,7 @@ public abstract class AttributeTag extends TagSupport {
     }
 
     if (!tag.getCreated()) {
-      return (SKIP_BODY);
+      return SKIP_BODY;
     }
 
     final UIComponent component = tag.getComponentInstance();
@@ -78,7 +77,7 @@ public abstract class AttributeTag extends TagSupport {
 
     final ELContext elContext = FacesContext.getCurrentInstance().getELContext();
 
-    final String attributeName =  (String) name.getValue(elContext);
+    final String attributeName = (String) name.getValue(elContext);
 
     if (!value.isLiteralText()) {
       component.setValueExpression(attributeName, value);
@@ -91,7 +90,7 @@ public abstract class AttributeTag extends TagSupport {
     } else {
       component.getAttributes().put(attributeName, value.getValue(elContext));
     }
-    return (SKIP_BODY);
+    return SKIP_BODY;
   }
 
   @Override
@@ -105,7 +104,7 @@ public abstract class AttributeTag extends TagSupport {
    * The name of the attribute in the parent component.
    */
   @TagAttribute(required = true, name = "name", type = "java.lang.String")
-  public void setName(final ValueExpression name){
+  public void setName(final ValueExpression name) {
     this.name = name;
   }
 
@@ -113,25 +112,17 @@ public abstract class AttributeTag extends TagSupport {
    * The value of the attribute in the parent component.
    */
   @TagAttribute(required = true, name = "value", type = "java.lang.String")
-  public  void setValue(final ValueExpression value){
+  public void setValue(final ValueExpression value) {
     this.value = value;
   }
 
   /**
-   * Warning: The mode is only available when using Facelets.
-   * Allowed values are "action", "actionListener", "actionFromValue", "isNotSet", "isSet", "valueIfSet".
-   * <br/>
-   * "action" (method binding) evaluate the expression to find the method binding which is referenced with the template.
-   * <br/>
-   * "actionListener" same as "action" but for the method signature of ActionListeners.
-   * <br/>
-   * "isSet" (boolean) checks, if the expression is set from the composition caller.
-   * <br/>
-   * "isNotSet" (boolean) negation of "isSet"
-   * <br/>
-   * "actionFromValue" Evaluates the ValueBinding to get an outcome set directly (no action method)
-   * <br/>
-   * "valueIfSet" set the attribute only if the value is set.
+   * Warning: The mode is only available when using Facelets. Allowed values are "action", "actionListener",
+   * "actionFromValue", "isNotSet", "isSet", "valueIfSet". <br/> "action" (method binding) evaluate the expression to
+   * find the method binding which is referenced with the template. <br/> "actionListener" same as "action" but for the
+   * method signature of ActionListeners. <br/> "isSet" (boolean) checks, if the expression is set from the composition
+   * caller. <br/> "isNotSet" (boolean) negation of "isSet" <br/> "actionFromValue" Evaluates the ValueBinding to get an
+   * outcome set directly (no action method) <br/> "valueIfSet" set the attribute only if the value is set.
    */
   @TagAttribute(name = "mode")
   public void setMode(final ValueExpression mode) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java
index 01ca32c..a7ad80c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java
@@ -34,5 +34,5 @@ import javax.faces.component.UIPanel;
         "org.apache.myfaces.tobago.SelectOneCommand",
         "org.apache.myfaces.tobago.SelectBooleanCommand",
         "org.apache.myfaces.tobago.Command"})
-public interface BoxToolBarTagDeclaration extends ToolBarTagDeclaration{
+public interface BoxToolBarTagDeclaration extends ToolBarTagDeclaration {
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java
index b1e47b4..c42a423 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java
@@ -33,8 +33,9 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
 import javax.faces.component.UIPanel;
 
 /**
- * Renders a panel-like layout element with the ability to span over more than
- * one layout cell. A cell may only contain one child.
+ * Renders a panel-like layout element with the ability to span over more than one layout cell. A cell may only contain
+ * one child.
+ *
  * @deprecated The Cell is deprecated since Tobago 1.5.0
  */
 @Deprecated
@@ -45,7 +46,7 @@ import javax.faces.component.UIPanel;
     uiComponentFacesClass = "javax.faces.component.UIPanel",
     componentFamily = UIPanel.COMPONENT_FAMILY,
     rendererType = RendererTypes.CELL)
-public interface CellTagDeclaration 
+public interface CellTagDeclaration
     extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup {
 
   @UIComponentTagAttribute(
@@ -75,7 +76,7 @@ public interface CellTagDeclaration
   @UIComponentTagAttribute(
       type = {"java.lang.Integer"},
       defaultValue = "1",
-  generate = false)
+      generate = false)
   void setSpanY(String spanY);
 
   /**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
index 4513cde..298cbc8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
@@ -37,8 +37,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
 import javax.faces.component.UIColumn;
 
 /**
- * Creates a tree node inside of a sheet (also known as tree table).
- * This component represents a single node inside a tree structure.
+ * Creates a tree node inside of a sheet (also known as tree table). This component represents a single node inside a
+ * tree structure.
  */
 @SuppressWarnings("ALL")
 @Tag(name = "columnNode")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
index c64930f..d7d6c65 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
@@ -36,8 +36,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
 import javax.faces.component.UIColumn;
 
 /**
- * Renders a UIComponent that represents a single column of data within a
- * parent UISheet component.
+ * Renders a UIComponent that represents a single column of data within a parent UISheet component.
  */
 @Tag(name = "column")
 @UIComponentTag(
@@ -60,8 +59,8 @@ public interface ColumnTagDeclaration
   void setAlign(String align);
 
   /**
-   * Flag indicating whether or not this column is sortable.
-   * To make a column sortable the data of the sheet must be one of
+   * Flag indicating whether or not this column is sortable. To make a column sortable the data of the sheet must be one
+   * of
    * <code>java.util.List</code> or <code>Object[]</code>.
    */
   @TagAttribute
@@ -76,9 +75,8 @@ public interface ColumnTagDeclaration
   void setResizable(String resizable);
 
   /**
-   * The layout token for this column.
-   * Allowd layout tokens ('*', '&lt;x>*', '&lt;x>px' or '&lt;x>%').
-   * Where '*' is equivalent to '1*'.
+   * The layout token for this column. Allowd layout tokens ('*', '&lt;x>*', '&lt;x>px' or '&lt;x>%'). Where '*' is
+   * equivalent to '1*'.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
index 1fc2ca2..a43860d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
@@ -36,11 +36,11 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
 import javax.faces.component.UICommand;
 
 /**
- * Use this tag only as a facet for click, change in selectOneRadio,
- * selectBooleanCheckbox, selectManyCheckbox and selectOneChoice
+ * Use this tag only as a facet for click, change in selectOneRadio, selectBooleanCheckbox, selectManyCheckbox and
+ * selectOneChoice
  */
 @Tag(
-    name = "command", 
+    name = "command",
     tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
 @UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UICommand",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICommand",
@@ -58,5 +58,4 @@ public interface CommandTagDeclaration
     HasCurrentMarkup, HasLabel {
 
 
-
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
index 4dc7a3c..4782af0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
@@ -36,8 +36,7 @@ import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
 /**
- * Register an Converter instance on the UIComponent
- * associated with the closest parent UIComponent.
+ * Register an Converter instance on the UIComponent associated with the closest parent UIComponent.
  */
 @Tag(name = "converter")
 @SimpleTag(
@@ -50,11 +49,10 @@ public abstract class ConverterTag extends TagSupport {
   private ValueExpression converterId;
 
   /**
-   * Create a new instance of the specified {@link javax.faces.convert.Converter}
-   * class, and register it with the {@link javax.faces.component.UIComponent} instance associated
-   * with our most immediately surrounding {@link javax.faces.webapp.UIComponentELTag} instance, if
-   * the {@link javax.faces.component.UIComponent} instance was created by this execution of the
-   * containing JSP page.
+   * Create a new instance of the specified {@link javax.faces.convert.Converter} class, and register it with the {@link
+   * javax.faces.component.UIComponent} instance associated with our most immediately surrounding {@link
+   * javax.faces.webapp.UIComponentELTag} instance, if the {@link javax.faces.component.UIComponent} instance was
+   * created by this execution of the containing JSP page.
    *
    * @throws javax.servlet.jsp.JspException if a JSP error occurs
    */
@@ -69,7 +67,7 @@ public abstract class ConverterTag extends TagSupport {
     }
 
     if (!tag.getCreated()) {
-      return (SKIP_BODY);
+      return SKIP_BODY;
     }
 
     final UIComponent component = tag.getComponentInstance();
@@ -109,7 +107,7 @@ public abstract class ConverterTag extends TagSupport {
       }
     }
 
-    return (SKIP_BODY);
+    return SKIP_BODY;
   }
 
   @Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
index e89bc64..d0d876a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
@@ -35,10 +35,8 @@ import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
 /**
- * Add an data attribute on the UIComponent
- * associated with the closest parent UIComponent custom action.
- * Data attributes will be passed through the renderers into the DOM of the user agent and
- * can be used by scripts.
+ * Add an data attribute on the UIComponent associated with the closest parent UIComponent custom action. Data
+ * attributes will be passed through the renderers into the DOM of the user agent and can be used by scripts.
  */
 @Preliminary
 @Tag(name = "dataAttribute")
@@ -72,7 +70,7 @@ public abstract class DataAttributeTag extends TagSupport {
     }
 
     if (!tag.getCreated()) {
-      return (SKIP_BODY);
+      return SKIP_BODY;
     }
 
     final UIComponent component = tag.getComponentInstance();
@@ -88,7 +86,7 @@ public abstract class DataAttributeTag extends TagSupport {
 
     ComponentUtils.putDataAttribute(component, attributeName, attributeValue);
 
-    return (SKIP_BODY);
+    return SKIP_BODY;
   }
 
   /**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java
index 435ccb1..31d6880 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java
@@ -33,13 +33,11 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
 import javax.faces.component.UICommand;
 
 /**
- * Renders a date picker.
- * The component needs a DateFormat Pattern from a converter. The converter
- * should be an instance of DateTimeConverter and return a valid pattern from
- * the method getPattern()
+ * Renders a date picker. The component needs a DateFormat Pattern from a converter. The converter should be an instance
+ * of DateTimeConverter and return a valid pattern from the method getPattern()
  *
- * @deprecated Since 2.0.0. It's no longer needed, because this is resolved by JavaScript now.
- * Set backward compatibility mode via classic-date-time-picker.
+ * @deprecated Since 2.0.0. It's no longer needed, because this is resolved by JavaScript now. Set backward
+ * compatibility mode via classic-date-time-picker.
  */
 @Deprecated
 @Tag(name = "datePicker")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
index 8831e4c..9fb3a5d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
@@ -50,10 +50,10 @@ import javax.faces.component.UIInput;
     rendererType = RendererTypes.DATE,
     allowedChildComponenents = "NONE",
     facets = {
-    @Facet(name = Facets.CHANGE,
-        description =
-            "This facet can contain a UICommand that is invoked in a case of a change event from the component")
-        })
+        @Facet(name = Facets.CHANGE,
+            description =
+                "This facet can contain a UICommand that is invoked in a case of a change event from the component")
+    })
 public interface DateTagDeclaration
     extends InputTagDeclaration, HasIdBindingAndRendered, IsReadonly,
     IsDisabled, HasConverter, HasLabel,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java
index 7847670..6736f94 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java
@@ -37,6 +37,6 @@ import javax.faces.component.UIPanel;
     componentFamily = UIPanel.COMPONENT_FAMILY,
     rendererType = RendererTypes.PANEL)
 public interface ExtensionPanelDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent,
-        IsGridLayoutContainer, HasMarkup, HasCurrentMarkup, HasTip {
+    IsGridLayoutContainer, HasMarkup, HasCurrentMarkup, HasTip {
 
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileDropTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileDropTagDeclaration.java
index f4db455..dde0853 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileDropTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileDropTagDeclaration.java
@@ -50,9 +50,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
 import javax.faces.component.UIInput;
 
 /**
- * Renders a file drop component.
- * This component always makes a partial (ajax) upload!
- * <p />
+ * Renders a file drop component. This component always makes a partial (ajax) upload!
+ * <p/>
  * For content constraints please use <a href="validateFileItem.html">tc:validateFileItem</a>.
  */
 @Tag(name = "fileDrop")
@@ -76,7 +75,7 @@ public interface FileDropTagDeclaration
    */
   @TagAttribute()
   @UIComponentTagAttribute(
-      type = { "javax.servlet.http.Part", "org.apache.commons.fileupload.FileItem[]" },
+      type = {"javax.servlet.http.Part", "org.apache.commons.fileupload.FileItem[]"},
       expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setValue(String value);
 
@@ -115,7 +114,7 @@ public interface FileDropTagDeclaration
    * Indicate the highlighted file drop area.
    * </p>
    * <p>
-   *   You should use:
+   * You should use:
    *   <ul>
    *     <li>a clientId (absolute or relative see setRenderedPartially)</li>
    *     <li>@this to use only the layouted space of this tc:fileDrop</li>
@@ -123,7 +122,6 @@ public interface FileDropTagDeclaration
    *     <li>@panel to use the layouted space of the next parent tc:panel</li>
    *   </ul>
    * </p>
-   *
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.String")
@@ -134,7 +132,7 @@ public interface FileDropTagDeclaration
    * Indicate visible component style.
    * </p>
    * <p>
-   *   Possible values:
+   * Possible values:
    *   <ul>
    *     <li>DROP_ZONE</li>
    *     <li>FILE</li>
@@ -146,7 +144,6 @@ public interface FileDropTagDeclaration
    * <p>
    *   Default is DROP_ZONE.
    * </p>
-   *
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.String")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
index 8a699b2..7f838c8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
@@ -51,7 +51,7 @@ import javax.faces.component.UIInput;
 
 /**
  * Renders a file input field.
- * <p />
+ * <p/>
  * For content constraints please use <a href="validateFileItem.html">tc:validateFileItem</a>.
  */
 @Tag(name = "file")
@@ -79,7 +79,7 @@ public interface FileTagDeclaration
    */
   @TagAttribute()
   @UIComponentTagAttribute(
-      type = { "javax.servlet.http.Part", "javax.servlet.http.Part[]" },
+      type = {"javax.servlet.http.Part", "javax.servlet.http.Part[]"},
       expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setValue(String value);
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
index 0ef5b61..ae37183 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
@@ -34,8 +34,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.layout.TextAlign;
 
 /**
- * XXX Warning: Still in progress! Please do not use it until other announcement.
- * Renders a FlowLayout that positions the content components in there natural order.
+ * XXX Warning: Still in progress! Please do not use it until other announcement. Renders a FlowLayout that positions
+ * the content components in there natural order.
  */
 @Tag(name = "flowLayout")
 @UIComponentTag(
@@ -48,15 +48,12 @@ import org.apache.myfaces.tobago.layout.TextAlign;
 public interface FlowLayoutTagDeclaration
     extends HasId,
     /*HasSpacing, TODO*/
-    HasMargin, HasMargins, /*todo: do we need the margin here? Or should be use the margin from the container? */ 
+    HasMargin, HasMargins, /*todo: do we need the margin here? Or should be use the margin from the container? */
     HasBinding, HasMarkup, HasCurrentMarkup {
 
   /**
-   * The alignment of the elements inside of the container, possible values are:
-   * {@value TextAlign#STRING_LEFT},
-   * {@value TextAlign#STRING_RIGHT},
-   * {@value TextAlign#STRING_CENTER} und
-   * {@value TextAlign#STRING_JUSTIFY}.
+   * The alignment of the elements inside of the container, possible values are: {@value TextAlign#STRING_LEFT}, {@value
+   * TextAlign#STRING_RIGHT}, {@value TextAlign#STRING_CENTER} und {@value TextAlign#STRING_JUSTIFY}.
    */
   @TagAttribute
   @UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
index b168d90..a2c4731 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
@@ -40,10 +40,10 @@ import javax.faces.component.UIForm;
 public interface FormTagDeclaration extends HasBinding, HasId {
 
   /**
-   *   
+   *
 
-  @TagAttribute
-  @UIComponentTagAttribute(type = "java.lang.String")
-  void setNotFor(String notFor);
-  */
+   @TagAttribute
+   @UIComponentTagAttribute(type = "java.lang.String")
+   void setNotFor(String notFor);
+   */
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
index 7a33d73..2a14058 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
@@ -87,7 +87,7 @@ public abstract class GridLayoutConstraintTag extends TagSupport {
     }
 
     if (!tag.getCreated()) {
-      return (SKIP_BODY);
+      return SKIP_BODY;
     }
 
     UIComponent component = tag.getComponentInstance();
@@ -314,7 +314,7 @@ public abstract class GridLayoutConstraintTag extends TagSupport {
       }
     }
 
-    return (SKIP_BODY);
+    return SKIP_BODY;
   }
 
   @Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
index ffef3f7..02c801f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
@@ -51,9 +51,8 @@ public interface ImageTagDeclaration
     IsGridLayoutComponentWithDimension, IsGridLayoutContainer {
 
   /**
-   * Absolute url to an image or image name to lookup in tobago resource path.
-   * In the second case, there is no need to set the extension (like .gif or .png).
-   * If you leave it out, you can use different extension in different themes.
+   * Absolute url to an image or image name to lookup in tobago resource path. In the second case, there is no need to
+   * set the extension (like .gif or .png). If you leave it out, you can use different extension in different themes.
    */
   @TagAttribute(required = true)
   @UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
index 3974acc..1f5cf0e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
@@ -57,10 +57,10 @@ import javax.faces.component.UIInput;
         "org.apache.myfaces.tobago.Suggest"
     },
     facets = {
-    @Facet(name = Facets.CHANGE,
-        description =
-            "This facet can contain a UICommand that is invoked in a case of a change event from the component")
-        })
+        @Facet(name = Facets.CHANGE,
+            description =
+                "This facet can contain a UICommand that is invoked in a case of a change event from the component")
+    })
 public interface InTagDeclaration
     extends HasIdBindingAndRendered, HasConverter, IsReadonly, IsDisabled, IsRequired, HasTip, IsPassword,
     HasSuggestMethod, HasMarkup, HasCurrentMarkup, InputTagDeclaration, HasInputLabel,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
index e93a9e6..cbeb048 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
@@ -34,15 +34,14 @@ import javax.servlet.jsp.tagext.TagSupport;
 import java.util.Map;
 
 /**
- * Load a resource bundle localized for the locale of the current view
- * from the tobago resource path, and expose it (as a Map) in the session
- * attributes (session scope is needed to support ajax requests).
- * <p />
- * The main difference to the JSF tag f:localBundle is the support of Tobago themes and
- * the XML formal for properties files.
- * <p />
- * Since JSF 1.2 it is possible to use a {@link org.apache.myfaces.tobago.context.TobagoBundle}
- * and configure it in the faces-config.xml.
+ * Load a resource bundle localized for the locale of the current view from the tobago resource path, and expose it (as
+ * a Map) in the session attributes (session scope is needed to support ajax requests).
+ * <p/>
+ * The main difference to the JSF tag f:localBundle is the support of Tobago themes and the XML formal for properties
+ * files.
+ * <p/>
+ * Since JSF 1.2 it is possible to use a {@link org.apache.myfaces.tobago.context.TobagoBundle} and configure it in the
+ * faces-config.xml.
  */
 @Tag(name = "loadBundle")
 @SimpleTag(
@@ -82,12 +81,11 @@ public abstract class LoadBundleTag extends TagSupport {
   }
 
   /**
-   * Name of a session-scope attribute under which the bundle data
-   * will be exposed.
+   * Name of a session-scope attribute under which the bundle data will be exposed.
    */
   @TagAttribute(required = true, name = "var")
   @UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
-  public  void setVar(final String var){
+  public void setVar(final String var) {
     this.var = var;
   }
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
index 0eeaf27..4064945 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
@@ -32,8 +32,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
 import javax.faces.component.UIPanel;
 
 /**
- * Component to put other components from other frameworks into.
- * Gives the possibility, to interchange layout information.
+ * Component to put other components from other frameworks into. Gives the possibility, to interchange layout
+ * information.
  */
 @Tag(name = "mediator")
 @UIComponentTag(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
index 9623596..3dca659 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
@@ -31,10 +31,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
 import javax.faces.component.UIPanel;
 
 /**
-* Renders a menu bar.<br />
-* Add menu bar as facet name="menuBar" to page tag or use it anywhere
-* on page.<br />
-*/
+ * Renders a menu bar.<br /> Add menu bar as facet name="menuBar" to page tag or use it anywhere on page.<br />
+ */
 @Tag(name = "menuBar")
 @BodyContentDescription(
     anyClassOf = {"org.apache.myfaces.tobago.internal.taglib.MenuTag",
@@ -55,7 +53,7 @@ import javax.faces.component.UIPanel;
         "org.apache.myfaces.tobago.SelectBooleanCommand",
         "org.apache.myfaces.tobago.MenuSelectOne",
         "org.apache.myfaces.tobago.MenuSeparator"
-        })
+    })
 public interface MenuBarTagDeclaration
     extends HasIdBindingAndRendered, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup {
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
index 7efd662..acefd07 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
@@ -36,7 +36,7 @@ import javax.faces.component.UICommand;
 /**
  * Renders a menu item. (This tag was renamed from tc:menuItem since Tobago 1.5.0)
  */
-@Tag(name = "menuCommand", 
+@Tag(name = "menuCommand",
     tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIMenuCommand",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
index dbdfe86..5d14005 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
@@ -49,8 +49,8 @@ public interface MessagesTagDeclaration
     extends HasIdBindingAndRendered, HasFor, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup {
 
   /**
-   * Flag indicating that only messages that are not associated to any
-   * particular UIComponent should be displayed. That are messages without clientId.
+   * Flag indicating that only messages that are not associated to any particular UIComponent should be displayed. That
+   * are messages without clientId.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "false")
@@ -70,7 +70,7 @@ public interface MessagesTagDeclaration
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
   void setShowSummary(String showSummary);
 
-   /**
+  /**
    * Sets the mininum severity to be shown. E. g. "warn" shows only "warn", "error" and "fatal".
    */
   @TagAttribute
@@ -78,37 +78,35 @@ public interface MessagesTagDeclaration
       defaultCode = "javax.faces.application.FacesMessage.SEVERITY_INFO")
   void setMinSeverity(String minSeverity);
 
-   /**
-   * Sets the maximum severity to be shown. E. g. "warn" shows only "warn" and "info".
-    * When setting this attribute you usually shoud take care, that you have a second message tag to show the
-    * higher severity levels.
+  /**
+   * Sets the maximum severity to be shown. E. g. "warn" shows only "warn" and "info". When setting this attribute you
+   * usually shoud take care, that you have a second message tag to show the higher severity levels.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.application.FacesMessage$Severity", defaultValue = "fatal",
       defaultCode = "javax.faces.application.FacesMessage.SEVERITY_FATAL")
   void setMaxSeverity(String maxSeverity);
 
-   /**
+  /**
    * Sets the maximum number of messages to show.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "2147483647")
   void setMaxNumber(String maxNumber);
 
-   /**
+  /**
    * Sets the order of the messages.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.component.UIMessages$OrderBy",
       allowedValues = {AbstractUIMessages.OrderBy.OCCURRENCE_STRING, AbstractUIMessages.OrderBy.SEVERITY_STRING},
-      defaultValue = AbstractUIMessages.OrderBy.OCCURRENCE_STRING, 
+      defaultValue = AbstractUIMessages.OrderBy.OCCURRENCE_STRING,
       defaultCode = "org.apache.myfaces.tobago.internal.component.AbstractUIMessages.OrderBy.OCCURRENCE")
   void setOrderBy(String orderBy);
 
   /**
-   * Has the user to confirm this message?
-   * This attributes handles the case, if the application wants to warn the user about a problem,
-   * and the user has to confirm the message before he/she can continue.
+   * Has the user to confirm this message? This attributes handles the case, if the application wants to warn the user
+   * about a problem, and the user has to confirm the message before he/she can continue.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
index d47be20..3b816b4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
@@ -32,8 +32,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
 import javax.faces.component.UIOutput;
 
 /**
- * Show external content inside of an application.
- * This will typically renders an iframe tag.
+ * Show external content inside of an application. This will typically renders an iframe tag.
  */
 @Tag(name = "object")
 @UIComponentTag(
@@ -54,9 +53,8 @@ public interface ObjectTagDeclaration extends HasIdBindingAndRendered, IsGridLay
   void setSrc(String src);
 
   /**
-   * Name of the element.
-   * If not set the id will be used as name. The id in JSF normally contains colons.
-   * This doesn't work in Internet Explorer 9 and lower when using window.open(src, target).
+   * Name of the element. If not set the id will be used as name. The id in JSF normally contains colons. This doesn't
+   * work in Internet Explorer 9 and lower when using window.open(src, target).
    */
   @TagAttribute
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
index 8336a74..37e6892 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
@@ -54,18 +54,16 @@ public interface OutTagDeclaration
     HasMarkup, HasCurrentMarkup, HasSanitize {
 
   /**
-   * Flag indicating that characters that are
-   * sensitive in HTML and XML markup must be escaped.
+   * Flag indicating that characters that are sensitive in HTML and XML markup must be escaped.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
   void setEscape(String escape);
 
   /**
-   * Indicates that the renderer should create an element in the output language
-   * (e. g. an span or div tag around the output text).
-   * Use true, if you enable the possibility to apply styles to the output.
-   * Use false, if you want to keep the code small (especially inside of sheets).
+   * Indicates that the renderer should create an element in the output language (e. g. an span or div tag around the
+   * output text). Use true, if you enable the possibility to apply styles to the output. Use false, if you want to keep
+   * the code small (especially inside of sheets).
    */
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
   void setCreateSpan(String createSpan);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
index d1466a2..98d552d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
@@ -48,16 +48,16 @@ import javax.faces.component.UIForm;
     componentFamily = UIForm.COMPONENT_FAMILY,
     rendererType = RendererTypes.PAGE,
     facets =
-        { @Facet(name = Facets.ACTION,
-                description ="Contains an instance of UICommand (tc:command) for an auto-action",
-                allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
-          @Facet(name = Facets.RESIZE,
-                description ="Contains an instance of UICommand which will be executed when the"
+        {@Facet(name = Facets.ACTION,
+            description = "Contains an instance of UICommand (tc:command) for an auto-action",
+            allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+            @Facet(name = Facets.RESIZE,
+                description = "Contains an instance of UICommand which will be executed when the"
                     + "size of the user agent was changed. Typically a <tc:command immediate='true' />",
                 allowedChildComponenents = {"org.apache.myfaces.tobago.Command", "org.apache.myfaces.tobago.Form"}),
-          @Facet(name = Facets.MENUBAR, description = "Menubar",
+            @Facet(name = Facets.MENUBAR, description = "Menubar",
                 allowedChildComponenents = "javax.faces.component.UIPanel"), //fake
-          @Facet(name=Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
+            @Facet(name = Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
                 allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
 
 public interface PageTagDeclaration
@@ -65,18 +65,16 @@ public interface PageTagDeclaration
     IsGridLayoutComponentWithDimension, IsGridLayoutContainer {
 
   /**
-   * Contains the id of the component which should have the focus after
-   * loading the page.
-   * Set to empty string for disabling setting of focus.
-   * Default (null) enables the "auto focus" feature.
+   * Contains the id of the component which should have the focus after loading the page. Set to empty string for
+   * disabling setting of focus. Default (null) enables the "auto focus" feature.
    */
   @TagAttribute
   @UIComponentTagAttribute()
   void setFocusId(String focusId);
 
   /**
-   * Absolute URL to an image or image name to lookup in tobago resource path
-   * representing the application. In HTML it is used as a favicon.
+   * Absolute URL to an image or image name to lookup in tobago resource path representing the application. In HTML it
+   * is used as a favicon.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -85,8 +83,8 @@ public interface PageTagDeclaration
   /**
    * <strong>ValueBindingExpression</strong> pointing to a object to save the
    * component's state.
-   * @deprecated since Tobago 1.5.0. Please set the min/max values with e. g. 
-   * a tc:gridLayoutConstraint tag.
+   *
+   * @deprecated since Tobago 1.5.0. Please set the min/max values with e. g. a tc:gridLayoutConstraint tag.
    */
   @Deprecated
   @TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
index 7068f59..c772a69 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
@@ -34,8 +34,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
 import javax.faces.component.UIPanel;
 
 /**
- * Intended for use in situations when only one UIComponent child can be
- * nested, such as in the case of facets.
+ * Intended for use in situations when only one UIComponent child can be nested, such as in the case of facets.
  */
 @Tag(name = "panel")
 @UIComponentTag(
@@ -46,10 +45,10 @@ import javax.faces.component.UIPanel;
     rendererType = RendererTypes.PANEL,
     interfaces = "org.apache.myfaces.tobago.component.SupportsMarkup",
     facets = {
-    @Facet(name= Facets.RELOAD, description = "Contains an instance of UIReload",
+        @Facet(name = Facets.RELOAD, description = "Contains an instance of UIReload",
             allowedChildComponenents = "org.apache.myfaces.tobago.Reload"),
-    @Facet(name=Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
+        @Facet(name = Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
             allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
-public interface PanelTagDeclaration 
+public interface PanelTagDeclaration
     extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup, HasTip {
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
index e7bdfc9..e96c2eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
@@ -35,8 +35,7 @@ import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
 /**
- * Register an PopupActionListener instance on the UIComponent
- * associated with the closest parent UIComponent.
+ * Register an PopupActionListener instance on the UIComponent associated with the closest parent UIComponent.
  */
 @Tag(name = "popupReference")
 @SimpleTag(
@@ -58,7 +57,7 @@ public abstract class PopupReferenceTag extends TagSupport {
     }
 
     if (!tag.getCreated()) {
-      return (SKIP_BODY);
+      return SKIP_BODY;
     }
 
     final UIComponent component = tag.getComponentInstance();
@@ -80,15 +79,15 @@ public abstract class PopupReferenceTag extends TagSupport {
     } else {
       component.setValueExpression(Attributes.FOR, forValue);
     }
-    return (SKIP_BODY);
+    return SKIP_BODY;
   }
 
   /**
    * The id of a Popup.
    */
   @TagAttribute(required = true, name = "for", type = "java.lang.String")
-  public void setFor(final ValueExpression forValue) {
-    this.forValue = forValue;
+  public void setFor(final ValueExpression forValueParameter) {
+    this.forValue = forValueParameter;
   }
 
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
index 1c8e52f..1272443 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
@@ -35,10 +35,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
 import javax.faces.component.UIPanel;
 
 /**
- * Renders a popup panel.
- * The popup gets a grid layout manager with columns="auto" and rows="auto" as definition.
- * So a popup should contain only one layout component.
- * The default layout manager can be overwritten with the layout facet.
+ * Renders a popup panel. The popup gets a grid layout manager with columns="auto" and rows="auto" as definition. So a
+ * popup should contain only one layout component. The default layout manager can be overwritten with the layout facet.
  */
 @Tag(name = "popup")
 @UIComponentTag(
@@ -52,14 +50,14 @@ import javax.faces.component.UIPanel;
             description = "Contains an instance of AbstractUILayoutBase",
             allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")}
 )
-public interface PopupTagDeclaration 
+public interface PopupTagDeclaration
     extends HasIdBindingAndRendered, IsGridLayoutComponentWithDimension, IsGridLayoutContainer,
     HasMarkup, HasCurrentMarkup {
 
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
   void setModal(String modal);
-  
+
   /**
    * This value will usually be set by the layout manager.
    *
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
index a29d040..b870303 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
@@ -47,11 +47,11 @@ import javax.faces.component.UIOutput;
     rendererType = RendererTypes.PROGRESS,
     allowedChildComponenents = "NONE",
     facets = {@Facet(
-        name= Facets.COMPLETE,
+        name = Facets.COMPLETE,
         description =
             "Contains an instance of UICommand (tc:command). The action is invoked if the full progress has reached",
         allowedChildComponenents = "org.apache.myfaces.tobago.Command")})
-        
+
 public interface ProgressTagDeclaration
     extends HasIdBindingAndRendered, HasTip, HasMarkup, HasCurrentMarkup, IsGridLayoutComponent {
 
@@ -60,7 +60,7 @@ public interface ProgressTagDeclaration
    */
   @TagAttribute
   @UIComponentTagAttribute(
-      type = { "javax.swing.BoundedRangeModel" },
+      type = {"javax.swing.BoundedRangeModel"},
       expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setValue(String value);
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java
index a2c716e..4c53556 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java
@@ -52,10 +52,8 @@ public interface ReloadTagDeclaration extends HasIdBindingAndRendered {
   void setUpdate(String update);
 
   /**
-   * Flag indicating that
-   * the update check should be performed
-   * immediately (that is, during Apply Request Values phase) rather than
-   * waiting until Render Response phase.
+   * Flag indicating that the update check should be performed immediately (that is, during Apply Request Values phase)
+   * rather than waiting until Render Response phase.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
index e963e62..ae8483a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
@@ -39,8 +39,8 @@ import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
 /**
- * A ResetInputActionListener is a declarative way to allow an action source to reset all EditableValueHolder
- * of a page or in a sub-form or part of the component tree.
+ * A ResetInputActionListener is a declarative way to allow an action source to reset all EditableValueHolder of a page
+ * or in a sub-form or part of the component tree.
  */
 @Tag(name = "resetInputActionListener")
 @SimpleTag(
@@ -62,7 +62,7 @@ public abstract class ResetInputActionListenerTag extends TagSupport {
     }
 
     if (!tag.getCreated()) {
-      return (SKIP_BODY);
+      return SKIP_BODY;
     }
 
     final UIComponent component = tag.getComponentInstance();
@@ -86,7 +86,7 @@ public abstract class ResetInputActionListenerTag extends TagSupport {
     } else {
       actionSource.addActionListener(new ValueExpressionResetInputActionListener(execute));
     }
-    return (SKIP_BODY);
+    return SKIP_BODY;
   }
 
   @Override
@@ -96,8 +96,8 @@ public abstract class ResetInputActionListenerTag extends TagSupport {
   }
 
   /**
-   * A list of ids of components. For each id, the surrounding (virtual) UIForm will be searched, and for each of
-   * them, all containing EditableValueHolder will be reset.
+   * A list of ids of components. For each id, the surrounding (virtual) UIForm will be searched, and for each of them,
+   * all containing EditableValueHolder will be reset.
    */
   @TagAttribute(required = false, name = Attributes.EXECUTE, type = "java.lang.String")
   public void setExecute(final javax.el.ValueExpression execute) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
index 9265c23..fd7162c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
@@ -44,6 +44,7 @@ public interface ScriptTagDeclaration extends HasIdBindingAndRendered {
 
   /**
    * File name to include into the rendered page.
+   *
    * @param file A JavaScript file.
    */
   @TagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
index 829ce7e..bc0654b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
@@ -62,20 +62,20 @@ import javax.faces.component.UISelectBoolean;
     rendererType = RendererTypes.SELECT_BOOLEAN_CHECKBOX,
     allowedChildComponenents = "NONE",
     facets = {
-        @Facet(name= Facets.CLICK,
+        @Facet(name = Facets.CLICK,
             description =
                 "This facet can contain a UICommand that is invoked in case of a click event from the component",
             allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
-        @Facet(name=Facets.CHANGE,
+        @Facet(name = Facets.CHANGE,
             description =
                 "This facet can contain a UICommand that is invoked in case of a change event from the component",
-                allowedChildComponenents = "org.apache.myfaces.tobago.Command")
-        })
+            allowedChildComponenents = "org.apache.myfaces.tobago.Command")
+    })
 
 public interface SelectBooleanCheckboxTagDeclaration extends HasValidator,
     HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasValue, IsDisabled,
     HasTip, IsReadonly, HasMarkup, HasCurrentMarkup, HasTabIndex,
     IsRequiredForSelect, HasConverter, IsFocus,
     HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage, IsGridLayoutComponent, HasItemLabel {
-    // IsImmediateComponent
+  // IsImmediateComponent
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
index fc56a1a..78e9d57 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
@@ -31,9 +31,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasItemLabel;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 
 /**
- * Add a child UISelectItem component to the UIComponent
- * associated with the closed parent UIComponent custom
- * action.
+ * Add a child UISelectItem component to the UIComponent associated with the closed parent UIComponent custom action.
  */
 @Tag(name = "selectItem")
 @UIComponentTag(
@@ -45,6 +43,7 @@ public interface SelectItemTagDeclaration extends HasBinding, HasId, HasMarkup,
 
   /**
    * Description of an item, might be rendered as a tool tip.
+   *
    * @deprecated since 2.0.0, please use itemTip.
    */
   @Deprecated
@@ -53,8 +52,7 @@ public interface SelectItemTagDeclaration extends HasBinding, HasId, HasMarkup,
   void setItemDescription(String itemDescription);
 
   /**
-   * Flag indicating whether the option created
-   * by this component is disabled.
+   * Flag indicating whether the option created by this component is disabled.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {"boolean"}, defaultValue = "false")
@@ -68,8 +66,7 @@ public interface SelectItemTagDeclaration extends HasBinding, HasId, HasMarkup,
   void setItemValue(String itemValue);
 
   /**
-   * Value binding expression pointing at a SelectItem instance containing
-   * the information for this option.
+   * Value binding expression pointing at a SelectItem instance containing the information for this option.
    */
   @TagAttribute
   @UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
index e7938f2..15891a1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
@@ -29,9 +29,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasId;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasItemLabel;
 
 /**
- * Add a child UISelectItems component to the UIComponent
- * associated with the closed parent UIComponent custom
- * action.
+ * Add a child UISelectItems component to the UIComponent associated with the closed parent UIComponent custom action.
  */
 @Tag(name = "selectItems")
 @UIComponentTag(
@@ -43,8 +41,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasItemLabel;
 public interface SelectItemsTagDeclaration extends HasId, HasBinding, HasItemLabel {
 
   /**
-   * Value binding expression pointing at a List or array of SelectItem instances containing
-   * the information for this option.
+   * Value binding expression pointing at a List or array of SelectItem instances containing the information for this
+   * option.
    */
   @TagAttribute
   @UIComponentTagAttribute(
@@ -53,16 +51,14 @@ public interface SelectItemsTagDeclaration extends HasId, HasBinding, HasItemLab
   void setValue(String value);
 
   /**
-   * Name of a variable under which the iterated data will be exposed.
-   * It may be referred to in EL of other attributes.
+   * Name of a variable under which the iterated data will be exposed. It may be referred to in EL of other attributes.
    */
   @TagAttribute
   @UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
   void setVar(final String var);
 
   /**
-   * Flag indicating whether the option created
-   * by this component is disabled.
+   * Flag indicating whether the option created by this component is disabled.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {"boolean"}, defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
index 5bc7abf..9091fc8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
@@ -52,25 +52,24 @@ import javax.faces.component.UISelectOne;
     allowedChildComponenents = {
         "javax.faces.SelectItem",
         "javax.faces.SelectItems"
-        },
+    },
     facets = {
-    @Facet(name= Facets.CLICK,
-        description =
-            "This facet can contain a UICommand that is invoked in case of a click event from the component",
-        allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
-    @Facet(name=Facets.CHANGE,
-        description =
-            "This facet can contain a UICommand that is invoked in case of a change event from the component",
-        allowedChildComponenents = "org.apache.myfaces.tobago.Command")
-        })
+        @Facet(name = Facets.CLICK,
+            description =
+                "This facet can contain a UICommand that is invoked in case of a click event from the component",
+            allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+        @Facet(name = Facets.CHANGE,
+            description =
+                "This facet can contain a UICommand that is invoked in case of a change event from the component",
+            allowedChildComponenents = "org.apache.myfaces.tobago.Command")
+    })
 public interface SelectOneChoiceTagDeclaration
     extends SelectOneTagDeclaration, HasId, IsDisabled,
     IsReadonly, HasLabel, IsRendered, HasConverter, HasBinding, HasTip {
 
   /**
-   * Flag indicating that selecting an Item representing a value is required.
-   * If an SelectItem was chosen which underling value is an empty string an
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that selecting an Item representing a value is required. If an SelectItem was chosen which
+   * underling value is an empty string an ValidationError occurs and a Error Message is rendered.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
index 5a81fb5..884139a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
@@ -52,24 +52,23 @@ import javax.faces.component.UISelectOne;
     allowedChildComponenents = {
         "javax.faces.SelectItem",
         "javax.faces.SelectItems"
-        },
+    },
     facets = {
-    @Facet(name=Facets.CLICK,
-        description =
-            "This facet can contain a UICommand that is invoked in case of a click event from the component",
-        allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
-    @Facet(name= Facets.CHANGE,
-        description =
-            "This facet can contain a UICommand that is invoked in case of a change event from the component",
-        allowedChildComponenents = "org.apache.myfaces.tobago.Command")
-        })
+        @Facet(name = Facets.CLICK,
+            description =
+                "This facet can contain a UICommand that is invoked in case of a click event from the component",
+            allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+        @Facet(name = Facets.CHANGE,
+            description =
+                "This facet can contain a UICommand that is invoked in case of a change event from the component",
+            allowedChildComponenents = "org.apache.myfaces.tobago.Command")
+    })
 public interface SelectOneListboxTagDeclaration extends SelectOneTagDeclaration, HasId, IsDisabled,
     IsReadonly, HasLabel, IsRendered, HasBinding, HasTip, HasConverter {
 
   /**
-   * Flag indicating that selecting an Item representing a Value is Required.
-   * If an SelectItem was chosen which underling value is an empty string an
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that selecting an Item representing a Value is Required. If an SelectItem was chosen which
+   * underling value is an empty string an ValidationError occurs and a Error Message is rendered.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
index 56f3588..88dea9e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
@@ -54,24 +54,23 @@ import javax.faces.component.UISelectOne;
     allowedChildComponenents = {
         "javax.faces.SelectItem",
         "javax.faces.SelectItems"
-        },
+    },
     facets = {
-    @Facet(name= Facets.CLICK,
-        description =
-            "This facet can contain a UICommand that is invoked in case of a click event from the component",
-        allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
-    @Facet(name=Facets.CHANGE,
-        description =
-            "This facet can contain a UICommand that is invoked in case of a change event from the component",
-        allowedChildComponenents = "org.apache.myfaces.tobago.Command")
-        })
+        @Facet(name = Facets.CLICK,
+            description =
+                "This facet can contain a UICommand that is invoked in case of a click event from the component",
+            allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+        @Facet(name = Facets.CHANGE,
+            description =
+                "This facet can contain a UICommand that is invoked in case of a change event from the component",
+            allowedChildComponenents = "org.apache.myfaces.tobago.Command")
+    })
 public interface SelectOneRadioTagDeclaration extends SelectOneTagDeclaration, IsDisabled, IsReadonly, HasId,
     HasTip, IsInline, HasRenderRange, IsRendered, HasBinding, HasConverter, HasInputLabel {
 
   /**
-   * Flag indicating that selecting an Item representing a Value is Required.
-   * If an SelectItem was chosen which underling value is an empty string an
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that selecting an Item representing a Value is Required. If an SelectItem was chosen which
+   * underling value is an empty string an ValidationError occurs and a Error Message is rendered.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
index 6af56ad..91aa0b5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
@@ -29,8 +29,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
 import javax.faces.component.UIOutput;
 
 /**
- * Renders a set of option related to and same type as the <strong>for</strong>
- * component.
+ * Renders a set of option related to and same type as the <strong>for</strong> component.
  */
 @Tag(name = "selectReference")
 @UIComponentTag(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
index 1d0e0ca..8594fa1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
@@ -56,13 +56,13 @@ import javax.faces.component.UIData;
         "javax.faces.Column",
         "org.apache.myfaces.tobago.ColumnSelector"},
     facets = {@Facet(name = Facets.RELOAD, description = "Contains an instance of UIReload",
-                     allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
-public interface SheetTagDeclaration 
+        allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
+public interface SheetTagDeclaration
     extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup,
     HasRenderedPartially, IsShowRoot, IsShowRootJunction, HasVar {
   /**
-   * LayoutConstraints for column layout.
-   * Semicolon separated list of layout tokens ('&lt;x>*', '&lt;x>px' or '&lt;x>%').
+   * LayoutConstraints for column layout. Semicolon separated list of layout tokens ('&lt;x>*', '&lt;x>px' or
+   * '&lt;x>%').
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -76,10 +76,8 @@ public interface SheetTagDeclaration
   void setShowHeader(String showHeader);
 
   /**
-   * The number of rows to display, starting with the one identified by the
-   * "first" property.
-   * <br/> The default has been changed from 100 to 0 because this is the default
-   * in the JSF standard (since Tobago 1.5).
+   * The number of rows to display, starting with the one identified by the "first" property. <br/> The default has been
+   * changed from 100 to 0 because this is the default in the JSF standard (since Tobago 1.5).
    */
   @TagAttribute
   @UIComponentTagAttribute(
@@ -131,8 +129,8 @@ public interface SheetTagDeclaration
   void setDirectLinkCount(String directLinkCount);
 
   /**
-   * Flag indicating whether or not this sheet should reserve space for
-   * vertical toolbar when calculating column width's.<br />
+   * Flag indicating whether or not this sheet should reserve space for vertical toolbar when calculating column
+   * width's.<br />
    * Possible values are: <pre>
    *      'auto'  : sheet try to estimate the need of scrollbar.
    *      'true'  : space for scrollbar is reserved.
@@ -145,8 +143,7 @@ public interface SheetTagDeclaration
   void setForceVerticalScrollbar(String forceVerticalScrollbar);
 
   /**
-   * Flag indicating whether or not a range of direct paging links should be
-   * rendered in the sheet's footer.
+   * Flag indicating whether or not a range of direct paging links should be rendered in the sheet's footer.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "center",
@@ -154,9 +151,8 @@ public interface SheetTagDeclaration
   void setShowDirectLinks(String showDirectLinks);
 
   /**
-   * Flag indicating whether and where the range pages should
-   * rendered in the sheet's footer. Rendering this range also offers the
-   * capability to enter the index displayed page directly.
+   * Flag indicating whether and where the range pages should rendered in the sheet's footer. Rendering this range also
+   * offers the capability to enter the index displayed page directly.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "right",
@@ -164,9 +160,8 @@ public interface SheetTagDeclaration
   void setShowPageRange(String showPageRange);
 
   /**
-   * Flag indicating whether or not the range of displayed rows should
-   * rendered in the sheet's footer. Rendering this range also offers the
-   * capability to enter the index of the start row directly.
+   * Flag indicating whether or not the range of displayed rows should rendered in the sheet's footer. Rendering this
+   * range also offers the capability to enter the index of the start row directly.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "left",
@@ -192,10 +187,9 @@ public interface SheetTagDeclaration
   void setState(String state);
 
   /**
-   * Method binding representing a stateChangeListener method that will be
-   * notified when the state was changed by the user.
-    * The expression must evaluate to a public method that takes a
-    * SheetStateChangeEvent parameter, with a return type of void.
+   * Method binding representing a stateChangeListener method that will be notified when the state was changed by the
+   * user. The expression must evaluate to a public method that takes a SheetStateChangeEvent parameter, with a return
+   * type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
@@ -204,16 +198,12 @@ public interface SheetTagDeclaration
   void setStateChangeListener(String stateChangeListener);
 
   /**
-   * Method binding representing an actionListener method that will be
-   * invoked when sorting was requested by the user.
-   * Use this if your application needs special handling for sorting columns.
-   * If this is not set and the sortable attribute column is set to true the sheet
-   * implementation will use a default sort method.
-   * The expression must evaluate to a public method which takes an
-   * ActionEvent as parameter and with a return type of void.
-   * The method will receive a {@link org.apache.myfaces.tobago.event.SortActionEvent}.
-   * The method should sort according to the sortColumnId and direction getting from
-   * the sheet's {@link org.apache.myfaces.tobago.model.SheetState} object.
+   * Method binding representing an actionListener method that will be invoked when sorting was requested by the user.
+   * Use this if your application needs special handling for sorting columns. If this is not set and the sortable
+   * attribute column is set to true the sheet implementation will use a default sort method. The expression must
+   * evaluate to a public method which takes an ActionEvent as parameter and with a return type of void. The method will
+   * receive a {@link org.apache.myfaces.tobago.event.SortActionEvent}. The method should sort according to the
+   * sortColumnId and direction getting from the sheet's {@link org.apache.myfaces.tobago.model.SheetState} object.
    */
   @TagAttribute
   @UIComponentTagAttribute(
@@ -224,6 +214,7 @@ public interface SheetTagDeclaration
 
   /**
    * Flag indicating if paging arrows are shown near direct links
+   *
    * @since 2.0.0
    */
   @TagAttribute
@@ -232,6 +223,7 @@ public interface SheetTagDeclaration
 
   /**
    * Flag indicating if paging arrows are shown near page range
+   *
    * @since 2.0.0
    */
   @TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SplitLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SplitLayoutTagDeclaration.java
index 89a6256..e37bbdc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SplitLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SplitLayoutTagDeclaration.java
@@ -33,11 +33,10 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasMargins;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasSpacing;
 
-  /**
-   * Renders a SplitLayout.
-   * A area with two child components rendered horizontally or vertically and allows to change the
-   * layout relation of this two components on the client.
-   */
+/**
+ * Renders a SplitLayout. A area with two child components rendered horizontally or vertically and allows to change the
+ * layout relation of this two components on the client.
+ */
 @Tag(name = "splitLayout")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UISplitLayout",
@@ -50,17 +49,15 @@ public interface SplitLayoutTagDeclaration extends HasId, HasBorder, HasSpacing,
     HasMargins, HasBinding, HasMarkup, HasCurrentMarkup {
 
   /**
-   * This value defines the layout constraints for the layout.
-   * It is two layout tokens separated by a semicolon. See GridLayout.
-   * Example: '2*;*'.
+   * This value defines the layout constraints for the layout. It is two layout tokens separated by a semicolon. See
+   * GridLayout. Example: '2*;*'.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "1*;1*")
   void setLayout(String rows);
 
   /**
-   * This value defines the orientation of the split layout.
-   * Possible values are 'HORIZONTAL' and 'VERTICAL'.
+   * This value defines the orientation of the split layout. Possible values are 'HORIZONTAL' and 'VERTICAL'.
    */
 
   @TagAttribute(required = true)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
index ddf3d4e..897d3e2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
@@ -53,6 +53,7 @@ public interface StyleTagDeclaration extends HasIdBindingAndRendered {
 
   /**
    * stylesheet to add to page.
+   *
    * @deprecated inline styles are deprecated because of CSP
    */
   @Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
index 6e2f59f..6ee02da 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
@@ -34,7 +34,7 @@ import javax.faces.component.UIInput;
 
 /**
  * Renders a list of suggested texts for a given input field.
- *
+ * <p>
  * Basic features:
  * <ul>
  *   <li>provide a list directly while rendering (not AJAX needed) [todo]</li>
@@ -76,9 +76,8 @@ public interface SuggestTagDeclaration extends HasIdBindingAndRendered, HasMarku
   void setSuggestMethod(String suggestMethod);
 
   /**
-   * Minimum number of characters to type before the list will be requested.
-   * If the value is 0, there will be send an initial list to the client.
-   * So, if you set <pre>update="false"</pre> this value should be 0.
+   * Minimum number of characters to type before the list will be requested. If the value is 0, there will be send an
+   * initial list to the client. So, if you set <pre>update="false"</pre> this value should be 0.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "1")
@@ -99,10 +98,9 @@ public interface SuggestTagDeclaration extends HasIdBindingAndRendered, HasMarku
   void setMaximumItems(String maximumItems);
 
   /**
-   * The real size of the result list.
-   * Typically the result list will be cropped (in the backend) to save memory.
-   * This value can be set, to show the user there are more results for the given string.
-   * If the value is -1, no hint will be displayed.
+   * The real size of the result list. Typically the result list will be cropped (in the backend) to save memory. This
+   * value can be set, to show the user there are more results for the given string. If the value is -1, no hint will be
+   * displayed.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "-1")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
index 6df8e08..e86b35c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
@@ -36,8 +36,8 @@ import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
 /**
- * Register an TabChangedListener instance on the UIComponent
- * associated with the closest parent UIComponent custom action.
+ * Register an TabChangedListener instance on the UIComponent associated with the closest parent UIComponent custom
+ * action.
  */
 @Tag(name = "tabChangeListener")
 @SimpleTag(
@@ -50,8 +50,7 @@ public abstract class TabChangeListenerTag extends TagSupport {
   private ValueExpression binding;
 
   /**
-   * Fully qualified Java class name of a TabChangeListener to be
-   * created and registered.
+   * Fully qualified Java class name of a TabChangeListener to be created and registered.
    */
   @TagAttribute(required = true, name = "type", type = "java.lang.String")
   public void setType(final ValueExpression type) {
@@ -68,10 +67,9 @@ public abstract class TabChangeListenerTag extends TagSupport {
 
   /**
    * <p>Create a new instance of the specified {@link TabChangeListener}
-   * class, and register it with the {@link javax.faces.component.UIComponent} instance associated
-   * with our most immediately surrounding {@link javax.faces.webapp.UIComponentELTag} instance, if
-   * the {@link javax.faces.component.UIComponent} instance was created by this execution of the
-   * containing JSP page.</p>
+   * class, and register it with the {@link javax.faces.component.UIComponent} instance associated with our most
+   * immediately surrounding {@link javax.faces.webapp.UIComponentELTag} instance, if the {@link
+   * javax.faces.component.UIComponent} instance was created by this execution of the containing JSP page.</p>
    *
    * @throws JspException if a JSP error occurs
    */
@@ -86,7 +84,7 @@ public abstract class TabChangeListenerTag extends TagSupport {
     }
 
     if (!tag.getCreated()) {
-      return (SKIP_BODY);
+      return SKIP_BODY;
     }
 
     final UIComponent component = tag.getComponentInstance();
@@ -126,7 +124,7 @@ public abstract class TabChangeListenerTag extends TagSupport {
       }
     }
 
-    return (SKIP_BODY);
+    return SKIP_BODY;
   }
 
   /**
@@ -138,7 +136,7 @@ public abstract class TabChangeListenerTag extends TagSupport {
   protected TabChangeListener createTabChangeListener(final String className) throws JspException {
     try {
       final Class clazz = getClass().getClassLoader().loadClass(className);
-      return ((TabChangeListener) clazz.newInstance());
+      return (TabChangeListener) clazz.newInstance();
     } catch (final Exception e) {
       throw new JspException(e);
     }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
index 3f2458f..86c99eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
@@ -76,20 +76,19 @@ public interface TabGroupTagDeclaration
    *   <dt>reloadTab</dt>
    *   <dd>Tab switching is done by server request. Only the Tab is reloaded.</dd>
    * </dl>
+   *
    * @param switchType Sets the switching type.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.String",
       allowedValues = {AbstractUITabGroup.SWITCH_TYPE_CLIENT, AbstractUITabGroup.SWITCH_TYPE_RELOAD_PAGE,
-              AbstractUITabGroup.SWITCH_TYPE_RELOAD_TAB},
+          AbstractUITabGroup.SWITCH_TYPE_RELOAD_TAB},
       defaultValue = AbstractUITabGroup.SWITCH_TYPE_CLIENT)
   void setSwitchType(String switchType);
 
   /**
-   *
    * <strong>ValueBindingExpression</strong> pointing to a Integer to save the
    * component's selected Tab.
-   *
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "0")
@@ -101,7 +100,7 @@ public interface TabGroupTagDeclaration
   @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "0")
   void setRenderedIndex(String renderedIndex);
 
-  @TagAttribute  
+  @TagAttribute
   @UIComponentTagAttribute(
       type = {},
       expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupToolBarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupToolBarTagDeclaration.java
index e3e9fce..d2dfdf2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupToolBarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupToolBarTagDeclaration.java
@@ -32,5 +32,5 @@ import javax.faces.component.UIPanel;
     rendererType = RendererTypes.TAB_GROUP_TOOL_BAR,
     allowedChildComponenents = {
         "org.apache.myfaces.tobago.Command"})
-public interface TabGroupToolBarTagDeclaration extends ToolBarTagDeclaration{
+public interface TabGroupToolBarTagDeclaration extends ToolBarTagDeclaration {
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java
index 40490c7..d2a5261 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java
@@ -31,16 +31,12 @@ import javax.faces.component.UIPanel;
 
 /**
  * <p/>
- * Renders a toolbar.<p />
- * Allowed subcomponents are subtypes of UICommand i.e.
+ * Renders a toolbar.<p /> Allowed subcomponents are subtypes of UICommand i.e.
  * <code>'button'</code> and <code>'link'</code> tags.
- * These are rendered by ToolbarRenderer, so the result has
- * no difference.<p />
- * To add an drop down menu to a button add a facet <code>'dropDownMenu'</code>
- * containing a
+ * These are rendered by ToolbarRenderer, so the result has no difference.<p /> To add an drop down menu to a button add
+ * a facet <code>'dropDownMenu'</code> containing a
  * <a href="menu.html"><code>&lt;tc:menu></code></a>
- * tag to the button. Label's and Image's on those menu tag's are ignored
- * and replaced by the renderer.
+ * tag to the button. Label's and Image's on those menu tag's are ignored and replaced by the renderer.
  * <pre>
  *      &lt;tc:button onclick="alert('test 0')"
  *          label="Alert 0" &gt;
@@ -69,8 +65,8 @@ import javax.faces.component.UIPanel;
         "org.apache.myfaces.tobago.Command"})
 public interface ToolBarTagDeclaration extends PanelTagDeclaration {
   /**
-   * Position of the button label, possible values are: right, bottom, off.
-   * If toolbar is facet of box: bottom is changed to right!
+   * Position of the button label, possible values are: right, bottom, off. If toolbar is facet of box: bottom is
+   * changed to right!
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = AbstractUIToolBar.LABEL_BOTTOM,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java
index 551653e..f9bfb2a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java
@@ -30,8 +30,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasVar;
 import javax.faces.component.UIInput;
 
 /**
- * Describes a sub tree of nodes.
- * The value has to be a javax.swing.tree.TreeNode object to use as rootNode in the tree.
+ * Describes a sub tree of nodes. The value has to be a javax.swing.tree.TreeNode object to use as rootNode in the
+ * tree.
  *
  * @deprecated since 2.0.0. Please use the "var" and "value" attribute of the parent tree tag.
  */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
index 5e98f0a..5a2968d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
@@ -56,8 +56,7 @@ public interface TreeListboxTagDeclaration
     IsRequired {
 
   /**
-   * Flag indicating whether or not this component should be render selectable items.
-   * Possible values are:
+   * Flag indicating whether or not this component should be render selectable items. Possible values are:
    * <ul>
    * <li><strong>single</strong> : a single section tree is rendered</li>
    * <li><strong>multiLeafOnly</strong> : a multi section tree is rendered,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
index d078353..8df7114 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
@@ -37,8 +37,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRoot;
 import javax.faces.component.UIData;
 
 /**
- * A tree which will be displayed like a flat menu.
- * This menu is often used for navigation on the left side of an application.
+ * A tree which will be displayed like a flat menu. This menu is often used for navigation on the left side of an
+ * application.
  */
 @Tag(name = "treeMenu")
 @BodyContentDescription(anyTagOf = "<tc:treeData>")
@@ -51,13 +51,12 @@ import javax.faces.component.UIData;
     allowedChildComponenents = {
         "org.apache.myfaces.tobago.TreeNode",
         "org.apache.myfaces.tobago.TreeData"
-        })
+    })
 public interface TreeMenuTagDeclaration
     extends HasIdBindingAndRendered, HasValue, HasVar, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup,
     IsShowRoot {
 
   /**
-   *
    * <strong>ValueBindingExpression</strong> pointing to a object to save the
    * component's state.
    */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
index c19b06d..3fb9ee9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
@@ -52,11 +52,12 @@ import javax.faces.component.UIColumn;
         "org.apache.myfaces.tobago.TreeData"
     })
 public interface
-    TreeNodeTagDeclaration
+TreeNodeTagDeclaration
     extends HasIdBindingAndRendered, HasMarkup, HasCurrentMarkup, HasTip, IsDisabled, IsGridLayoutContainer {
 
   /**
    * Flag indicating if the subnodes are to be displayed.
+   *
    * @deprecated since 2.0.0. Please use the state attribute of the tree with a TreeState
    */
   @Deprecated
@@ -66,6 +67,7 @@ public interface
 
   /**
    * Flag indicating if the node is marked, and should be displayed in a special way.
+   *
    * @deprecated since 2.0.0. Please use the state attribute of the tree with a TreeState
    */
   @Deprecated
@@ -75,6 +77,7 @@ public interface
 
   /**
    * Flag indicating if the node is selected (only possible, when the tree component allows it).
+   *
    * @deprecated since 2.0.0. Please use <code>&lt;tc:treeSelect></code>
    */
   @Deprecated
@@ -94,8 +97,10 @@ public interface
 
   /**
    * Method binding representing a markedListener method that ....
+   *
    * @deprecated since 2.0.0.
    */
+  @Deprecated
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       generate = false,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
index 1957352..d6afbed 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
@@ -53,12 +53,12 @@ import javax.faces.component.UISelectBoolean;
     allowedChildComponenents = "NONE")
 public interface TreeSelectTagDeclaration
     extends HasIdBindingAndRendered, HasLabel, HasTip, HasMarkup, HasCurrentMarkup, HasValue, HasValueChangeListener,
-        IsDisabled, IsRequiredForSelect, HasConverter,
-        HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage {
+    IsDisabled, IsRequiredForSelect, HasConverter,
+    HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage {
 
   /**
-   * Show a checkbox to visualize the selection state.
-   * This is useful to hide the checkbox, e. g. dependent of the type of the node.
+   * Show a checkbox to visualize the selection state. This is useful to hide the checkbox, e. g. dependent of the type
+   * of the node.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
index 6fd99bd..98d550b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
@@ -38,8 +38,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRootJunction;
 import javax.faces.component.UIData;
 
 /**
- * A tree with classical look. 
- * Usually used with icons and junction lines to open folder, etc.
+ * A tree with classical look. Usually used with icons and junction lines to open folder, etc.
  */
 @Tag(name = "tree")
 @BodyContentDescription(anyTagOf = "<tc:treeData>")
@@ -52,14 +51,13 @@ import javax.faces.component.UIData;
     allowedChildComponenents = {
         "org.apache.myfaces.tobago.TreeNode",
         "org.apache.myfaces.tobago.TreeData"
-        })
+    })
 public interface TreeTagDeclaration
     extends HasIdBindingAndRendered, HasValue, HasVar, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup,
     IsShowRoot, IsShowRootJunction {
 
   /**
-   * Flag indicating whether or not this component should be render selectable items.
-   * Possible values are:
+   * Flag indicating whether or not this component should be render selectable items. Possible values are:
    * <ul>
    * <li><strong>none</strong> : not selectable</li>
    * <li><strong>multi</strong> : a multi section tree is rendered</li>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java
index adb5e43..e106d7b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java
@@ -36,8 +36,8 @@ import javax.faces.webapp.ValidatorELTag;
 import javax.servlet.jsp.JspException;
 
 /**
- * Register an FileItemValidator instance on the UIComponent
- * associated with the closest parent UIComponent custom action.
+ * Register an FileItemValidator instance on the UIComponent associated with the closest parent UIComponent custom
+ * action.
  */
 @Tag(name = "validateFileItem")
 @ValidatorTag(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java
index 2521019..d50d9b8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java
@@ -33,10 +33,9 @@ import javax.faces.webapp.ValidatorELTag;
 import javax.servlet.jsp.JspException;
 
 /**
- * Register an SubmittedValueLengthValidator instance on the UIComponent
- * associated with the closest parent UIComponent custom action.
- * The standard LengthValidator validate the length on the converted value.toString()
- * not on the submitted value. Sometime you need to check the length of the submitted value.
+ * Register an SubmittedValueLengthValidator instance on the UIComponent associated with the closest parent UIComponent
+ * custom action. The standard LengthValidator validate the length on the converted value.toString() not on the
+ * submitted value. Sometime you need to check the length of the submitted value.
  */
 @Tag(name = "validateSubmittedValueLength")
 @ValidatorTag(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
index 3144496..8070cf5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
@@ -47,7 +47,7 @@ import javax.faces.component.UIPanel;
     uiComponentFacesClass = "javax.faces.component.UIPanel",
     componentFamily = UIPanel.COMPONENT_FAMILY,
     rendererType = RendererTypes.WIZARD)
-public interface WizardTagDeclaration 
+public interface WizardTagDeclaration
     extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup {
 
   @TagAttribute(required = true)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/Component.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/Component.java
index 3a2b24b..88e163d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/Component.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/Component.java
@@ -29,21 +29,15 @@ public interface Component {
   void setId(String s);
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
-   *
-   * @param s
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
 
   @TagAttribute
   void setRendered(String s);
 
   /**
-   * The value binding expression linking this component to a property
-   * in a backing bean
-   *
-   * @param binding
-   * @throws JspException
+   * The value binding expression linking this component to a property in a backing bean
    */
 
   @TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
index 1d1c39e..33f6e4a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
@@ -25,13 +25,10 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasAction {
   /**
-   * Action to invoke when clicked.
-   * This must be a MethodBinding or a String representing the application action to invoke when
-   * this component is activated by the user.
-   * The MethodBinding must evaluate to a public method that takes no parameters,
-   * and returns a String (the logical outcome) which is passed to the
-   * NavigationHandler for this application.
-   * The string is directly passed to the navigation handler.
+   * Action to invoke when clicked. This must be a MethodBinding or a String representing the application action to
+   * invoke when this component is activated by the user. The MethodBinding must evaluate to a public method that takes
+   * no parameters, and returns a String (the logical outcome) which is passed to the NavigationHandler for this
+   * application. The string is directly passed to the navigation handler.
    */
   @TagAttribute
   @UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
index 881f1cb..9bc9a52 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
@@ -25,10 +25,9 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasActionListener {
   /**
-   * MethodBinding representing an action listener method that will be
-   * notified when this component is activated by the user.
-   * The expression must evaluate to a public method that takes an ActionEvent
-   * parameter, with a return type of void.
+   * MethodBinding representing an action listener method that will be notified when this component is activated by the
+   * user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of
+   * void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasColumnLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasColumnLayout.java
index fd5f191..9de75c2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasColumnLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasColumnLayout.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasColumnLayout {
   /**
-   * This value defines the layout constraints for column layout.
-   * It is a semicolon separated list of layout tokens '[&lt;n>]*', '&lt;n>px' or 'auto'.
-   * Where &lt;n> is a non negative integer and the square brackets means optional.
+   * This value defines the layout constraints for column layout. It is a semicolon separated list of layout tokens
+   * '[&lt;n>]*', '&lt;n>px' or 'auto'. Where &lt;n> is a non negative integer and the square brackets means optional.
    * Example: '2*;*;100px;auto'.
    */
   @TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java
index a68239a..798dced 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java
@@ -25,13 +25,9 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasConverter {
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCurrentMarkup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCurrentMarkup.java
index 099e5c2..e79a109 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCurrentMarkup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCurrentMarkup.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasCurrentMarkup {
-  
+
   /**
-   * The current markup is the current internal state of the markup.
-   * It is the same as markup plus additional values like "required", "error", "selected", ....
+   * The current markup is the current internal state of the markup. It is the same as markup plus additional values
+   * like "required", "error", "selected", ....
    */
   @UIComponentTagAttribute(
       type = "org.apache.myfaces.tobago.context.Markup",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasFieldId.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasFieldId.java
index 32ea162..df39050 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasFieldId.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasFieldId.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasFieldId {
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasId.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasId.java
index 958eaa0..5090f4c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasId.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasId.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasId {
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute(type = "java.lang.String")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabel.java
index c1d20b1..68ebe71 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabel.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasLabel {
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey (if configured so and possible).
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey (if
+   * configured so and possible).
    */
   @TagAttribute
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabelWidth.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabelWidth.java
index 6d7f2b2..e21de3f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabelWidth.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabelWidth.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasLabelWidth {
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLink.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLink.java
index 3c49935..b0a821a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLink.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLink.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface HasLink {
   /**
    * Link to an arbitrary URL, either an internal link or an external link.
-
+   *
    * <dl>
    *   <dt>internal absolute link</dt>
    *   <dd>Starts with a slash '/' character. The context path will be added.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMargin.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMargin.java
index 2469542..e78ef1a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMargin.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMargin.java
@@ -22,7 +22,9 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
-/** @deprecated since Tobago 2.0.9. Please use {@link HasMargins} */
+/**
+ * @deprecated since Tobago 2.0.9. Please use {@link HasMargins}
+ */
 @Deprecated
 public interface HasMargin {
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMarkup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMarkup.java
index 7a40e3b..5fa7ef6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMarkup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMarkup.java
@@ -23,11 +23,10 @@ import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasMarkup {
-  
+
   /**
-   * Indicate markup of this component.
-   * The allowed markups can be defined or overridden in the theme.
-   * The value 'none' should not be used any longer. Just leave the attribute empty, or use a NULL pointer. 
+   * Indicate markup of this component. The allowed markups can be defined or overridden in the theme. The value 'none'
+   * should not be used any longer. Just leave the attribute empty, or use a NULL pointer.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.context.Markup")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnchange.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnchange.java
index b633fd9..501ddaf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnchange.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnchange.java
@@ -22,12 +22,15 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
-/** @deprecated Since 2.0.0. This attribute work not with SCP */
+/**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
 @Deprecated
 public interface HasOnchange {
 
   /**
    * Client side script function to add to this component's onchange handler.
+   *
    * @deprecated Since 2.0.0. This attribute work not with SCP
    */
   @Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnclick.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnclick.java
index 452d094..744caa1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnclick.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnclick.java
@@ -29,8 +29,6 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface HasOnclick {
   /**
    * Script to be invoked when clicked
-   *
-   * @param onclick
    */
   @TagAttribute
   @UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasPlaceholder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasPlaceholder.java
index d229e13..c5a2a83 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasPlaceholder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasPlaceholder.java
@@ -25,10 +25,11 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface HasPlaceholder {
 
   /**
-   * Displays a short text in the input field, that describes the meaning of this field.
-   * This is part of HTML 5, the theme should emulate the behaviour, when the browser doesn't support it.
+   * Displays a short text in the input field, that describes the meaning of this field. This is part of HTML 5, the
+   * theme should emulate the behaviour, when the browser doesn't support it.
    * <p/>
    * The text will not be displayed, when the input field is readonly or disabled.
+   *
    * @param placeholder The text to display
    */
   @TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java
index 88b4044..6a3ecfc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java
@@ -55,7 +55,7 @@ public interface HasRenderedPartially {
    * You can also use @this for the component itself.
    * </p>
    */
-   @TagAttribute
-   @UIComponentTagAttribute(type = "java.lang.String[]")
-   void setRenderedPartially(String componentIds);
+  @TagAttribute
+  @UIComponentTagAttribute(type = "java.lang.String[]")
+  void setRenderedPartially(String componentIds);
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasResource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasResource.java
index 8fb8269..f0e8208 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasResource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasResource.java
@@ -24,10 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasResource {
   /**
-   * Link to an internal resource.
-   * Resources will be processed by the resource management.
-   * E. g. define help.html and it will be served help_es.html or help_de.html if available.
-   * For JSF-Pages you have to set the jsfResource attribute.
+   * Link to an internal resource. Resources will be processed by the resource management. E. g. define help.html and it
+   * will be served help_es.html or help_de.html if available. For JSF-Pages you have to set the jsfResource attribute.
    *
    * @param resource The internal resource.
    * @see #setJsfResource(String)
@@ -37,9 +35,8 @@ public interface HasResource {
   void setResource(String resource);
 
   /**
-   * Flag indicating that the resource referenced by the resource attribute is a jsf resource.
-   * That means that the url has to be processed to change the prefix or suffix (e. g. *.jsf or
-   * /faces/*). Default is false.
+   * Flag indicating that the resource referenced by the resource attribute is a jsf resource. That means that the url
+   * has to be processed to change the prefix or suffix (e. g. *.jsf or /faces/*). Default is false.
    *
    * @param jsfResource Is the Resource a JSF page or not?
    */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRowLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRowLayout.java
index 795ee0f..809a969 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRowLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRowLayout.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasRowLayout {
   /**
-   * This value defines the layout constraints for column layout.
-   * It is a semicolon separated list of layout tokens '[&lt;n>]*', '&lt;n>px' or 'auto'.
-   * Where &lt;n> is a non negative integer and the square brackets means optional.
+   * This value defines the layout constraints for column layout. It is a semicolon separated list of layout tokens
+   * '[&lt;n>]*', '&lt;n>px' or 'auto'. Where &lt;n> is a non negative integer and the square brackets means optional.
    * Example: '2*;*;100px;auto'.
    */
   @TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSanitize.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSanitize.java
index f573445..07d363e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSanitize.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSanitize.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasSanitize {
   /**
-   * Should HTML content sanitized?
-   * The effect of sanitizing depends on the configuration.
-   * The value "auto" means, that sanitizing take place for
+   * Should HTML content sanitized? The effect of sanitizing depends on the configuration. The value "auto" means, that
+   * sanitizing take place for
    * <ul>
    *   <li>tc:out when escape="false" or</li>
    *   <li>tc:textarea when attribute data-html-editor is set,</li>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSpacing.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSpacing.java
index 8d2df8d..4e4fcec 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSpacing.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSpacing.java
@@ -25,8 +25,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface HasSpacing {
 
   /**
-   * Spacing between component and layout cell's.
-   * Can be overwritten by columnSpacing and rowSpacing.
+   * Spacing between component and layout cell's. Can be overwritten by columnSpacing and rowSpacing.
    *
    * @deprecated Use columnSpacing and/or rowSpacing instead.
    */
@@ -42,7 +41,7 @@ public interface HasSpacing {
   @TagAttribute
   @UIComponentTagAttribute(
       type = "org.apache.myfaces.tobago.layout.Measure",
-      defaultCode = "getCellspacing() != null\n" 
+      defaultCode = "getCellspacing() != null\n"
           + " ? getCellspacing()\n : getRendererType() != null"
           + " ? ((SpacingValues)getRenderer(getFacesContext())).getColumnSpacing(getFacesContext(), this)"
           + " : Measure.ZERO")
@@ -54,7 +53,7 @@ public interface HasSpacing {
   @TagAttribute
   @UIComponentTagAttribute(
       type = "org.apache.myfaces.tobago.layout.Measure",
-      defaultCode = "getCellspacing() != null\n" 
+      defaultCode = "getCellspacing() != null\n"
           + " ? getCellspacing()\n : getRendererType() != null"
           + " ? ((SpacingValues)getRenderer(getFacesContext())).getRowSpacing(getFacesContext(), this) : Measure.ZERO")
   void setRowSpacing(String rowSpacing);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
index 241ca80..eb02cdc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
@@ -30,11 +30,10 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface HasSuggestMethod {
 
   /**
-   * MethodBinding which generates a list of suggested input values based on
-   * the currently entered text, which could be retrieved via getSubmittedValue() on the UIIn.
-   * The expression has to evaluate to a public method which has a javax.faces.component.UIInput parameter
-   * and returns a List&lt;String>(deprecated), a List&lt;org.apache.myfaces.tobago.model.AutoSuggestItem>
-   * or a org.apache.myfaces.tobago.model.AutoSuggestItems.
+   * MethodBinding which generates a list of suggested input values based on the currently entered text, which could be
+   * retrieved via getSubmittedValue() on the UIIn. The expression has to evaluate to a public method which has a
+   * javax.faces.component.UIInput parameter and returns a List&lt;String>(deprecated), a
+   * List&lt;org.apache.myfaces.tobago.model.AutoSuggestItem> or a org.apache.myfaces.tobago.model.AutoSuggestItems.
    *
    * @deprecated since 2.0.0, please use tc:suggest
    */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabChangeListenerType.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabChangeListenerType.java
index 7494a0d..28c05b9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabChangeListenerType.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabChangeListenerType.java
@@ -24,8 +24,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasTabChangeListenerType {
   /**
-   * Fully qualified Java class name of a TabChangeListener to be
-   * created and registered.
+   * Fully qualified Java class name of a TabChangeListener to be created and registered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {"java.util.List", "java.util.Map", "java.lang.Object[]"})
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabIndex.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabIndex.java
index 740b6cf..900a869 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabIndex.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabIndex.java
@@ -25,16 +25,10 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface HasTabIndex {
 
   /**
-   * Controls the navigation of the focus through the
-   * input controls on a page with the Tab-Key.
-   * The navigation starts from the element with
-   * the lowest tabIndex value to the element with the highest value.
-   * Elements that have identical tabIndex values should be navigated
-   * in the order they appear in the character stream
-   * Elements that are disabled or with a negative tabIndex
-   * do not participate in the tabbing order.
-   *
-   * @param tabIndex
+   * Controls the navigation of the focus through the input controls on a page with the Tab-Key. The navigation starts
+   * from the element with the lowest tabIndex value to the element with the highest value. Elements that have identical
+   * tabIndex values should be navigated in the order they appear in the character stream Elements that are disabled or
+   * with a negative tabIndex do not participate in the tabbing order.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTarget.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTarget.java
index 15e21dc..0e390c8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTarget.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTarget.java
@@ -24,8 +24,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasTarget {
   /**
-   * Name of a frame where the resource retrieved via this hyperlink is to be
-   * displayed.
+   * Name of a frame where the resource retrieved via this hyperlink is to be displayed.
    */
   @TagAttribute
   @UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
index 0ebea59..60bcb54 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
@@ -25,14 +25,12 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasValidator {
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   void setValidator(String validator);
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
index 5097c87..5640609 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
@@ -25,12 +25,9 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface HasValueChangeListener {
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java
index 49cd3d9..6bdb76a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java
@@ -26,9 +26,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface HasVar {
 
   /**
-   * Name of a request-scope attribute under which the model data for the row
-   * selected by the current value of the "rowIndex" property
-   * (i.e. also the current value of the "rowData" property) will be exposed.
+   * Name of a request-scope attribute under which the model data for the row selected by the current value of the
+   * "rowIndex" property (i.e. also the current value of the "rowData" property) will be exposed.
    */
   @TagAttribute(required = true)
   @UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDefaultCommand.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDefaultCommand.java
index 1f8fc90..c72cb8f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDefaultCommand.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDefaultCommand.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface IsDefaultCommand {
   /**
-   * If true the command is executed as default -- for example if the
-   * user presses the enter key inside a related input field.
+   * If true the command is executed as default -- for example if the user presses the enter key inside a related input
+   * field.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDraggable.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDraggable.java
index 3172b89..8335ae3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDraggable.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDraggable.java
@@ -35,8 +35,7 @@ public interface IsDraggable {
   void setDraggable(String draggable);
 
   /**
-   * Indicate draggable of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate draggable of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.String[]")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentBase.java
index ba46aa5..2b1ee18 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentBase.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 /**
- * @deprecated This class should not be used directly, please use IsGridLayoutComponent. 
+ * @deprecated This class should not be used directly, please use IsGridLayoutComponent.
  */
 @Deprecated
 public interface IsGridLayoutComponentBase {
@@ -44,7 +44,7 @@ public interface IsGridLayoutComponentBase {
   @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
       defaultCode = "getHeight()")
   void setCurrentHeight(String currentHeight);
-  
+
   /**
    * @param columnSpan The number of horizontal cells this component should use.
    */
@@ -176,5 +176,5 @@ public interface IsGridLayoutComponentBase {
    */
   @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Display")
   void setDisplay(String display);
-  
+
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentWithDimension.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentWithDimension.java
index 1f6f89b..85807b3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentWithDimension.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentWithDimension.java
@@ -23,14 +23,14 @@ import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 /**
- * The width and height attributes can be set explicitly on some components.
- * Generally it should be checked, if using of a layout manager is a better alternative.
+ * The width and height attributes can be set explicitly on some components. Generally it should be checked, if using of
+ * a layout manager is a better alternative.
  */
 public interface IsGridLayoutComponentWithDimension extends IsGridLayoutComponentBase {
 
   /**
-   * The width of the component in the UI.
-   * This value will usually be set by the layout manager, but can be set explicitly here.
+   * The width of the component in the UI. This value will usually be set by the layout manager, but can be set
+   * explicitly here.
    *
    * @param width The width for this component.
    */
@@ -41,8 +41,8 @@ public interface IsGridLayoutComponentWithDimension extends IsGridLayoutComponen
   void setWidth(String width);
 
   /**
-   * The height of the component in the UI.
-   * This value will usually be set by the layout manager, but can be set explicitly here.
+   * The height of the component in the UI. This value will usually be set by the layout manager, but can be set
+   * explicitly here.
    *
    * @param height The height for this component.
    */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsImmediateCommand.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsImmediateCommand.java
index 6cb282f..afc198d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsImmediateCommand.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsImmediateCommand.java
@@ -25,10 +25,9 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface IsImmediateCommand {
 
   /**
-   * Flag indicating that, if this component is activated by the user,
-   * notifications should be delivered to interested listeners and actions
-   * immediately (that is, during Apply Request Values phase) rather than
-   * waiting until Invoke Application phase.
+   * Flag indicating that, if this component is activated by the user, notifications should be delivered to interested
+   * listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke
+   * Application phase.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsOmit.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsOmit.java
index a97141c..7367f38 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsOmit.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsOmit.java
@@ -24,12 +24,10 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface IsOmit {
   /**
-   * Flag indicating that the action of this element, will not be executed from client side
-   * (e. g. when the user clicks a button.
-   * When setting this value to true, the action will not be executed by the Tobago, but it can executed
-   * by JavaScript.
-   * This attribute is useful, when you want to add JavaScript event handlers to commands manually.
-   * In this case you usually don't want a submit with a full reload of the page.
+   * Flag indicating that the action of this element, will not be executed from client side (e. g. when the user clicks
+   * a button. When setting this value to true, the action will not be executed by the Tobago, but it can executed by
+   * JavaScript. This attribute is useful, when you want to add JavaScript event handlers to commands manually. In this
+   * case you usually don't want a submit with a full reload of the page.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsPassword.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsPassword.java
index 20c234c..1aba8d6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsPassword.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsPassword.java
@@ -25,8 +25,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface IsPassword {
 
   /**
-   * Flag indicating whether or not this component should be rendered as
-   * password field , so you will not see the typed charakters.
+   * Flag indicating whether or not this component should be rendered as password field , so you will not see the typed
+   * charakters.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRendered.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRendered.java
index 0a80135..c0b9393 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRendered.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRendered.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface IsRendered {
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequired.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequired.java
index 85c1413..1dea01e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequired.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequired.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface IsRequired {
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequiredForSelect.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequiredForSelect.java
index 9aac147..c713139 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequiredForSelect.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequiredForSelect.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface IsRequiredForSelect {
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRoot.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRoot.java
index d254e2a..9637637 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRoot.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRoot.java
@@ -25,9 +25,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface IsShowRoot {
 
   /**
-   * Only applicable in the case that the data model is a tree.
-   * This flag indicates that the root node should be displayed.
-   * Often in tree structures the root node is special and should not be displayed.
+   * Only applicable in the case that the data model is a tree. This flag indicates that the root node should be
+   * displayed. Often in tree structures the root node is special and should not be displayed.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRootJunction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRootJunction.java
index 46d23b0..bbeddac 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRootJunction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRootJunction.java
@@ -25,8 +25,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 public interface IsShowRootJunction {
 
   /**
-   * Only applicable in the case that the data model is a tree.
-   * This flag indicates that the root node should be displayed with an open-close-switch.
+   * Only applicable in the case that the data model is a tree. This flag indicates that the root node should be
+   * displayed with an open-close-switch.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsTransition.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsTransition.java
index 9998545..3ea6ea2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsTransition.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsTransition.java
@@ -24,8 +24,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 public interface IsTransition {
   /**
-   * Specify, if the command calls an JSF-Action.
-   * Useful to switch off the Double-Submit-Check and Waiting-Behavior.
+   * Specify, if the command calls an JSF-Action. Useful to switch off the Double-Submit-Check and Waiting-Behavior.
    *
    * @param transition Indicates the transition.
    */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
index 7e82a00..5ad3ffe 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
@@ -33,9 +33,7 @@ import javax.el.ValueExpression;
 import javax.servlet.jsp.JspException;
 
 /**
- * Renders a date input field with a date picker and a label.
- * <br />
- * Short syntax of:
+ * Renders a date input field with a date picker and a label. <br /> Short syntax of:
  * <p/>
  * <pre>
  * &lt;tc:panel>
@@ -256,23 +254,21 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -308,8 +304,7 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -318,8 +313,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -328,13 +323,9 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -344,15 +335,13 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
@@ -376,9 +365,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -396,8 +384,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Displays a short text in the input field, that describes the meaning of this field.
-   * This is part of HTML 5, the theme should emulate the behaviour, when the browser doesn't support it.
+   * Displays a short text in the input field, that describes the meaning of this field. This is part of HTML 5, the
+   * theme should emulate the behaviour, when the browser doesn't support it.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -405,10 +393,9 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
     this.placeholder = placeholder;
   }
 
-   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+  /**
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -417,8 +404,7 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.String[]", defaultValue = "none")
@@ -460,8 +446,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -470,8 +456,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the automatically created picker component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the automatically created picker component inside of the container. This value must be
+   * unique within the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -480,8 +466,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the automatically created form component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the automatically created form component inside of the container. This value must be
+   * unique within the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -490,10 +476,9 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
index 9058747..a592312 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
@@ -18,6 +18,7 @@
  */
 
 package org.apache.myfaces.tobago.internal.taglib.extension;
+
 import org.apache.myfaces.tobago.component.UIExtensionPanel;
 import org.apache.myfaces.tobago.component.UIPanel;
 import org.apache.myfaces.tobago.internal.taglib.TobagoELTag;
@@ -31,13 +32,14 @@ import javax.faces.context.FacesContext;
 
 public final class ExtensionPanelTag extends TobagoELTag {
   private static final Logger LOG = LoggerFactory.getLogger(ExtensionPanelTag.class);
-  private javax.el.ValueExpression  markup;
-  private javax.el.ValueExpression  tip;
+  private javax.el.ValueExpression markup;
+  private javax.el.ValueExpression tip;
 
   @Override
   public String getComponentType() {
     return UIExtensionPanel.COMPONENT_TYPE;
   }
+
   @Override
   public String getRendererType() {
     return "Panel";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
index bc053de..460ccb4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
@@ -197,8 +197,7 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -225,18 +224,15 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
@@ -251,8 +247,7 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -261,8 +256,8 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -271,15 +266,13 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
@@ -320,10 +313,9 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
     this.placeholder = placeholder;
   }
 
-   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+  /**
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -332,9 +324,8 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -385,8 +376,8 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -395,10 +386,9 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
index ea4a690..630a1da 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
@@ -33,9 +33,7 @@ import javax.el.ValueExpression;
 import javax.servlet.jsp.JspException;
 
 /**
- * Renders a text input field with a label.
- * <br />
- * Short syntax of:
+ * Renders a text input field with a label. <br /> Short syntax of:
  * <p/>
  * <pre>
  * &lt;tc:panel>
@@ -72,10 +70,19 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   private ValueExpression value;
   private MethodExpression valueChangeListener;
   private ValueExpression onchange;
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   private MethodExpression suggestMethod;
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   private ValueExpression suggestMinChars;
+  /**
+   * @deprecated xxx
+   */
   @Deprecated
   private ValueExpression suggestDelay;
   private ValueExpression markup;
@@ -237,8 +244,7 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -256,12 +262,9 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
@@ -273,8 +276,7 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -301,8 +303,7 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -311,8 +312,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -321,13 +322,9 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -346,11 +343,10 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding which generates a list of suggested input values based on
-   * the currently entered text, which could be retrieved via getSubmittedValue() on the UIIn.
-   * The expression has to evaluate to a public method which has a javax.faces.component.UIInput parameter
-   * and returns a List&lt;String>(deprecated), a List&lt;org.apache.myfaces.tobago.model.AutoSuggestItem>
-   * or a org.apache.myfaces.tobago.model.AutoSuggestItems.
+   * MethodBinding which generates a list of suggested input values based on the currently entered text, which could be
+   * retrieved via getSubmittedValue() on the UIIn. The expression has to evaluate to a public method which has a
+   * javax.faces.component.UIInput parameter and returns a List&lt;String>(deprecated), a
+   * List&lt;org.apache.myfaces.tobago.model.AutoSuggestItem> or a org.apache.myfaces.tobago.model.AutoSuggestItems.
    *
    * @deprecated since 2.0.0, please use tc:suggest
    */
@@ -390,10 +386,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
@@ -404,8 +398,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered as
-   * password field , so you will not see the typed charakters.
+   * Flag indicating whether or not this component should be rendered as password field , so you will not see the typed
+   * charakters.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -432,9 +426,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -452,8 +445,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Displays a short text in the input field, that describes the meaning of this field.
-   * This is part of HTML 5, the theme should emulate the behaviour, when the browser doesn't support it.
+   * Displays a short text in the input field, that describes the meaning of this field. This is part of HTML 5, the
+   * theme should emulate the behaviour, when the browser doesn't support it.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -462,9 +455,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -506,8 +498,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -516,10 +508,9 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
index e61d957..23110ef 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
@@ -35,10 +35,7 @@ import javax.faces.webapp.FacetTag;
 import javax.servlet.jsp.JspException;
 
 /**
- * Renders a label to any component.
- * <br />
- * Short syntax of:
- * <br />
+ * Renders a label to any component. <br /> Short syntax of: <br />
  * <pre>
  * &lt;tc:panel>
  *   &lt;f:facet name="layout">
@@ -48,8 +45,7 @@ import javax.servlet.jsp.JspException;
  *     ...
  * &lt;/tc:panel>
  * </pre>
- * This is the universal version of the special versions: &lt;tx:in>, etc.
- * In other words:
+ * This is the universal version of the special versions: &lt;tx:in>, etc. In other words:
  * <pre>
  * &lt;tx:label>
  *   &lt;tc:in/>
@@ -165,7 +161,7 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
     markup = null;
   }
 
-   /**
+  /**
    * The current value of this component.
    */
   @TagAttribute
@@ -174,7 +170,7 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
     this.value = value;
   }
 
-   /**
+  /**
    * The accessKey of this component.
    */
   @TagAttribute
@@ -193,8 +189,8 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -216,10 +212,9 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
     this.rows = rows;
   }
 
-   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+  /**
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -227,9 +222,8 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
     this.labelWidth = labelWidth;
   }
 
- /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+  /**
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
index 7b9f590..f9475ae 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
@@ -151,8 +151,9 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
       if (expression != null) {
         command.setValueExpression(Attributes.RENDERED_PARTIALLY, expression);
       } else {
-        final Object renderedPartially = inComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
-        command.setRenderedPartially(StringUtils.split((String) renderedPartially, ", "));
+        final String renderedPartiallyAttribute
+            = (String) inComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
+        command.setRenderedPartially(StringUtils.split((String) renderedPartiallyAttribute, ", "));
       }
     }
 
@@ -184,13 +185,10 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Action to invoke when clicked.
-   * This must be a MethodBinding or a String representing the application action to invoke when
-   * this component is activated by the user.
-   * The MethodBinding must evaluate to a public method that takes no parameters,
-   * and returns a String (the logical outcome) which is passed to the
-   * NavigationHandler for this application.
-   * The String is directly passed to the Navigationhandler.
+   * Action to invoke when clicked. This must be a MethodBinding or a String representing the application action to
+   * invoke when this component is activated by the user. The MethodBinding must evaluate to a public method that takes
+   * no parameters, and returns a String (the logical outcome) which is passed to the NavigationHandler for this
+   * application. The String is directly passed to the Navigationhandler.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION,
@@ -200,10 +198,9 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding representing an action listener method that will be
-   * notified when this component is activated by the user.
-   * The expression must evaluate to a public method that takes an ActionEvent
-   * parameter, with a return type of void.
+   * MethodBinding representing an action listener method that will be notified when this component is activated by the
+   * user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of
+   * void.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
@@ -214,8 +211,6 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
 
   /**
    * Script to be invoked when clicked
-   *
-   * @param onclick
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -225,8 +220,6 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
 
   /**
    * Link to an arbitrary URL
-   *
-   * @param link
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -235,8 +228,7 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -245,8 +237,8 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -273,8 +265,7 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -283,10 +274,9 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating that, if this component is activated by the user,
-   * notifications should be delivered to interested listeners and actions
-   * immediately (that is, during Apply Request Values phase) rather than
-   * waiting until Invoke Application phase.
+   * Flag indicating that, if this component is activated by the user, notifications should be delivered to interested
+   * listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke
+   * Application phase.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -295,8 +285,7 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Specify, if the command calls an JSF-Action.
-   * Useful to switch off the Double-Submit-Check and Waiting-Behavior.
+   * Specify, if the command calls an JSF-Action. Useful to switch off the Double-Submit-Check and Waiting-Behavior.
    *
    * @param transition Indicates the transition.
    */
@@ -309,15 +298,15 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   /**
    * Indicate the partially rendered Components in a case of a submit.
    */
-   @TagAttribute
-   @UIComponentTagAttribute(type = "java.lang.String[]")
+  @TagAttribute
+  @UIComponentTagAttribute(type = "java.lang.String[]")
   public void setRenderedPartially(final javax.el.ValueExpression renderedPartially) {
     this.renderedPartially = renderedPartially;
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -326,10 +315,9 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
index d72bcf0..a2b89b1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
@@ -160,8 +160,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
       if (expression != null) {
         command.setValueExpression(Attributes.RENDERED_PARTIALLY, expression);
       } else {
-        final Object renderedPartially = inComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
-        command.setRenderedPartially(StringUtils.split((String) renderedPartially, ", "));
+        final String renderedPartiallyAttribute =
+            (String) inComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
+        command.setRenderedPartially(StringUtils.split(renderedPartiallyAttribute, ", "));
       }
     }
 
@@ -194,13 +195,10 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Action to invoke when clicked.
-   * This must be a MethodBinding or a String representing the application action to invoke when
-   * this component is activated by the user.
-   * The MethodBinding must evaluate to a public method that takes no parameters,
-   * and returns a String (the logical outcome) which is passed to the
-   * NavigationHandler for this application.
-   * The String is directly passed to the Navigationhandler.
+   * Action to invoke when clicked. This must be a MethodBinding or a String representing the application action to
+   * invoke when this component is activated by the user. The MethodBinding must evaluate to a public method that takes
+   * no parameters, and returns a String (the logical outcome) which is passed to the NavigationHandler for this
+   * application. The String is directly passed to the Navigationhandler.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION,
@@ -210,10 +208,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding representing an action listener method that will be
-   * notified when this component is activated by the user.
-   * The expression must evaluate to a public method that takes an ActionEvent
-   * parameter, with a return type of void.
+   * MethodBinding representing an action listener method that will be notified when this component is activated by the
+   * user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of
+   * void.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
@@ -241,8 +238,7 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -251,8 +247,8 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -279,8 +275,7 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -289,10 +284,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating that, if this component is activated by the user,
-   * notifications should be delivered to interested listeners and actions
-   * immediately (that is, during Apply Request Values phase) rather than
-   * waiting until Invoke Application phase.
+   * Flag indicating that, if this component is activated by the user, notifications should be delivered to interested
+   * listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke
+   * Application phase.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -301,8 +295,7 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Specify, if the command calls an JSF-Action.
-   * Useful to switch off the Double-Submit-Check and Waiting-Behavior.
+   * Specify, if the command calls an JSF-Action. Useful to switch off the Double-Submit-Check and Waiting-Behavior.
    *
    * @param transition Indicates the transition.
    */
@@ -313,13 +306,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -331,15 +320,15 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   /**
    * Indicate the partially rendered Components in a case of a submit.
    */
-   @TagAttribute
-   @UIComponentTagAttribute(type = "java.lang.String[]")
+  @TagAttribute
+  @UIComponentTagAttribute(type = "java.lang.String[]")
   public void setRenderedPartially(final javax.el.ValueExpression renderedPartially) {
     this.renderedPartially = renderedPartially;
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -348,10 +337,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/OutExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/OutExtensionTag.java
index dcc8c1d..ec8a8d5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/OutExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/OutExtensionTag.java
@@ -30,9 +30,7 @@ import javax.el.ValueExpression;
 import javax.servlet.jsp.JspException;
 
 /**
- * Renders a text output field with a label.
- * <br />
- * Short syntax of:
+ * Renders a text output field with a label. <br /> Short syntax of:
  * <p/>
  * <pre>
  * &lt;tc:panel>
@@ -141,8 +139,7 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -160,8 +157,7 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -170,8 +166,7 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -180,8 +175,8 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -190,13 +185,9 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -215,9 +206,8 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -226,8 +216,8 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -236,10 +226,9 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
index dbaf5a4..9ecb3ed 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
@@ -207,18 +207,15 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
@@ -251,8 +248,7 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -270,8 +266,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * Label to be displayed to the user for this option. This label will displayed beneath the component like 
-   * the label of other check box components.
+   * Label to be displayed to the user for this option. This label will displayed beneath the component like the label
+   * of other check box components.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -280,27 +276,21 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -310,8 +300,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -320,8 +310,7 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -339,9 +328,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -350,8 +338,7 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -375,9 +362,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -413,8 +399,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -423,10 +409,9 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
index aa2a135..619517d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
@@ -206,9 +206,8 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -226,16 +225,15 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
@@ -277,8 +275,7 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -300,27 +297,21 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   } */
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -330,8 +321,8 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -340,8 +331,7 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -359,9 +349,8 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -370,8 +359,7 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -429,10 +417,10 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   public void setRequiredMessage(final ValueExpression requiredMessage) {
     this.requiredMessage = requiredMessage;
   }
-  
+
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -441,10 +429,9 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
index e32ebcb..e6a3a2a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
@@ -191,9 +191,8 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -211,18 +210,15 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
@@ -255,8 +251,7 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -274,27 +269,21 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -304,8 +293,8 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -314,8 +303,7 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -333,9 +321,8 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -344,8 +331,7 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -394,10 +380,10 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   public void setRequiredMessage(final ValueExpression requiredMessage) {
     this.requiredMessage = requiredMessage;
   }
-  
+
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -406,10 +392,9 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
index 21b44cb..4def3ad 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
@@ -201,9 +201,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -221,12 +220,9 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
@@ -265,8 +261,7 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -302,10 +297,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
@@ -316,13 +309,9 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -332,8 +321,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -342,8 +331,7 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -361,9 +349,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -372,8 +359,7 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -424,8 +410,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -434,10 +420,9 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
index ecf0572..3de60d1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
@@ -191,9 +191,8 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -211,32 +210,27 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
@@ -269,13 +263,9 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -285,8 +275,7 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -304,8 +293,8 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -314,8 +303,7 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -333,9 +321,8 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -359,8 +346,7 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -396,8 +382,8 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -406,10 +392,9 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
index 70cbd3f..8a001c2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
@@ -195,9 +195,8 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -215,18 +214,15 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
@@ -259,8 +255,7 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -278,27 +273,21 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -308,8 +297,8 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -318,8 +307,7 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -337,9 +325,8 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -390,8 +377,7 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -400,8 +386,8 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -410,10 +396,9 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
index 0a59a8a..8c617ba 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
@@ -203,9 +203,8 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -223,32 +222,27 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
@@ -281,13 +275,9 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -295,6 +285,7 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   public void setConverter(final ValueExpression converter) {
     this.converter = converter;
   }
+
   /**
    * Flag indicating this component should rendered as an inline element.
    */
@@ -305,8 +296,7 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -324,8 +314,8 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -334,8 +324,7 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -353,9 +342,8 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -415,8 +403,7 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -425,8 +412,8 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -435,10 +422,9 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
index 2afc20e..85128f6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
@@ -31,9 +31,7 @@ import javax.faces.webapp.FacetTag;
 import javax.servlet.jsp.JspException;
 
 /**
- * Renders a separator.
- * <br />
- * Short syntax of:
+ * Renders a separator. <br /> Short syntax of:
  * <p/>
  * <pre>
  * &lt;tc:separator>
@@ -51,7 +49,7 @@ import javax.servlet.jsp.JspException;
     rendererType = "Separator",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SeparatorExtensionHandler")
 public class SeparatorExtensionTag extends TobagoExtensionBodyTagSupport {
-  
+
   private javax.el.ValueExpression binding;
   private javax.el.ValueExpression rendered;
   private javax.el.ValueExpression label;
@@ -108,18 +106,17 @@ public class SeparatorExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
   public void setBinding(final javax.el.ValueExpression binding) throws JspException {
     this.binding = binding;
   }
-  
+
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -128,8 +125,7 @@ public class SeparatorExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
index b22e4aa..1cda4ca 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
@@ -31,9 +31,7 @@ import javax.el.ValueExpression;
 import javax.servlet.jsp.JspException;
 
 /**
- * Renders a multi line text input control with a label.
- * <br />
- * Short syntax of:
+ * Renders a multi line text input control with a label. <br /> Short syntax of:
  * <p/>
  * <pre>
  * &lt;tc:panel>
@@ -215,25 +213,21 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -260,8 +254,7 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -270,8 +263,8 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -280,13 +273,9 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -296,15 +285,13 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
@@ -319,8 +306,7 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -347,9 +333,8 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -366,10 +351,9 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
     this.tip = tip;
   }
 
-   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+  /**
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -411,8 +395,8 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -421,10 +405,9 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
index 12299c5..58bae5d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
@@ -31,9 +31,7 @@ import javax.el.ValueExpression;
 import javax.servlet.jsp.JspException;
 
 /**
- * Renders a time input field with a label.
- * <br />
- * Short syntax of:
+ * Renders a time input field with a label. <br /> Short syntax of:
  * <p/>
  * <pre>
  * &lt;tc:panel>
@@ -50,7 +48,7 @@ import javax.servlet.jsp.JspException;
 @Tag(name = "time")
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.TimeTag",
-        faceletHandler = "org.apache.myfaces.tobago.facelets.extension.TimeExtensionHandler")
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.TimeExtensionHandler")
 public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private ValueExpression binding;
@@ -204,8 +202,7 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Indicate markup of this component.
-   * Possible value is 'none'. But this can be overridden in the theme.
+   * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -223,25 +220,21 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * MethodBinding representing a value change listener method
-   * that will be notified when a new value has been set for this input component.
-   * The expression must evaluate to a public method that takes a ValueChangeEvent
-   * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
+   * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+   * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+   * a return type of void.
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(final MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
   }
 
   /**
-   * Text value to display as label.
-   * If text contains an underscore the next character is used as accesskey.
+   * Text value to display as label. If text contains an underscore the next character is used as accesskey.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -268,8 +261,7 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The value binding expression linking this
-   * component to a property in a backing bean.
+   * The value binding expression linking this component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -278,8 +270,8 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating whether or not this component should be rendered
-   * (during Render Response Phase), or processed on any subsequent form submit.
+   * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+   * any subsequent form submit.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -288,13 +280,9 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * An expression that specifies the Converter for this component.
-   * If the value binding expression is a String,
-   * the String is used as an ID to look up a Converter.
-   * If the value binding expression is a Converter,
-   * uses that instance as the converter.
-   * The value can either be a static value (ID case only)
-   * or an EL expression.
+   * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+   * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+   * as the converter. The value can either be a static value (ID case only) or an EL expression.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -304,15 +292,13 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * A method binding EL expression,
-   * accepting FacesContext, UIComponent,
-   * and Object parameters, and returning void, that validates
-   * the component's local value.
+   * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+   * that validates the component's local value.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(final MethodExpression validator) {
     this.validator = validator;
   }
@@ -345,9 +331,8 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * Flag indicating that a value is required.
-   * If the value is an empty string a
-   * ValidationError occurs and a Error Message is rendered.
+   * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+   * Message is rendered.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -365,9 +350,8 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The width for the label component. Default: 'auto'.
-   * This value is used in the gridLayouts columns attribute.
-   * See gridLayout tag for valid values.
+   * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+   * gridLayout tag for valid values.
    */
   @TagAttribute
   @UIComponentTagAttribute()
@@ -409,8 +393,8 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for the input field component inside of the container.
-   * This value must be unique within the closest parent component that is a naming container.
+   * The component identifier for the input field component inside of the container. This value must be unique within
+   * the closest parent component that is a naming container.
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
@@ -419,10 +403,9 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
   }
 
   /**
-   * The component identifier for this component.
-   * This value must be unique within the closest parent component that is a naming container.
-   * For tx components the id will be set to the container (e. g. the panel).
-   * To set the id of the input field, you have to use the attribute "fieldId".
+   * The component identifier for this component. This value must be unique within the closest parent component that is
+   * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+   * input field, you have to use the attribute "fieldId".
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
index f5eea8d..314fa72 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
@@ -27,15 +27,15 @@ import javax.servlet.jsp.tagext.JspIdConsumer;
 public class TobagoExtensionBodyTagSupport extends BodyTagSupport implements JspIdConsumer {
 
   protected static final String PREFIX = "tx";
-  
+
   private String jspId;
   private int idSuffix;
-    
+
   protected ValueExpression createStringValueExpression(final String expression) {
     return JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext())
         .getExpressionFactory().createValueExpression(pageContext.getELContext(), expression, String.class);
   }
-  
+
   public void setJspId(final String jspId) {
     this.jspId = jspId;
   }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ComponentAttributeUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ComponentAttributeUtils.java
index edef3bc..6e260ab 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ComponentAttributeUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ComponentAttributeUtils.java
@@ -52,12 +52,12 @@ public final class ComponentAttributeUtils {
 
   public static boolean isValueReference(final String value) {
 
-      final int start = value.indexOf("#{");
-      if (start < 0) {
-        return false;
-      }
-      final int end = value.lastIndexOf('}');
-      return (end >=0 && start < end);
+    final int start = value.indexOf("#{");
+    if (start < 0) {
+      return false;
+    }
+    final int end = value.lastIndexOf('}');
+    return end >= 0 && start < end;
   }
 
   /**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java
index 12b57ff..2e35e68 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java
@@ -45,9 +45,7 @@ public final class DateFormatUtils {
   }
 
   /**
-   * Find a pattern for the converter.
-   * Returns the pattern inside the converter, if any.
-   * Otherwise compute the pattern.
+   * Find a pattern for the converter. Returns the pattern inside the converter, if any. Otherwise compute the pattern.
    *
    * @return the patter or null, if DateFormat.getDateInstance() returns no SimpleDateFormat.
    */
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java
index f66f297..606293e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java
@@ -30,10 +30,9 @@ public final class Deprecation {
   }
 
   /**
-   * This Logger object should help to detect the usage of deprecated code.
-   * The main reason for this class is the lack of a "deprecated concept"
-   * for tag libraries. Thought the designer of a Tobago page cannot see
-   * in his IDE that a tag or attribute is deprecated.
+   * This Logger object should help to detect the usage of deprecated code. The main reason for this class is the lack
+   * of a "deprecated concept" for tag libraries. Thought the designer of a Tobago page cannot see in his IDE that a tag
+   * or attribute is deprecated.
    * <p>
    * The Tobago Java code will log into this Logger object, with
    * <dl>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
index 7d70a64..ccd4a9c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
@@ -126,7 +126,7 @@ public final class FacesContextUtils {
     }
     return list;
   }
-  
+
   public static void addScriptFile(final FacesContext context, final String file) {
     List<String> list = (List<String>) context.getAttributes().get(TOBAGO_SCRIPT_FILES);
     if (list == null) {
@@ -143,7 +143,7 @@ public final class FacesContextUtils {
   @Deprecated
   public static Set<String> getScriptBlocks(final FacesContext context) {
     final Set<String> set = (Set<String>) context.getAttributes().get(TOBAGO_SCRIPT_BLOCKS);
-     if (set == null) {
+    if (set == null) {
       return Collections.emptySet();
     }
     return set;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java
index 4072c36..ec58f79 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java
@@ -26,18 +26,21 @@ import javax.faces.component.UIComponent;
 /**
  * @deprecated Since 2.0.3
  */
+@Deprecated
 public final class FindComponentUtils {
 
   /**
    * @deprecated Since 2.0.3
    */
+  @Deprecated
   private FindComponentUtils() {
   }
 
   /**
    * @deprecated Since 2.0.3, please use {@link org.apache.myfaces.tobago.util.ComponentUtils#findComponent(
-   * javax.faces.component.UIComponent, String)}
+   *javax.faces.component.UIComponent, String)}
    */
+  @Deprecated
   public static UIComponent findComponent(UIComponent from, String relativeId) {
     return ComponentUtils.findComponent(from, relativeId);
   }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
index 8fe8206..83520b4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
@@ -60,7 +60,7 @@ public final class HtmlWriterUtils extends WriterUtils {
 
   @Override
   protected void writeEncodedValue(final char[] text, final int start,
-      final int length, final boolean isAttribute) throws IOException {
+                                   final int length, final boolean isAttribute) throws IOException {
 
     int localIndex = -1;
 
@@ -88,7 +88,7 @@ public final class HtmlWriterUtils extends WriterUtils {
 
         // Tilde or less...
         if (ch < CHARS_TO_ESCAPE.length) {
-          if (isAttribute && ch == '&' && (i + 1 < end) && text[i + 1] == '{') {
+          if (isAttribute && ch == '&' && i + 1 < end && text[i + 1] == '{') {
             // HTML 4.0, section B.7.1: ampersands followed by
             // an open brace don't get escaped
             buffer.addToBuffer('&');
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java
index d50bb68..db65647 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java
@@ -56,7 +56,7 @@ public final class JavascriptWriterUtils extends WriterUtils {
 
   @Override
   protected void writeEncodedValue(final char[] text, final int start,
-      final int length, final boolean isAttribute) throws IOException {
+                                   final int length, final boolean isAttribute) throws IOException {
 
     int localIndex = -1;
 
@@ -84,7 +84,7 @@ public final class JavascriptWriterUtils extends WriterUtils {
 
         // Tilde or less...
         if (ch < CHARS_TO_ESCAPE.length) {
-          if (isAttribute && ch == '&' && (i + 1 < end) && text[i + 1] == '{') {
+          if (isAttribute && ch == '&' && i + 1 < end && text[i + 1] == '{') {
             // HTML 4.0, section B.7.1: ampersands followed by
             // an open brace don't get escaped
             buffer.addToBuffer('&');
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonWriterUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonWriterUtils.java
index f35b9f3..100fb0c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonWriterUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonWriterUtils.java
@@ -61,7 +61,7 @@ public final class JsonWriterUtils extends WriterUtils {
 
   @Override
   protected void writeEncodedValue(final char[] text, final int start,
-      final int length, final boolean isAttribute) throws IOException {
+                                   final int length, final boolean isAttribute) throws IOException {
 
     int localIndex = -1;
 
@@ -89,7 +89,7 @@ public final class JsonWriterUtils extends WriterUtils {
 
         // Tilde or less...
         if (ch < CHARS_TO_ESCAPE.length) {
-          if (isAttribute && ch == '&' && (i + 1 < end) && text[i + 1] == '{') {
+          if (isAttribute && ch == '&' && i + 1 < end && text[i + 1] == '{') {
             // HTML 4.0, section B.7.1: ampersands followed by
             // an open brace don't get escaped
             buffer.addToBuffer('&');
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/NumberUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/NumberUtils.java
index 4294528..c62441f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/NumberUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/NumberUtils.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.util;
 
 public class NumberUtils {
   public static boolean isDigits(final String str) {
-    if ((str == null) || (str.length() == 0)) {
+    if (str == null || str.length() == 0) {
       return false;
     }
     for (int i = 0; i < str.length(); i++) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
index 04c90d8..49c3860 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
@@ -28,7 +28,7 @@ import java.util.Map;
 
 /**
  * Only needed for Servlet 3.0. Not needed for Servlet 3.1 or higher.
- *
+ * <p>
  * Basically taken from Apache Tomcat 8
  */
 public final class PartUtils {
@@ -37,8 +37,8 @@ public final class PartUtils {
   }
 
   /**
-   * This is a helper method, to get the original file name of the upload.
-   * If you have at least Servlet 3.1, you wouldn't need this function.
+   * This is a helper method, to get the original file name of the upload. If you have at least Servlet 3.1, you
+   * wouldn't need this function.
    *
    * @since Tobago 3.0.0
    */
@@ -113,43 +113,40 @@ public final class PartUtils {
     /**
      * Default ParameterParser constructor.
      */
-    public ParameterParser() {
+    ParameterParser() {
       super();
     }
 
     /**
      * Are there any characters left to parse?
      *
-     * @return {@code true} if there are unparsed characters,
-     * {@code false} otherwise.
+     * @return {@code true} if there are unparsed characters, {@code false} otherwise.
      */
     private boolean hasChar() {
       return this.pos < this.len;
     }
 
     /**
-     * A helper method to process the parsed token. This method removes
-     * leading and trailing blanks as well as enclosing quotation marks,
-     * when necessary.
+     * A helper method to process the parsed token. This method removes leading and trailing blanks as well as enclosing
+     * quotation marks, when necessary.
      *
-     * @param quoted {@code true} if quotation marks are expected,
-     *               {@code false} otherwise.
+     * @param quoted {@code true} if quotation marks are expected, {@code false} otherwise.
      * @return the token
      */
     private String getToken(boolean quoted) {
       // Trim leading white spaces
-      while ((i1 < i2) && (Character.isWhitespace(chars[i1]))) {
+      while (i1 < i2 && Character.isWhitespace(chars[i1])) {
         i1++;
       }
       // Trim trailing white spaces
-      while ((i2 > i1) && (Character.isWhitespace(chars[i2 - 1]))) {
+      while (i2 > i1 && Character.isWhitespace(chars[i2 - 1])) {
         i2--;
       }
       // Strip away quotation marks if necessary
       if (quoted
-          && ((i2 - i1) >= 2)
-          && (chars[i1] == '"')
-          && (chars[i2 - 1] == '"')) {
+          && i2 - i1 >= 2
+          && chars[i1] == '"'
+          && chars[i2 - 1] == '"') {
         i1++;
         i2--;
       }
@@ -163,10 +160,9 @@ public final class PartUtils {
     /**
      * Tests if the given character is present in the array of characters.
      *
-     * @param ch      the character to test for presense in the array of characters
+     * @param ch the character to test for presense in the array of characters
      * @param charray the array of characters to test against
-     * @return {@code true} if the character is present in the array of
-     * characters, {@code false} otherwise.
+     * @return {@code true} if the character is present in the array of characters, {@code false} otherwise.
      */
     private boolean isOneOf(char ch, final char[] charray) {
       boolean result = false;
@@ -180,11 +176,10 @@ public final class PartUtils {
     }
 
     /**
-     * Parses out a token until any of the given terminators
-     * is encountered.
+     * Parses out a token until any of the given terminators is encountered.
      *
-     * @param terminators the array of terminating characters. Any of these
-     *                    characters when encountered signify the end of the token
+     * @param terminators the array of terminating characters. Any of these characters when encountered signify the end
+     * of the token
      * @return the token
      */
     private String parseToken(final char[] terminators) {
@@ -203,12 +198,10 @@ public final class PartUtils {
     }
 
     /**
-     * Parses out a token until any of the given terminators
-     * is encountered outside the quotation marks.
+     * Parses out a token until any of the given terminators is encountered outside the quotation marks.
      *
-     * @param terminators the array of terminating characters. Any of these
-     *                    characters when encountered outside the quotation marks signify the end
-     *                    of the token
+     * @param terminators the array of terminating characters. Any of these characters when encountered outside the
+     * quotation marks signify the end of the token
      * @return the token
      */
     private String parseQuotedToken(final char[] terminators) {
@@ -225,7 +218,7 @@ public final class PartUtils {
         if (!charEscaped && ch == '"') {
           quoted = !quoted;
         }
-        charEscaped = (!charEscaped && ch == '\\');
+        charEscaped = !charEscaped && ch == '\\';
         i2++;
         pos++;
 
@@ -234,22 +227,19 @@ public final class PartUtils {
     }
 
     /**
-     * Sets the flag if parameter names are to be converted to lower case when
-     * name/value pairs are parsed.
+     * Sets the flag if parameter names are to be converted to lower case when name/value pairs are parsed.
      *
-     * @param b {@code true} if parameter names are to be
-     *          converted to lower case when name/value pairs are parsed.
-     *          {@code false} otherwise.
+     * @param b {@code true} if parameter names are to be converted to lower case when name/value pairs are parsed.
+     * {@code false} otherwise.
      */
     public void setLowerCaseNames(boolean b) {
       this.lowerCaseNames = b;
     }
 
     /**
-     * Extracts a map of name/value pairs from the given string. Names are
-     * expected to be unique.
+     * Extracts a map of name/value pairs from the given string. Names are expected to be unique.
      *
-     * @param str       the string that contains a sequence of name/value pairs
+     * @param str the string that contains a sequence of name/value pairs
      * @param separator the name/value pairs separator
      * @return a map of name/value pairs
      */
@@ -261,11 +251,9 @@ public final class PartUtils {
     }
 
     /**
-     * Extracts a map of name/value pairs from the given array of
-     * characters. Names are expected to be unique.
+     * Extracts a map of name/value pairs from the given array of characters. Names are expected to be unique.
      *
-     * @param charArray the array of characters that contains a sequence of
-     *                  name/value pairs
+     * @param charArray the array of characters that contains a sequence of name/value pairs
      * @param separator the name/value pairs separator
      * @return a map of name/value pairs
      */
@@ -277,13 +265,11 @@ public final class PartUtils {
     }
 
     /**
-     * Extracts a map of name/value pairs from the given array of
-     * characters. Names are expected to be unique.
+     * Extracts a map of name/value pairs from the given array of characters. Names are expected to be unique.
      *
-     * @param charArray the array of characters that contains a sequence of
-     *                  name/value pairs
-     * @param offset    - the initial offset.
-     * @param length    - the length.
+     * @param charArray the array of characters that contains a sequence of name/value pairs
+     * @param offset - the initial offset.
+     * @param length - the length.
      * @param separator the name/value pairs separator
      * @return a map of name/value pairs
      */
@@ -308,16 +294,16 @@ public final class PartUtils {
             '=', separator
         });
         paramValue = null;
-        if (hasChar() && (charArray[pos] == '=')) {
+        if (hasChar() && charArray[pos] == '=') {
           pos++; // skip '='
           paramValue = parseQuotedToken(new char[]{
               separator
           });
         }
-        if (hasChar() && (charArray[pos] == separator)) {
+        if (hasChar() && charArray[pos] == separator) {
           pos++; // skip separator
         }
-        if ((paramName != null) && (paramName.length() > 0)) {
+        if (paramName != null && paramName.length() > 0) {
           if (this.lowerCaseNames) {
             paramName = paramName.toLowerCase(Locale.ENGLISH);
           }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
index 63fe16f..77d37ed 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
@@ -124,7 +124,7 @@ public final class ResponseUtils {
         servletResponse.setHeader(cspHeader, value);
       }
     } else if (PortletUtils.isPortletApiAvailable() && response instanceof MimeResponse) {
-     // TODO Portlet
+      // TODO Portlet
       if (contentSecurityPolicy.getMode() != ContentSecurityPolicy.Mode.OFF) {
         LOG.warn("CSP not implemented for Portlet!");
       }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
index 449b56d..ba4e2be 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
@@ -23,14 +23,10 @@ import java.io.IOException;
 import java.io.Writer;
 
 /**
- * Buffering scheme: we use a tremendously simple buffering
- * scheme that greatly reduces the number of calls into the
- * Writer/PrintWriter.  In practice this has produced significant
- * measured performance gains (at least in JDK 1.3.1).  We only
- * support adding single characters to the buffer, so anytime
- * multiple characters need to be written out, the entire buffer
- * gets flushed.  In practice, this is good enough, and keeps
- * the core simple.
+ * Buffering scheme: we use a tremendously simple buffering scheme that greatly reduces the number of calls into the
+ * Writer/PrintWriter.  In practice this has produced significant measured performance gains (at least in JDK 1.3.1).
+ * We only support adding single characters to the buffer, so anytime multiple characters need to be written out, the
+ * entire buffer gets flushed.  In practice, this is good enough, and keeps the core simple.
  */
 public class ResponseWriterBuffer {
 
@@ -47,8 +43,7 @@ public class ResponseWriterBuffer {
   }
 
   /**
-   * Add a character to the buffer, flushing the buffer if the buffer is
-   * full, and returning the new buffer index
+   * Add a character to the buffer, flushing the buffer if the buffer is full, and returning the new buffer index
    */
   public void addToBuffer(final char ch) throws IOException {
     if (bufferIndex >= BUFFER_SIZE) {
@@ -70,8 +65,7 @@ public class ResponseWriterBuffer {
   }
 
   /**
-   * Flush the contents of the buffer to the output stream
-   * and return the reset buffer index
+   * Flush the contents of the buffer to the output stream and return the reset buffer index
    */
   public void flushBuffer() throws IOException {
     if (bufferIndex > 0) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
index 3533ac1..f4ee1e7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
@@ -99,15 +99,14 @@ public final class StringUtils {
       } else if (chars[i] == '_') {
         builder.append(chars[++i]);
       } else {
-        builder.append((((Character) chars[i]).toString().toLowerCase(Locale.ENGLISH)));
+        builder.append(((Character) chars[i]).toString().toLowerCase(Locale.ENGLISH));
       }
     }
     return builder.toString();
   }
 
   /**
-   * Is the same string, by ignoring differences that are only whitespaces.
-   * (null and "" are not equal)
+   * Is the same string, by ignoring differences that are only whitespaces. (null and "" are not equal)
    */
   @SuppressWarnings("StringEquality")
   public static boolean equalsIgnoreCaseAndWhitespace(final String type1, final String type2) {
@@ -171,7 +170,7 @@ public final class StringUtils {
    */
   public static boolean endsWith(final String string, final String suffix) {
     if (string == null || suffix == null) {
-      return (string == null && suffix == null);
+      return string == null && suffix == null;
     }
     if (suffix.length() > string.length()) {
       return false;
@@ -337,7 +336,7 @@ public final class StringUtils {
       return true;
     }
     for (int i = 0; i < strLen; i++) {
-      if ((!Character.isWhitespace(string.charAt(i)))) {
+      if (!Character.isWhitespace(string.charAt(i))) {
         return false;
       }
     }
@@ -366,8 +365,8 @@ public final class StringUtils {
     }
     final int replLength = searchString.length();
     int increase = replacement.length() - replLength;
-    increase = (increase < 0 ? 0 : increase);
-    increase *= (max < 0 ? 16 : (max > 64 ? 64 : max));
+    increase = increase < 0 ? 0 : increase;
+    increase *= max < 0 ? 16 : max > 64 ? 64 : max;
     final StringBuilder buf = new StringBuilder(text.length() + increase);
     while (end != -1) {
       buf.append(text.substring(start, end)).append(replacement);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java
index 753f0bc..16919b5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java
@@ -154,9 +154,8 @@ public abstract class WriterUtils {
       throws IOException;
 
   /**
-   * Writes a character as a decimal escape.  Hex escapes are smaller than
-   * the decimal version, but Netscape didn't support hex escapes until
-   * 4.7.4.
+   * Writes a character as a decimal escape.  Hex escapes are smaller than the decimal version, but Netscape didn't
+   * support hex escapes until 4.7.4.
    */
   protected void writeDecRef(final char ch) throws IOException {
     if (ch == '\u20ac') {
@@ -169,27 +168,27 @@ public abstract class WriterUtils {
     // going gonzo, it should be even better)
     int i = (int) ch;
     if (i > 10000) {
-      out.write('0' + (i / 10000));
+      out.write('0' + i / 10000);
       i = i % 10000;
-      out.write('0' + (i / 1000));
+      out.write('0' + i / 1000);
       i = i % 1000;
-      out.write('0' + (i / 100));
+      out.write('0' + i / 100);
       i = i % 100;
-      out.write('0' + (i / 10));
+      out.write('0' + i / 10);
       i = i % 10;
       out.write('0' + i);
     } else if (i > 1000) {
-      out.write('0' + (i / 1000));
+      out.write('0' + i / 1000);
       i = i % 1000;
-      out.write('0' + (i / 100));
+      out.write('0' + i / 100);
       i = i % 100;
-      out.write('0' + (i / 10));
+      out.write('0' + i / 10);
       i = i % 10;
       out.write('0' + i);
     } else {
-      out.write('0' + (i / 100));
+      out.write('0' + i / 100);
       i = i % 100;
-      out.write('0' + (i / 10));
+      out.write('0' + i / 10);
       i = i % 10;
       out.write('0' + i);
     }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
index 87d10dd..01ef5d1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
@@ -65,11 +65,17 @@ public class DebugResponseWriterWrapper extends TobagoResponseWriter {
     return new DebugResponseWriterWrapper((TobagoResponseWriter) responseWriter.cloneWithWriter(writer));
   }
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public void writeAttribute(final String name, final Object value, final String property) throws IOException {
     responseWriter.writeAttribute(name, value, property);
   }
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public void writeText(final Object text, final String property) throws IOException {
     responseWriter.writeText(text, property);
@@ -83,6 +89,9 @@ public class DebugResponseWriterWrapper extends TobagoResponseWriter {
     responseWriter.writeAttribute(name, value, escape);
   }
 
+  /**
+   * @deprecated by API
+   */
   @Override
   @Deprecated
   public String getStyleClasses() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
index 7aa9f4a..447d60c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
@@ -143,15 +143,16 @@ public class HtmlResponseWriter extends TobagoResponseWriterBase {
   }
 
   /**
-   * @deprecated
+   * @deprecated xxx
    */
   @Deprecated
-  public static Style ensureHtmlStyleMap(final UIComponent component, Style styles) {
+  public static Style ensureHtmlStyleMap(final UIComponent component, final Style styles) {
+    Style result = styles;
     if (styles == null) {
-      styles = new Style();
-      ((Map<String, Object>) component.getAttributes()).put(Attributes.STYLE, styles);
+      result = new Style();
+      ((Map<String, Object>) component.getAttributes()).put(Attributes.STYLE, result);
     }
-    return styles;
+    return result;
   }
 
   @Override
@@ -163,7 +164,7 @@ public class HtmlResponseWriter extends TobagoResponseWriterBase {
 
   @Override
   public void endElement(final String name) throws IOException {
-    if (name == HtmlElements.BODY) {
+    if (HtmlElements.BODY.equals(name)) {
       final String javascript = getJavascript();
       if (StringUtils.isNotEmpty(javascript)) {
         startElement(HtmlElements.SCRIPT, null);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
index 8cbe31f..26a8fcc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
@@ -112,7 +112,7 @@ public class JsonResponseWriter extends HtmlResponseWriter {
   @Override
   protected void endElementInternal(final Writer writer, final String name) throws IOException {
     if (EMPTY_TAG.contains(name)) {
-        writer.write(">");
+      writer.write(">");
     } else {
       if (isStartStillOpen()) {
         writer.write(">");
@@ -176,9 +176,9 @@ public class JsonResponseWriter extends HtmlResponseWriter {
 */
 
   public ResponseWriter cloneWithWriter(final Writer originalWriter) {
-     return new JsonResponseWriter(
-         originalWriter, getContentType(), getCharacterEncoding());
-   }
+    return new JsonResponseWriter(
+        originalWriter, getContentType(), getCharacterEncoding());
+  }
 
 
   @Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
index 1fc4777..f988b4c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
@@ -49,11 +49,15 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
       HtmlElements.BASE,
       HtmlElements.META));
 
-  /** @deprecated Since Tobago 1.5.3 */
+  /**
+   * @deprecated Since Tobago 1.5.3
+   */
   @Deprecated
   public static final String XML_VERSION_1_0_ENCODING_UTF_8 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 
-  /** @deprecated Since Tobago 1.5.3 */
+  /**
+   * @deprecated Since Tobago 1.5.3
+   */
   @Deprecated
   public static final int XML_VERSION_1_0_ENCODING_UTF_8_LENGTH = XML_VERSION_1_0_ENCODING_UTF_8.length();
 
@@ -136,9 +140,9 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
     writeInternal(writer, string);
   }
 
-  protected final void writeInternal(final Writer writer, final String string) throws IOException {
+  protected final void writeInternal(final Writer writerParameter, final String string) throws IOException {
     closeOpenTag();
-    writer.write(string);
+    writerParameter.write(string);
   }
 
   @Override
@@ -175,10 +179,6 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
   }
 
 
-
-
-
-
   protected void closeOpenTag() throws IOException {
     if (startStillOpen) {
       writer.write("\n>");
@@ -207,15 +207,16 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
     startElementInternal(writer, name, currentComponent);
   }
 
-  protected void startElementInternal(final Writer writer, final String name, final UIComponent currentComponent)
+  protected void startElementInternal(
+      final Writer writerParameter, final String name, final UIComponent currentComponent)
       throws IOException {
     this.component = currentComponent;
 //    closeOpenTag();
     if (startStillOpen) {
-      writer.write("\n>");
+      writerParameter.write("\n>");
     }
-    writer.write("<");
-    writer.write(name);
+    writerParameter.write("<");
+    writerParameter.write(name);
     startStillOpen = true;
   }
 
@@ -232,7 +233,6 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
   }
 
 
-
   public void writeAttribute(final String name, final Object value, final String property)
       throws IOException {
 
@@ -264,10 +264,10 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
     writeAttributeInternal(writer, name, value, escape);
   }
 
-  @Override
   /**
    * @deprecated Since Tobago 2.0.0
    */
+  @Override
   @Deprecated
   public String getStyleClasses() {
     if (component == null) {
@@ -286,24 +286,25 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
   }
 
 
-  protected void endElementInternal(final Writer writer, final String name) throws IOException {
+  protected void endElementInternal(final Writer writerParameter, final String name) throws IOException {
     if (EMPTY_TAG.contains(name)) {
       closeEmptyTag();
     } else {
       if (startStillOpen) {
-        writer.write("\n>");
+        writerParameter.write("\n>");
       }
-      writer.write("</");
-      writer.write(name);
+      writerParameter.write("</");
+      writerParameter.write(name);
 //      writer.write("\n>"); // FIXME: this makes problems with Tidy
-      writer.write(">");
+      writerParameter.write(">");
     }
     startStillOpen = false;
   }
+
   protected abstract void closeEmptyTag() throws IOException;
 
   protected void writeAttributeInternal(
-      final Writer writer, final String name, final String value, final boolean escape)
+      final Writer writerParameter, final String name, final String value, final boolean escape)
       throws IOException {
     if (!startStillOpen) {
       final String trace = getCallingClassStackTraceElementString();
@@ -316,13 +317,14 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
     }
 
     if (value != null) {
-      writer.write(' ');
-      writer.write(name);
-      writer.write("='");
+      writerParameter.write(' ');
+      writerParameter.write(name);
+      writerParameter.write("='");
       writerAttributeValue(value, escape);
-      writer.write('\'');
+      writerParameter.write('\'');
     }
   }
+
   protected abstract void writerAttributeValue(String value, boolean escape) throws IOException;
 
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
index 15c9e34..9140b78 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
@@ -58,11 +58,17 @@ public class TobagoResponseWriterWrapper extends TobagoResponseWriter {
     return responseWriter.cloneWithWriter(writer);
   }
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public void writeAttribute(final String name, final Object value, final String property) throws IOException {
     responseWriter.writeAttribute(name, value, property);
   }
 
+  /**
+   * @deprecated by API
+   */
   @Deprecated
   public void writeText(final Object text, final String property) throws IOException {
     responseWriter.writeText(text, property);
@@ -76,6 +82,9 @@ public class TobagoResponseWriterWrapper extends TobagoResponseWriter {
     responseWriter.writeAttribute(name, value, null);
   }
 
+  /**
+   * @deprecated by API
+   */
   @Override
   @Deprecated
   public String getStyleClasses() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/AutoLayoutToken.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/AutoLayoutToken.java
index 25a86e2..8368922 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/AutoLayoutToken.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/AutoLayoutToken.java
@@ -20,7 +20,7 @@
 package org.apache.myfaces.tobago.layout;
 
 public final class AutoLayoutToken extends LayoutToken {
-  
+
   public static final AutoLayoutToken INSTANCE = new AutoLayoutToken();
 
   public String toString() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBase.java
index ca4b07f..3e11ee4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBase.java
@@ -27,51 +27,67 @@ import org.apache.myfaces.tobago.config.Configurable;
 public interface LayoutBase extends Configurable {
 
   Measure getWidth();
+
   void setWidth(Measure width);
 
   Measure getHeight();
+
   void setHeight(Measure height);
 
   Measure getCurrentWidth();
+
   void setCurrentWidth(Measure width);
 
   Measure getCurrentHeight();
+
   void setCurrentHeight(Measure height);
 
   Measure getMinimumWidth();
+
   void setMinimumWidth(Measure minimumWidth);
 
   Measure getMinimumHeight();
+
   void setMinimumHeight(Measure minimumHeight);
 
   void setPreferredWidth(Measure preferredWidth);
+
   Measure getPreferredWidth();
 
   void setPreferredHeight(Measure preferredHeight);
+
   Measure getPreferredHeight();
 
   Measure getMaximumWidth();
+
   void setMaximumWidth(Measure maximumWidth);
 
   Measure getMaximumHeight();
+
   void setMaximumHeight(Measure maximumHeight);
 
   Measure getLeft();
+
   void setLeft(Measure left);
 
   Measure getTop();
+
   void setTop(Measure top);
 
   Measure getMarginLeft();
+
   void setMarginLeft(Measure marginLeft);
 
   Measure getMarginRight();
+
   void setMarginRight(Measure marginRight);
 
   Measure getMarginTop();
+
   void setMarginTop(Measure marginTop);
 
   Measure getMarginBottom();
+
   void setMarginBottom(Measure marginBottom);
 
 
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBox.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBox.java
index 724c237..2d92237 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBox.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBox.java
@@ -24,27 +24,35 @@ import org.apache.myfaces.tobago.config.Configurable;
 public interface LayoutBox extends Configurable {
 
   Measure getBorderLeft();
+
   void setBorderLeft(Measure borderLeft);
 
   Measure getBorderRight();
+
   void setBorderRight(Measure borderRight);
 
   Measure getBorderTop();
+
   void setBorderTop(Measure borderTop);
 
   Measure getBorderBottom();
+
   void setBorderBottom(Measure borderBottom);
 
   Measure getPaddingLeft();
+
   void setPaddingLeft(Measure paddingLeft);
 
   Measure getPaddingRight();
+
   void setPaddingRight(Measure paddingRight);
 
   Measure getPaddingTop();
+
   void setPaddingTop(Measure paddingTop);
 
   Measure getPaddingBottom();
+
   void setPaddingBottom(Measure paddingBottom);
 
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java
index d5b388f..ec64101 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java
@@ -25,18 +25,23 @@ package org.apache.myfaces.tobago.layout;
 public interface LayoutComponent extends LayoutBase {
 
   Integer getColumnSpan();
+
   void setColumnSpan(Integer columnSpan);
 
   Integer getRowSpan();
+
   void setRowSpan(Integer rowSpan);
 
   Integer getHorizontalIndex();
+
   void setHorizontalIndex(Integer horizontalIndex);
 
   Integer getVerticalIndex();
+
   void setVerticalIndex(Integer verticalIndex);
 
   Display getDisplay();
+
   void setDisplay(Display display);
 
   boolean isRendered();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
index 6b89d45..a2bb221 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
@@ -26,6 +26,7 @@ public interface LayoutContainer extends LayoutBox, LayoutBase {
   List<LayoutComponent> getComponents();
 
   LayoutManager getLayoutManager();
+
   void setLayoutManager(LayoutManager layoutManager);
 
   /**
@@ -34,8 +35,10 @@ public interface LayoutContainer extends LayoutBox, LayoutBase {
   boolean isLayoutChildren();
 
   boolean isOverflowX();
+
   void setOverflowX(boolean overflowX);
 
   boolean isOverflowY();
+
   void setOverflowY(boolean overflowY);
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
index 4f6b6f2..db73c1e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
@@ -27,7 +27,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- *  In JSPs the class {@link org.apache.myfaces.tobago.layout.MeasureEditor} will convert the string literals.
+ * In JSPs the class {@link org.apache.myfaces.tobago.layout.MeasureEditor} will convert the string literals.
  */
 public abstract class Measure implements Serializable {
 
@@ -39,7 +39,7 @@ public abstract class Measure implements Serializable {
   public static final Measure MAX = valueOf(Integer.MAX_VALUE);
 
   // todo: refactor and consolidate with LayoutToken
-  
+
   public static Measure valueOf(final Measure value) {
     if (value == null) {
       return ZERO;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java
index d3279b7..f568257 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java
@@ -26,9 +26,9 @@ import java.beans.PropertyEditorSupport;
  */
 public class MeasureEditor extends PropertyEditorSupport {
 
-    @Override
-    public void setAsText(final String text) throws IllegalArgumentException {
-        setValue(Measure.valueOf(text));
-    }
+  @Override
+  public void setAsText(final String text) throws IllegalArgumentException {
+    setValue(Measure.valueOf(text));
+  }
 
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Orientation.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Orientation.java
index 3d5ddc4..0c314a4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Orientation.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Orientation.java
@@ -20,10 +20,10 @@
 package org.apache.myfaces.tobago.layout;
 
 public enum Orientation {
-  
+
   HORIZONTAL,
   VERTICAL;
-  
+
   public Orientation other() {
     if (this == HORIZONTAL) {
       return VERTICAL;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
index 84398d3..5479216 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
@@ -28,14 +28,14 @@ public final class PixelMeasure extends Measure {
 
   static final PixelMeasure[] PIXEL_CACHE;
   static final int PIXEL_CACHE_MAX = 4000;
-  
+
   static {
     PIXEL_CACHE = new PixelMeasure[PIXEL_CACHE_MAX + 1];
     for (int i = 0; i < PIXEL_CACHE.length; i++) {
       PIXEL_CACHE[i] = new PixelMeasure(i);
     }
   }
-  
+
   private final int pixel;
... 5723 lines suppressed ...