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/18 08:36:11 UTC
[myfaces-tobago] branch master updated: style: checkstyle
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 127bd13 style: checkstyle
127bd13 is described below
commit 127bd133b03bd37416f69f640e47672eab52dbc3
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Feb 18 09:24:51 2022 +0100
style: checkstyle
---
pom.xml | 4 +--
.../myfaces/tobago/component/SupportFieldId.java | 2 +-
.../myfaces/tobago/component/SupportsDisabled.java | 2 +-
.../apache/myfaces/tobago/facelets/Resource.java | 2 +-
.../component/AbstractUICollapsiblePanel.java | 2 +-
.../internal/component/AbstractUICommand.java | 8 ++---
.../tobago/internal/config/TobagoConfigParser.java | 2 +-
.../internal/config/TobagoConfigVersion.java | 2 +-
.../renderer/LabelLayoutRendererBase.java | 2 +-
.../renderer/SelectBooleanRendererBase.java | 2 +-
.../renderkit/renderer/SelectManyRendererBase.java | 8 -----
.../taglib/component/AttributeTagDeclaration.java | 6 ++--
.../taglib/component/ConverterTagDeclaration.java | 4 +--
.../component/DataAttributeTagDeclaration.java | 4 +--
.../taglib/component/EventTagDeclaration.java | 2 +-
.../taglib/component/FlexLayoutTagDeclaration.java | 2 +-
.../GridLayoutConstraintTagDeclaration.java | 8 ++---
.../ResetInputActionListenerTagDeclaration.java | 2 +-
.../SegmentLayoutConstraintTagDeclaration.java | 30 ++++++++---------
.../component/SelectItemsTagDeclaration.java | 2 +-
.../component/TabChangeListenerTagDeclaration.java | 4 +--
.../component/ValidateFileItemTagDeclaration.java | 4 +--
...ValidateSubmittedValueLengthTagDeclaration.java | 6 ++--
.../tobago/renderkit/css/CssClassUtils.java | 18 ++++------
.../tobago/renderkit/css/FileTestUtils.java | 24 ++++++++++++++
.../apache/myfaces/tobago/util/WebXmlUtils.java | 2 +-
.../tobago/webapp/TobagoResponseWriter.java | 4 +--
.../context/TobagoMessageBundle_de.properties | 3 +-
.../context/TobagoMessageBundle_es.properties | 3 +-
.../tobago/context/TobagoResourceBundle.properties | 6 ++--
.../context/TobagoResourceBundle_de.properties | 3 +-
.../context/TobagoResourceBundle_es.properties | 6 ++--
.../renderkit/renderer/RendererTestBase.java | 4 +--
.../myfaces/tobago/model/SelectableUnitTest.java | 29 +++++++----------
.../renderkit/html/HtmlElementsUnitTest.java | 38 ++++++++++------------
.../webapp/TobagoResponseWriterUnitTest.java | 2 +-
36 files changed, 131 insertions(+), 121 deletions(-)
diff --git a/pom.xml b/pom.xml
index e3137a4..a88d1de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<required.maven.version>3.3.1</required.maven.version>
- <maven-pmd-plugin.version>3.15.0</maven-pmd-plugin.version>
- <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+ <maven-pmd-plugin.version>3.16.0</maven-pmd-plugin.version>
+ <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<!-- XXX use 16, if released -->
<checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java
index 2274642..3205c79 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java
@@ -23,5 +23,5 @@ import jakarta.faces.context.FacesContext;
public interface SupportFieldId {
- String getFieldId(final FacesContext facesContext);
+ String getFieldId(FacesContext facesContext);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsDisabled.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsDisabled.java
index ab39327..cb111b8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsDisabled.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsDisabled.java
@@ -23,5 +23,5 @@ public interface SupportsDisabled {
boolean isDisabled();
- void setDisabled(final boolean disabled);
+ void setDisabled(boolean disabled);
}
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 1e76f45..b87a1db 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
@@ -88,7 +88,7 @@ public final class Resource {
final Object ctx = externalContext.getContext();
if (ctx instanceof ServletContext) {
final ServletContext servletContext = (ServletContext) ctx;
- try (final InputStream stream = servletContext.getResourceAsStream(path)) {
+ try (InputStream stream = servletContext.getResourceAsStream(path)) {
return stream != null;
} catch (final IOException e) {
// Ignore here, since we donnot wanted to read from this
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
index 4951bf6..f702ae4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
@@ -89,7 +89,7 @@ public abstract class AbstractUICollapsiblePanel extends AbstractUIPanelBase {
public abstract boolean isCollapsed();
- public abstract void setCollapsed(final boolean collapsed);
+ public abstract void setCollapsed(boolean collapsed);
public abstract CollapseMode getCollapsedMode();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
index f5e02f3..83c7a81 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
@@ -35,7 +35,7 @@ import jakarta.faces.context.FacesContext;
* Base class for commands.
*/
public abstract class AbstractUICommand extends AbstractUICommandBase
- implements SupportsAutoSpacing, SupportsAccessKey, Visual, ClientBehaviorHolder, SupportFieldId {
+ implements SupportsAutoSpacing, SupportsAccessKey, Visual, ClientBehaviorHolder, SupportFieldId {
enum PropertyKeys {
disabled,
@@ -49,8 +49,8 @@ public abstract class AbstractUICommand extends AbstractUICommandBase
parentOfCommands = false;
for (final UIComponent child : getChildren()) {
if (child.isRendered()
- && !(child instanceof AbstractUIEvent)
- && (child instanceof UICommand || child instanceof UIInput)) {
+ && !(child instanceof AbstractUIEvent)
+ && (child instanceof UICommand || child instanceof UIInput)) {
parentOfCommands = true;
break;
}
@@ -66,7 +66,7 @@ public abstract class AbstractUICommand extends AbstractUICommandBase
@Override
public String getFieldId(final FacesContext facesContext) {
- if(isParentOfCommands()) {
+ if (isParentOfCommands()) {
return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "command";
} else {
return getClientId(facesContext);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
index 3a69086..67a2103 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
@@ -157,7 +157,7 @@ public class TobagoConfigParser extends TobagoConfigEntityResolver {
validate(url, version);
}
- try (final InputStream inputStream = url.openStream()) {
+ try (InputStream inputStream = url.openStream()) {
final SAXParserFactory factory = SAXParserFactory.newInstance();
if (!version.isSchema()) {
factory.setValidating(true);
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 f4bf524..64053d2 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
@@ -39,7 +39,7 @@ public class TobagoConfigVersion extends TobagoConfigEntityResolver {
public TobagoConfigVersion(final URL url) throws ParserConfigurationException, SAXException, IOException {
// simple reading with no validation, at this time
- try (final InputStream inputStream = url.openStream()) {
+ try (InputStream inputStream = url.openStream()) {
final SAXParserFactory factory = SAXParserFactory.newInstance();
final SAXParser saxParser = factory.newSAXParser();
saxParser.parse(inputStream, this);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
index 55f3372..0642757 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
@@ -248,5 +248,5 @@ public abstract class LabelLayoutRendererBase<T extends UIComponent & SupportsLa
}
}
- protected abstract String getFieldId(final FacesContext facesContext, final T component);
+ protected abstract String getFieldId(FacesContext facesContext, T component);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java
index ae08fd9..10fe623 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java
@@ -144,7 +144,7 @@ public abstract class SelectBooleanRendererBase<T extends AbstractUISelectBoolea
encodeBehavior(writer, facesContext, component);
}
- protected abstract CssItem[] getOuterCssItems(final FacesContext facesContext, final AbstractUISelectBoolean select);
+ protected abstract CssItem[] getOuterCssItems(FacesContext facesContext, AbstractUISelectBoolean select);
@Override
protected String getFieldId(final FacesContext facesContext, final T component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
index e85e0e7..4cac0f0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
@@ -136,11 +136,6 @@ public abstract class SelectManyRendererBase<T extends AbstractUISelectManyBase>
* If the considerValueType is true, this method will also consider the
* valueType attribute of Tomahawk UISelectMany components.
*
- * @param facesContext
- * @param component
- * @param submittedValue
- * @param considerValueType
- * @return
* @throws ConverterException
*/
static Object getConvertedUISelectManyValue(final FacesContext facesContext, final UISelectMany component,
@@ -326,9 +321,6 @@ public abstract class SelectManyRendererBase<T extends AbstractUISelectManyBase>
* be a ValueExpression (that evaluates to a String or a Class) or a
* String (that is a fully qualified Java class name) or a Class object.
*
- * @param facesContext
- * @param attribute
- * @return
* @throws FacesException if the value is a String and the represented
* class cannot be found
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
index 83911ad..0018862 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
@@ -44,13 +44,13 @@ public interface AttributeTagDeclaration {
* The name of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "name", type = "java.lang.String")
- void setName(final ValueExpression name);
+ void setName(ValueExpression name);
/**
* The value of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "value", type = "java.lang.String")
- void setValue(final ValueExpression value);
+ void setValue(ValueExpression value);
/**
* Allowed values are "action", "actionListener", "actionFromValue", "isNotSet", "isSet", "valueIfSet".
* <br>
@@ -67,6 +67,6 @@ public interface AttributeTagDeclaration {
* "valueIfSet" set the attribute only if the value is set.
*/
@TagAttribute(name = "mode")
- void setMode(final ValueExpression mode);
+ void setMode(ValueExpression mode);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
index f6e9838..551e867 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
@@ -38,11 +38,11 @@ public interface ConverterTagDeclaration {
* The converterId of a registered converter.
*/
@TagAttribute(name = "converterId", type = "java.lang.String")
- void setConverterId(final ValueExpression converterId);
+ void setConverterId(ValueExpression converterId);
/**
* The value binding expression to a converter.
*/
@TagAttribute(name = "binding", type = "jakarta.faces.convert.Converter")
- void setBinding(final ValueExpression binding);
+ void setBinding(ValueExpression binding);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
index 63fbb1e..90d8f7f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
@@ -40,11 +40,11 @@ public interface DataAttributeTagDeclaration {
* The name of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "name", type = "java.lang.String")
- void setName(final ValueExpression name);
+ void setName(ValueExpression name);
/**
* The value of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "value", type = "java.lang.String")
- void setValue(final ValueExpression value);
+ void setValue(ValueExpression value);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java
index 93a8e6c..418e86a1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java
@@ -83,6 +83,6 @@ public interface EventTagDeclaration
*/
@TagAttribute
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.component.ClientBehaviors")
- void setEvent(final ValueExpression event);
+ void setEvent(ValueExpression event);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
index 7cb0da2..b99e580 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
@@ -32,7 +32,7 @@ import org.apache.myfaces.tobago.layout.AlignItems;
import org.apache.myfaces.tobago.layout.JustifyContent;
/**
- * Renders a <a href=https://www.w3.org/TR/css-flexbox-1/>Flexible Box Layout</a>.
+ * Renders a <a href=https://www.w3.org/TR/css-flexbox-1/>Flexible Box Layout</a>.
*
* @since 3.0.0
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
index 980f877..090afb5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
@@ -36,23 +36,23 @@ public interface GridLayoutConstraintTagDeclaration {
* The number of horizontal cells this component should use.
*/
@TagAttribute(type = "java.lang.Integer")
- void setColumnSpan(final ValueExpression columnSpan);
+ void setColumnSpan(ValueExpression columnSpan);
/**
* The number of vertical cells this component should use.
*/
@TagAttribute(type = "java.lang.Integer")
- void setRowSpan(final ValueExpression rowSpan);
+ void setRowSpan(ValueExpression rowSpan);
/**
* The horizontal position in the grid of this component. Please use gridColumn and gridRow both or none.
*/
@TagAttribute(type = "java.lang.Integer")
- void setGridColumn(final ValueExpression gridColumn);
+ void setGridColumn(ValueExpression gridColumn);
/**
* The vertical position in the grid of this component. Please use gridColumn and gridRow both or none.
*/
@TagAttribute(type = "java.lang.Integer")
- void setGridRow(final ValueExpression gridRow);
+ void setGridRow(ValueExpression gridRow);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
index e1b05a8..19024ca 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
@@ -38,6 +38,6 @@ public interface ResetInputActionListenerTagDeclaration {
* them, all containing EditableValueHolder will be reset.
*/
@TagAttribute(required = false, name = Attributes.EXECUTE, type = "java.lang.String")
- void setExecute(final jakarta.el.ValueExpression execute);
+ void setExecute(jakarta.el.ValueExpression execute);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
index cc4b3ff..b6c9e2f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
@@ -39,98 +39,98 @@ public interface SegmentLayoutConstraintTagDeclaration {
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setExtraSmall(final ValueExpression extraSmall);
+ void setExtraSmall(ValueExpression extraSmall);
/**
* Overwrite the default layout for small devices.
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setSmall(final ValueExpression small);
+ void setSmall(ValueExpression small);
/**
* Overwrite the default layout for medium devices.
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setMedium(final ValueExpression medium);
+ void setMedium(ValueExpression medium);
/**
* Overwrite the default layout for large devices.
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setLarge(final ValueExpression large);
+ void setLarge(ValueExpression large);
/**
* Overwrite the default layout for extra large devices.
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setExtraLarge(final ValueExpression extraLarge);
+ void setExtraLarge(ValueExpression extraLarge);
/**
* Overwrite the default margin for extra small devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginExtraSmall(final ValueExpression overwriteMarginExtraSmall);
+ void setMarginExtraSmall(ValueExpression overwriteMarginExtraSmall);
/**
* Overwrite the default margin for small devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginSmall(final ValueExpression overwriteMarginSmall);
+ void setMarginSmall(ValueExpression overwriteMarginSmall);
/**
* Overwrite the default margin for medium devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginMedium(final ValueExpression overwriteMarginMedium);
+ void setMarginMedium(ValueExpression overwriteMarginMedium);
/**
* Overwrite the default margin for large devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginLarge(final ValueExpression overwriteMarginLarge);
+ void setMarginLarge(ValueExpression overwriteMarginLarge);
/**
* Overwrite the default margin for extra large devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginExtraLarge(final ValueExpression overwriteMarginExtraLarge);
+ void setMarginExtraLarge(ValueExpression overwriteMarginExtraLarge);
/**
* The number of columns this component moves to the right for extra small devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetExtraSmall(final ValueExpression offsetExtraSmall);
+ void setOffsetExtraSmall(ValueExpression offsetExtraSmall);
/**
* The number of columns this component moves to the right for small devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetSmall(final ValueExpression offsetSmall);
+ void setOffsetSmall(ValueExpression offsetSmall);
/**
* The number of columns this component moves to the right for medium devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetMedium(final ValueExpression offsetMedium);
+ void setOffsetMedium(ValueExpression offsetMedium);
/**
* The number of columns this component moves to the right for large devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetLarge(final ValueExpression offsetLarge);
+ void setOffsetLarge(ValueExpression offsetLarge);
/**
* The number of columns this component moves to the right for extra large devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetExtraLarge(final ValueExpression offsetLarge);
+ void setOffsetExtraLarge(ValueExpression offsetLarge);
}
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 a0f3a25..8a83959 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
@@ -59,7 +59,7 @@ public interface SelectItemsTagDeclaration extends HasId, HasBinding, HasItemLab
*/
@TagAttribute
@UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
- void setVar(final String var);
+ void setVar(String var);
/**
* Flag indicating whether the option created
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
index edffdd5..2129629 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
@@ -39,12 +39,12 @@ public interface TabChangeListenerTagDeclaration {
* created and registered.
*/
@TagAttribute(required = true, name = "type", type = "java.lang.String")
- void setType(final ValueExpression type);
+ void setType(ValueExpression type);
/**
* The value binding expression to a TabChangeListener.
*/
@TagAttribute(name = "binding", type = "org.apache.myfaces.tobago.event.TabChangeListener")
- void setBinding(final ValueExpression binding);
+ void setBinding(ValueExpression binding);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
index 3893342..d65d5f9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
@@ -37,9 +37,9 @@ import jakarta.el.ValueExpression;
public interface ValidateFileItemTagDeclaration {
@TagAttribute(name = "maxSize", type = "java.lang.Integer")
- void setMaxSize(final ValueExpression maxSize);
+ void setMaxSize(ValueExpression maxSize);
@TagAttribute(name = "contentType", type = "java.lang.String")
- void setContentType(final ValueExpression contentType);
+ void setContentType(ValueExpression contentType);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
index a81fbd0..a17f558 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
@@ -30,16 +30,16 @@ import jakarta.el.ValueExpression;
* Register an {@link 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.
+ * not on the submitted value. Sometimes you need to check the length of the submitted value.
*/
@Tag(name = "validateSubmittedValueLength")
@ValidatorTag(validatorId = SubmittedValueLengthValidator.VALIDATOR_ID)
public interface ValidateSubmittedValueLengthTagDeclaration {
@TagAttribute(name = "minimum", type = "java.lang.Integer")
- void setMinimum(final ValueExpression minimum);
+ void setMinimum(ValueExpression minimum);
@TagAttribute(name = "maximum", type = "java.lang.Integer")
- void setMaximum(final ValueExpression maximum);
+ void setMaximum(ValueExpression maximum);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
index c27c9ea..fcbaed2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
@@ -20,14 +20,11 @@
package org.apache.myfaces.tobago.renderkit.css;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
/**
- * Helpful for tests.
+ * Helpful for tests. Not for use in production.
*/
class CssClassUtils {
@@ -37,8 +34,7 @@ class CssClassUtils {
static List<CssItem> compareCss(final String cssFileName, final CssItem[] cssItems) throws IOException {
final List<CssItem> missing = new ArrayList<>();
-
- final String fileContent = new String(Files.readAllBytes(Paths.get(cssFileName)), StandardCharsets.UTF_8);
+ final String fileContent = FileTestUtils.fileToString(cssFileName);
for (final CssItem cssItem : cssItems) {
if (!containsClassName(fileContent, cssItem.getName())) {
@@ -51,10 +47,10 @@ class CssClassUtils {
private static boolean containsClassName(final String content, final String className) {
return content.contains("." + className + " ")
- || content.contains("." + className + "{")
- || content.contains("." + className + ",")
- || content.contains("." + className + ":")
- || content.contains("." + className + ".")
- || content.contains("." + className + ">");
+ || content.contains("." + className + "{")
+ || content.contains("." + className + ",")
+ || content.contains("." + className + ":")
+ || content.contains("." + className + ".")
+ || content.contains("." + className + ">");
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FileTestUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FileTestUtils.java
new file mode 100644
index 0000000..cdb3f4d
--- /dev/null
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FileTestUtils.java
@@ -0,0 +1,24 @@
+package org.apache.myfaces.tobago.renderkit.css;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
+
+/**
+ * Helpful for tests. Not for use in production.
+ */
+public class FileTestUtils {
+
+ public static String fileToString(final String file) throws IOException {
+
+ final StringBuilder stringBuilder = new StringBuilder();
+ try (Stream<String> lines = Files.lines(Paths.get(file), StandardCharsets.UTF_8)) {
+ lines.forEach(stringBuilder::append);
+ }
+
+ return stringBuilder.toString();
+ }
+
+}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
index ca5e5ab..3f3af0b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
@@ -174,7 +174,7 @@ public class WebXmlUtils {
final URLConnection connection = url.openConnection();
connection.setUseCaches(false);
- try (final InputStream input = connection.getInputStream()) {
+ try (InputStream input = connection.getInputStream()) {
final Document document = documentBuilder.parse(input);
document.getDocumentElement().normalize();
return document;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
index 187eaf1..b38576d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
@@ -73,7 +73,7 @@ public abstract class TobagoResponseWriter extends ResponseWriter {
*/
@Override
@Deprecated
- public abstract void writeAttribute(String name, Object value, final String property) throws IOException;
+ public abstract void writeAttribute(String name, Object value, String property) throws IOException;
/**
* @deprecated since 1.0.11, should not directly called via this interface. There is be a special method which might
@@ -81,7 +81,7 @@ public abstract class TobagoResponseWriter extends ResponseWriter {
*/
@Override
@Deprecated
- public abstract void writeURIAttribute(String name, Object value, final String property) throws IOException;
+ public abstract void writeURIAttribute(String name, Object value, String property) throws IOException;
/**
* @deprecated Should not directly called via this interface. There is be a special method which might be better.
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
index 7a0f7ce..eb583d3 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
@@ -16,7 +16,8 @@
org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE=Dateityp Fehler
org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE_detail=Die hochgeladene Datei ist nicht vom Typ ''{0}''.
org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT=Datei zu gro\u00DF
-org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT_detail=Die Gr\u00F6\u00DFe der hochgeladenen Datei darf nicht gr\u00F6\u00DFer als {1} Bytes sein.
+org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT_detail=Die Gr\u00F6\u00DFe der hochgeladenen Datei darf nicht \
+ gr\u00F6\u00DFer als {1} Bytes sein.
org.apache.myfaces.tobago.UISheet.SORTING=Sortieren nicht m\u00F6glich!
org.apache.myfaces.tobago.UISheet.SORTING_COL=Nach Spalte ''{0}'' kann nicht sortiert werden\!
org.apache.myfaces.tobago.UISelectOne.REQUIRED=Eine Auswahl wird ben\u00F6tigt\!
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
index 7f0a644..ab3782f 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
@@ -16,7 +16,8 @@
org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE=Error de tipo de contenido
org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE_detail=El archivo no es del tipo de contenido ''{0}''.
org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT=Error en el tama\u00F1o del archivo
-org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT_detail=El archivo subido excede el m\u00E1ximo tama\u00F1o de {0} bytes.
+org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT_detail=El archivo subido excede el m\u00E1ximo tama\u00F1o \
+ de {0} bytes.
org.apache.myfaces.tobago.UISheet.SORTING=No se puede ordenar!
org.apache.myfaces.tobago.UISheet.SORTING_COL=Despu\u00E9s de columna ''{0}'' no se puede ordenar!
org.apache.myfaces.tobago.UISelectOne.REQUIRED=Se requiere seleccionar.
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties
index 7a1d61f..403a664 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties
@@ -13,8 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-object.noframe=Your user agent does not support frames or is currently configured not to display frames. However, you may visit the related document manually:
-page.noscript=This site requires JavaScript, but JavaScript is currently not activated in your browser. To enable JavaScript you may consult your browsers the documentation.
+object.noframe=Your user agent does not support frames or is currently configured not to display frames. \
+ However, you may visit the related document manually:
+page.noscript=This site requires JavaScript, but JavaScript is currently not activated in your browser. \
+ To enable JavaScript you may consult your browsers the documentation.
sheet.ascending=Ascending
sheet.descending=Descending
sheet.first=First Page
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties
index a0e9ddc..64d7c54 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties
@@ -14,7 +14,8 @@
# limitations under the License.
object.noframe=Ihr Browser stellt keine Frames dar. Den Inhalt k\u00F6nnen Sie hier erreichen:
-page.noscript=Diese Seite ben\u00F6tigt JavaScript, allerdings ist JavaScript in Ihrem Browser derzeit deaktiviert. Um JavaScript zu aktivieren, lesen Sie ggf. die Anleitung Ihres Browsers.
+page.noscript=Diese Seite ben\u00F6tigt JavaScript, allerdings ist JavaScript in Ihrem Browser derzeit deaktiviert. \
+ Um JavaScript zu aktivieren, lesen Sie ggf. die Anleitung Ihres Browsers.
sheet.ascending=aufsteigend sortiert
sheet.descending=absteigend sortiert
sheet.first=erste Seite
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties
index b70ea66..4a13c86 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties
@@ -13,8 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-object.noframe=Tu navegador no soporta frames o est\u00E1 configurado para no desplegar frames. Como sea, puedes visitar el documento relacionado:
-page.noscript=Esta p\u00E1gina requiere JavaScript, pero JavaScript no se activa actualmente en su navegador. Para permitir JavaScript usted puede consultar la documentaci\u00F3n del navegador.
+object.noframe=Tu navegador no soporta frames o est\u00E1 configurado para no desplegar frames. \
+ Como sea, puedes visitar el documento relacionado:
+page.noscript=Esta p\u00E1gina requiere JavaScript, pero JavaScript no se activa actualmente en su navegador. \
+ Para permitir JavaScript usted puede consultar la documentaci\u00F3n del navegador.
sheet.ascending=Ascendente
sheet.descending=Descendente
sheet.first=Primera P\u00E1gina
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RendererTestBase.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RendererTestBase.java
index 7400ad9..00a36d7 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RendererTestBase.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RendererTestBase.java
@@ -43,8 +43,8 @@ public abstract class RendererTestBase extends AbstractTobagoTestBase {
if (is == null) {
throw new FileNotFoundException(fileName);
}
- try (final InputStreamReader isr = new InputStreamReader(is);
- final BufferedReader reader = new BufferedReader(isr)) {
+ try (InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader reader = new BufferedReader(isr)) {
final String xml = reader.lines().collect(Collectors.joining(System.lineSeparator()))
.replaceAll("<!--[^>]*-->", "")
.replaceAll("^\n\n", "");
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectableUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectableUnitTest.java
index 57ba762..88e30a0 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectableUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectableUnitTest.java
@@ -19,15 +19,12 @@
package org.apache.myfaces.tobago.model;
+import org.apache.myfaces.tobago.renderkit.css.FileTestUtils;
import org.apache.myfaces.tobago.util.EnumUnitTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
@@ -40,32 +37,30 @@ public class SelectableUnitTest extends EnumUnitTest {
@Test
public void testTypeScript() throws IOException {
- final Path path = Paths.get("").toAbsolutePath().getParent().resolve(
- Paths.get("tobago-theme", "tobago-theme-standard", "src", "main", "ts", "tobago-selectable.ts"));
-
- final List<String> words = getWords(path);
+ final List<String> words = getWords();
for (Selectable selectable : Selectable.values()) {
Assertions.assertTrue(words.contains(selectable.name()),
- selectable.name() + " should be found in tobago-selectable.ts");
+ selectable.name() + " should be found in tobago-selectable.ts");
}
}
- private List<String> getWords(final Path path) throws IOException {
- List<String> words = new ArrayList<>();
-
- final String fileContent = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+ private List<String> getWords() throws IOException {
+ final List<String> words = new ArrayList<>();
+ final String fileContent
+ = FileTestUtils.fileToString("../tobago-theme/tobago-theme-standard/src/main/ts/tobago-selectable.ts");
StringBuilder stringBuilder = new StringBuilder();
-
for (char c : fileContent.toCharArray()) {
if (('0' <= c && c <= '9')
- || ('A' <= c && c <= 'Z')
- || ('a' <= c && c <= 'z')) {
+ || ('A' <= c && c <= 'Z')
+ || ('a' <= c && c <= 'z')) {
stringBuilder.append(c);
} else {
- words.add(stringBuilder.toString());
+ if (stringBuilder.length() > 0) {
+ words.add(stringBuilder.toString());
+ }
stringBuilder = new StringBuilder();
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java
index a09f3a2..61ee28f 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java
@@ -19,15 +19,12 @@
package org.apache.myfaces.tobago.renderkit.html;
+import org.apache.myfaces.tobago.renderkit.css.FileTestUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -41,13 +38,13 @@ public class HtmlElementsUnitTest {
final HtmlElements element = (HtmlElements) field.get(null);
final String value = element.getValue();
Assertions.assertEquals(
- value,
- element.name().toLowerCase().replaceAll("_", "-"),
- "Check to lower: '" + element + "'");
+ value,
+ element.name().toLowerCase().replaceAll("_", "-"),
+ "Check to lower: '" + element + "'");
Assertions.assertEquals(
- value.toUpperCase().replaceAll("-", "_"),
- element.name(),
- "Check to upper: '" + element + "'");
+ value.toUpperCase().replaceAll("-", "_"),
+ element.name(),
+ "Check to upper: '" + element + "'");
}
}
@@ -56,9 +53,9 @@ public class HtmlElementsUnitTest {
// list from spec.
final List<String> voids = Arrays.asList(
- "area", "base", "br", "col", "command", "embed",
- "hr", "img", "input", "keygen", "link", "meta",
- "param", "source", "track", "wbr");
+ "area", "base", "br", "col", "command", "embed",
+ "hr", "img", "input", "keygen", "link", "meta",
+ "param", "source", "track", "wbr");
for (final Field field : HtmlElements.class.getFields()) {
final HtmlElements element = (HtmlElements) field.get(null);
@@ -74,15 +71,14 @@ public class HtmlElementsUnitTest {
@Test
public void testCompareTobagoCustomElement() throws IOException, IllegalAccessException {
- Path scssPath = Paths.get("../tobago-theme/src/main/scss/_tobago.scss");
- final String fileContent = new String(Files.readAllBytes(scssPath), StandardCharsets.UTF_8);
+ final String fileContent = FileTestUtils.fileToString("../tobago-theme/src/main/scss/_tobago.scss");
final List<HtmlElements> missing = new ArrayList<>();
for (final Field field : HtmlElements.class.getFields()) {
final HtmlElements element = (HtmlElements) field.get(null);
final String tagName = element.getValue();
- if (tagName.startsWith("tobago-") && !containsTagName(fileContent, tagName)) {
+ if (tagName.startsWith("tobago-") && !containsTagName(fileContent.toString(), tagName)) {
missing.add(element);
}
}
@@ -92,10 +88,10 @@ public class HtmlElementsUnitTest {
private boolean containsTagName(final String content, final String tagName) {
return content.contains(tagName + " ")
- || content.contains(tagName + "{")
- || content.contains(tagName + ",")
- || content.contains(tagName + ":")
- || content.contains(tagName + ".")
- || content.contains(tagName + ">");
+ || content.contains(tagName + "{")
+ || content.contains(tagName + ",")
+ || content.contains(tagName + ":")
+ || content.contains(tagName + ".")
+ || content.contains(tagName + ">");
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
index 730a4c5..49418de 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
@@ -134,7 +134,7 @@ public class TobagoResponseWriterUnitTest extends AbstractJsfTestCase {
@Test
public void testNonUtf8() throws IOException {
- try (final TobagoResponseWriter writer1
+ try (TobagoResponseWriter writer1
= new HtmlResponseWriter(stringWriter, "", StandardCharsets.ISO_8859_1)) {
writer1.startElement(HtmlElements.INPUT);
writer1.writeAttribute(HtmlAttributes.VALUE, "Gutschein über 100 €.", true);