You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2022/06/27 06:41:32 UTC
[myfaces] branch master updated: Replace array declarations written in C-style with java style. (#275)
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new c1f61cd4c Replace array declarations written in C-style with java style. (#275)
c1f61cd4c is described below
commit c1f61cd4ca032b9aedc939699526a21d5dc41870
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Mon Jun 27 08:41:28 2022 +0200
Replace array declarations written in C-style with java style. (#275)
---
.../jakarta/faces/component/UIComponentBase.java | 4 +--
.../main/java/jakarta/faces/component/UIData.java | 10 ++++----
.../jakarta/faces/convert/NumberConverter.java | 4 +--
.../faces/validator/DoubleRangeValidator.java | 4 +--
.../jakarta/faces/validator/LengthValidator.java | 4 +--
.../faces/validator/LongRangeValidator.java | 4 +--
.../myfaces/core/api/shared/MessageUtils.java | 12 ++++-----
.../api/shared/ParametrizableFacesMessage.java | 4 +--
.../myfaces/application/ApplicationImpl.java | 2 +-
.../cdi/wrapper/FacesBehaviorCDIWrapper.java | 4 +--
.../cdi/wrapper/FacesClientBehaviorCDIWrapper.java | 4 +--
.../cdi/wrapper/FacesConverterCDIWrapper.java | 4 +--
.../cdi/wrapper/FacesValidatorCDIWrapper.java | 4 +--
.../myfaces/renderkit/html/HtmlRenderKitImpl.java | 4 +--
.../renderkit/html/HtmlResponseWriterImpl.java | 6 ++---
.../java/org/apache/myfaces/util/DebugUtils.java | 2 +-
.../java/org/apache/myfaces/util/MessageUtils.java | 29 +++++++++++-----------
.../myfaces/util/ParametrizableFacesMessage.java | 4 +--
.../util/lang/FastByteArrayOutputStream.java | 4 +--
.../apache/myfaces/util/lang/StreamCharBuffer.java | 2 +-
.../myfaces/util/token/SessionIdGenerator.java | 4 +--
.../myfaces/view/facelets/component/UIRepeat.java | 10 ++++----
.../view/facelets/tag/faces/FaceletState.java | 6 ++---
23 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/api/src/main/java/jakarta/faces/component/UIComponentBase.java b/api/src/main/java/jakarta/faces/component/UIComponentBase.java
index 39a2d6d7f..b706779ad 100755
--- a/api/src/main/java/jakarta/faces/component/UIComponentBase.java
+++ b/api/src/main/java/jakarta/faces/component/UIComponentBase.java
@@ -1876,7 +1876,7 @@ public abstract class UIComponentBase extends UIComponent
else
{
//Full
- Object values[] = new Object[FULL_STATE_ARRAY_SIZE];
+ Object[] values = new Object[FULL_STATE_ARRAY_SIZE];
values[0] = saveFacesListenersList(context);
StateHelper stateHelper = getStateHelper(false);
if (stateHelper != null)
@@ -1929,7 +1929,7 @@ public abstract class UIComponentBase extends UIComponent
throw new NullPointerException ("state");
}
- Object values[] = (Object[]) state;
+ Object[] values = (Object[]) state;
if ( values.length == FULL_STATE_ARRAY_SIZE && initialStateMarked())
{
diff --git a/api/src/main/java/jakarta/faces/component/UIData.java b/api/src/main/java/jakarta/faces/component/UIData.java
index 4fd3825f5..aceef19de 100644
--- a/api/src/main/java/jakarta/faces/component/UIData.java
+++ b/api/src/main/java/jakarta/faces/component/UIData.java
@@ -1346,7 +1346,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
return;
}
- Object values[] = (Object[]) state;
+ Object[] values = (Object[]) state;
super.restoreState(context, values[0]);
Object restoredRowStates = UIComponentBase.restoreAttachedState(context, values[1]);
@@ -1427,7 +1427,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
}
else
{
- Object values[] = new Object[4];
+ Object[] values = new Object[4];
values[0] = super.saveState(context);
values[1] = UIComponentBase.saveAttachedState(context, _rowDeltaStates);
values[2] = UIComponentBase.saveAttachedState(context, _rowStates);
@@ -1443,7 +1443,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
}
else
{
- Object values[] = new Object[2];
+ Object[] values = new Object[2];
values[0] = super.saveState(context);
values[1] = UIComponentBase.saveAttachedState(context, _rowDeltaStates);
return values;
@@ -1454,7 +1454,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
{
if (context.getCurrentPhaseId() != null && !PhaseId.RENDER_RESPONSE.equals(context.getCurrentPhaseId()))
{
- Object values[] = new Object[4];
+ Object[] values = new Object[4];
values[0] = super.saveState(context);
values[1] = UIComponentBase.saveAttachedState(context, _rowDeltaStates);
values[2] = UIComponentBase.saveAttachedState(context, _rowStates);
@@ -1463,7 +1463,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
}
else
{
- Object values[] = new Object[2];
+ Object[] values = new Object[2];
values[0] = super.saveState(context);
values[1] = UIComponentBase.saveAttachedState(context, _rowDeltaStates);
return values;
diff --git a/api/src/main/java/jakarta/faces/convert/NumberConverter.java b/api/src/main/java/jakarta/faces/convert/NumberConverter.java
index 71775adb5..3999e4234 100755
--- a/api/src/main/java/jakarta/faces/convert/NumberConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/NumberConverter.java
@@ -322,7 +322,7 @@ public class NumberConverter implements Converter, PartialStateHolder
{
if (state != null)
{
- Object values[] = (Object[]) state;
+ Object[] values = (Object[]) state;
_currencyCode = (String) values[0];
_currencySymbol = (String) values[1];
_locale = (Locale) values[2];
@@ -350,7 +350,7 @@ public class NumberConverter implements Converter, PartialStateHolder
{
if (!initialStateMarked())
{
- Object values[] = new Object[15];
+ Object[] values = new Object[15];
values[0] = _currencyCode;
values[1] = _currencySymbol;
values[2] = _locale;
diff --git a/api/src/main/java/jakarta/faces/validator/DoubleRangeValidator.java b/api/src/main/java/jakarta/faces/validator/DoubleRangeValidator.java
index 62edcdc9e..0e70e9933 100755
--- a/api/src/main/java/jakarta/faces/validator/DoubleRangeValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/DoubleRangeValidator.java
@@ -179,7 +179,7 @@ public class DoubleRangeValidator
if (!initialStateMarked())
{
- Object values[] = new Object[2];
+ Object[] values = new Object[2];
values[0] = _maximum;
values[1] = _minimum;
return values;
@@ -194,7 +194,7 @@ public class DoubleRangeValidator
if (state != null)
{
- Object values[] = (Object[])state;
+ Object[] values = (Object[])state;
_maximum = (Double)values[0];
_minimum = (Double)values[1];
}
diff --git a/api/src/main/java/jakarta/faces/validator/LengthValidator.java b/api/src/main/java/jakarta/faces/validator/LengthValidator.java
index 650e0dec6..1e659d9b3 100755
--- a/api/src/main/java/jakarta/faces/validator/LengthValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/LengthValidator.java
@@ -163,7 +163,7 @@ public class LengthValidator
if (!initialStateMarked())
{
- Object values[] = new Object[2];
+ Object[] values = new Object[2];
values[0] = _maximum;
values[1] = _minimum;
return values;
@@ -179,7 +179,7 @@ public class LengthValidator
if (state != null)
{
- Object values[] = (Object[]) state;
+ Object[] values = (Object[]) state;
_maximum = (Integer)values[0];
_minimum = (Integer)values[1];
}
diff --git a/api/src/main/java/jakarta/faces/validator/LongRangeValidator.java b/api/src/main/java/jakarta/faces/validator/LongRangeValidator.java
index 8669b23db..9de4e4c0e 100755
--- a/api/src/main/java/jakarta/faces/validator/LongRangeValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/LongRangeValidator.java
@@ -192,7 +192,7 @@ public class LongRangeValidator
if (!initialStateMarked())
{
- Object values[] = new Object[2];
+ Object[] values = new Object[2];
values[0] = _maximum;
values[1] = _minimum;
return values;
@@ -207,7 +207,7 @@ public class LongRangeValidator
if (state != null)
{
- Object values[] = (Object[])state;
+ Object[] values = (Object[])state;
_maximum = (Long)values[0];
_minimum = (Long)values[1];
}
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java b/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java
index 1edb1fc2d..12df3ad56 100755
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java
@@ -65,8 +65,8 @@ public class MessageUtils
}
public static FacesMessage getErrorMessage(FacesContext facesContext,
- String messageId,
- Object args[])
+ String messageId,
+ Object[] args)
{
return getMessage(facesContext,
facesContext.getViewRoot().getLocale(),
@@ -76,10 +76,10 @@ public class MessageUtils
}
public static FacesMessage getMessage(FacesContext facesContext,
- Locale locale,
- FacesMessage.Severity severity,
- String messageId,
- Object args[])
+ Locale locale,
+ FacesMessage.Severity severity,
+ String messageId,
+ Object[] args)
{
ResourceBundle appBundle;
ResourceBundle defBundle;
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/ParametrizableFacesMessage.java b/api/src/main/java/org/apache/myfaces/core/api/shared/ParametrizableFacesMessage.java
index 0a634b6b6..288b9f381 100644
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/ParametrizableFacesMessage.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/ParametrizableFacesMessage.java
@@ -34,10 +34,10 @@ public class ParametrizableFacesMessage extends FacesMessage
{
private static final long serialVersionUID = 7792947730961657948L;
- private final Object args[];
+ private final Object[] args;
private String evaluatedDetail;
private String evaluatedSummary;
- private transient Object evaluatedArgs[];
+ private transient Object[] evaluatedArgs;
private Locale locale;
public ParametrizableFacesMessage(String summary, String detail, Object[] args, Locale locale)
diff --git a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
index 8c608837f..2bfc29b0a 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -1403,7 +1403,7 @@ public class ApplicationImpl extends Application
// (save 3 additional lookups over a concurrent map per request).
if (converterClassOrClassName == null && !String.class.equals(targetClass))
{
- final Class<?> interfaces[] = targetClass.getInterfaces();
+ final Class<?>[] interfaces = targetClass.getInterfaces();
if (interfaces != null)
{
for (int i = 0, len = interfaces.length; i < len; i++)
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesBehaviorCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesBehaviorCDIWrapper.java
index e07f8c7a1..7e5cc4441 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesBehaviorCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesBehaviorCDIWrapper.java
@@ -65,7 +65,7 @@ public class FacesBehaviorCDIWrapper implements PartialStateHolder, Behavior, Fa
{
if (!initialStateMarked())
{
- Object values[] = new Object[1];
+ Object[] values = new Object[1];
values[0] = behaviorId;
return values;
}
@@ -77,7 +77,7 @@ public class FacesBehaviorCDIWrapper implements PartialStateHolder, Behavior, Fa
{
if (state != null)
{
- Object values[] = (Object[])state;
+ Object[] values = (Object[])state;
behaviorId = (String)values[0];
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesClientBehaviorCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesClientBehaviorCDIWrapper.java
index 113145b2b..dd3ca0d6e 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesClientBehaviorCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesClientBehaviorCDIWrapper.java
@@ -87,7 +87,7 @@ public class FacesClientBehaviorCDIWrapper implements PartialStateHolder, Client
{
if (!initialStateMarked())
{
- Object values[] = new Object[1];
+ Object[] values = new Object[1];
values[0] = behaviorId;
return values;
}
@@ -99,7 +99,7 @@ public class FacesClientBehaviorCDIWrapper implements PartialStateHolder, Client
{
if (state != null)
{
- Object values[] = (Object[])state;
+ Object[] values = (Object[])state;
behaviorId = (String)values[0];
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesConverterCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesConverterCDIWrapper.java
index 86294f21e..6edf8f8dc 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesConverterCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesConverterCDIWrapper.java
@@ -105,7 +105,7 @@ public class FacesConverterCDIWrapper implements PartialStateHolder, Converter,
{
if (!initialStateMarked())
{
- Object values[] = new Object[2];
+ Object[] values = new Object[2];
values[0] = forClass;
values[1] = converterId;
return values;
@@ -118,7 +118,7 @@ public class FacesConverterCDIWrapper implements PartialStateHolder, Converter,
{
if (state != null)
{
- Object values[] = (Object[])state;
+ Object[] values = (Object[])state;
forClass = (Class)values[0];
converterId = (String)values[1];
}
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesValidatorCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesValidatorCDIWrapper.java
index b5c80a75e..5ee27c290 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesValidatorCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesValidatorCDIWrapper.java
@@ -80,7 +80,7 @@ public class FacesValidatorCDIWrapper implements PartialStateHolder, Validator,
{
if (!initialStateMarked())
{
- Object values[] = new Object[1];
+ Object[] values = new Object[1];
values[0] = validatorId;
return values;
}
@@ -92,7 +92,7 @@ public class FacesValidatorCDIWrapper implements PartialStateHolder, Validator,
{
if (state != null)
{
- Object values[] = (Object[])state;
+ Object[] values = (Object[])state;
validatorId = (String)values[0];
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
index 8f9e6a095..c422607f1 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
@@ -365,13 +365,13 @@ public class HtmlRenderKitImpl extends RenderKit implements LazyRenderKit
}
@Override
- public void write(byte b[]) throws IOException
+ public void write(byte[] b) throws IOException
{
output.write(b);
}
@Override
- public void write(byte b[], int off, int len) throws IOException
+ public void write(byte[] b, int off, int len) throws IOException
{
output.write(b, off, len);
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
index 5512c1430..3b1c4a0b2 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
@@ -889,7 +889,7 @@ public class HtmlResponseWriterImpl extends ResponseWriter
}
@Override
- public void writeText(char cbuf[], int off, int len) throws IOException
+ public void writeText(char[] cbuf, int off, int len) throws IOException
{
Assert.notNull(cbuf, "cbuf");
@@ -1000,7 +1000,7 @@ public class HtmlResponseWriterImpl extends ResponseWriter
}
@Override
- public void write(char cbuf[], int off, int len) throws IOException
+ public void write(char[] cbuf, int off, int len) throws IOException
{
closeStartTagIfNecessary();
// Don't bother encoding anything if chosen character encoding is UTF-8
@@ -1022,7 +1022,7 @@ public class HtmlResponseWriterImpl extends ResponseWriter
}
@Override
- public void write(char cbuf[]) throws IOException
+ public void write(char[] cbuf) throws IOException
{
closeStartTagIfNecessary();
// Don't bother encoding anything if chosen character encoding is UTF-8
diff --git a/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java b/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
index b046ea51e..97a7a6e66 100755
--- a/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
@@ -199,7 +199,7 @@ public class DebugUtils
if (!compType.startsWith("org.apache.myfaces.view.facelets.compiler"))
{
- PropertyDescriptor propDescriptors[] = beanInfo.getPropertyDescriptors();
+ PropertyDescriptor[] propDescriptors = beanInfo.getPropertyDescriptors();
for (int i = 0; i < propDescriptors.length; i++)
{
if (propDescriptors[i].getReadMethod() != null)
diff --git a/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java b/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java
index f17e38c78..dd5d46e64 100755
--- a/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java
@@ -227,7 +227,7 @@ public final class MessageUtils
* @param params The params to fill in the String with.
* @return The updated String.
*/
- public static String substituteParams(Locale locale, String msgtext, Object params[])
+ public static String substituteParams(Locale locale, String msgtext, Object[] params)
{
String localizedStr = null;
if(params == null || msgtext == null)
@@ -243,13 +243,13 @@ public final class MessageUtils
return localizedStr;
}
- public static FacesMessage getMessage(String messageId, Object params[])
+ public static FacesMessage getMessage(String messageId, Object[] params)
{
Locale locale = getCurrentLocale();
return getMessage(locale, messageId, params);
}
- public static FacesMessage getMessageFromBundle(String bundleBaseName, String messageId, Object params[])
+ public static FacesMessage getMessageFromBundle(String bundleBaseName, String messageId, Object[] params)
{
Locale locale = null;
FacesContext context = FacesContext.getCurrentInstance();
@@ -268,7 +268,7 @@ public final class MessageUtils
return getMessageFromBundle(bundleBaseName, context , locale, messageId, params);
}
- public static FacesMessage getMessage(Locale locale, String messageId, Object params[])
+ public static FacesMessage getMessage(Locale locale, String messageId, Object[] params)
{
String summary = null;
String detail = null;
@@ -378,8 +378,9 @@ public final class MessageUtils
}
}
- public static FacesMessage getMessageFromBundle(String bundleBaseName,
- FacesContext context, Locale locale, String messageId, Object params[])
+ public static FacesMessage getMessageFromBundle(String bundleBaseName,
+ FacesContext context, Locale locale,
+ String messageId, Object[] params)
{
String summary = null;
String detail = null;
@@ -529,7 +530,7 @@ public final class MessageUtils
* @param params parameters to set at localized message
* @return generated FacesMessage
*/
- public static FacesMessage getMessage(String bundleBaseName, String messageId, Object params[])
+ public static FacesMessage getMessage(String bundleBaseName, String messageId, Object[] params)
{
return getMessage(bundleBaseName, getCurrentLocale(), messageId, params);
}
@@ -569,8 +570,8 @@ public final class MessageUtils
* @param params parameters to set at localized message
* @return generated FacesMessage
*/
- public static FacesMessage getMessage(FacesMessage.Severity severity, String bundleBaseName,
- String messageId, Object params[])
+ public static FacesMessage getMessage(FacesMessage.Severity severity, String bundleBaseName,
+ String messageId, Object[] params)
{
FacesMessage msg = getMessage(bundleBaseName, messageId, params);
msg.setSeverity(severity);
@@ -588,7 +589,7 @@ public final class MessageUtils
* @param params parameters to set at localized message
* @return generated FacesMessage
*/
- public static FacesMessage getMessage(String bundleBaseName, Locale locale, String messageId, Object params[])
+ public static FacesMessage getMessage(String bundleBaseName, Locale locale, String messageId, Object[] params)
{
if (bundleBaseName == null)
{
@@ -606,7 +607,7 @@ public final class MessageUtils
* @param params parameters to set at localized message
* @return generated FacesMessage
*/
- public static FacesMessage getMessage(ResourceBundle bundle, String messageId, Object params[])
+ public static FacesMessage getMessage(ResourceBundle bundle, String messageId, Object[] params)
{
String summary = null;
String detail = null;
@@ -669,7 +670,7 @@ public final class MessageUtils
* @param params
* @return generated FacesMessage
*/
- public static FacesMessage getMessage(FacesContext context, String messageId, Object params[])
+ public static FacesMessage getMessage(FacesContext context, String messageId, Object[] params)
{
if(context == null || messageId == null)
{
@@ -694,8 +695,8 @@ public final class MessageUtils
}
}
- public static FacesMessage getMessage(String bundleBaseName, FacesContext context,
- String messageId, Object params[])
+ public static FacesMessage getMessage(String bundleBaseName, FacesContext context,
+ String messageId, Object[] params)
{
if(context == null || messageId == null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/util/ParametrizableFacesMessage.java b/impl/src/main/java/org/apache/myfaces/util/ParametrizableFacesMessage.java
index 39d938d78..33bd1bcba 100644
--- a/impl/src/main/java/org/apache/myfaces/util/ParametrizableFacesMessage.java
+++ b/impl/src/main/java/org/apache/myfaces/util/ParametrizableFacesMessage.java
@@ -34,10 +34,10 @@ public class ParametrizableFacesMessage extends FacesMessage
{
private static final long serialVersionUID = 7792947730961657948L;
- private final Object _args[];
+ private final Object[] _args;
private String _evaluatedDetail;
private String _evaluatedSummary;
- private transient Object _evaluatedArgs[];
+ private transient Object[] _evaluatedArgs;
private Locale _locale;
public ParametrizableFacesMessage(
diff --git a/impl/src/main/java/org/apache/myfaces/util/lang/FastByteArrayOutputStream.java b/impl/src/main/java/org/apache/myfaces/util/lang/FastByteArrayOutputStream.java
index a952fed73..eb155ef8a 100644
--- a/impl/src/main/java/org/apache/myfaces/util/lang/FastByteArrayOutputStream.java
+++ b/impl/src/main/java/org/apache/myfaces/util/lang/FastByteArrayOutputStream.java
@@ -71,7 +71,7 @@ public class FastByteArrayOutputStream extends OutputStream
}
@Override
- public final void write(byte b[])
+ public final void write(byte[] b)
{
verifyBufferSize(size + b.length);
System.arraycopy(b, 0, buf, size, b.length);
@@ -79,7 +79,7 @@ public class FastByteArrayOutputStream extends OutputStream
}
@Override
- public final void write(byte b[], int off, int len)
+ public final void write(byte[] b, int off, int len)
{
verifyBufferSize(size + len);
System.arraycopy(b, off, buf, size, len);
diff --git a/impl/src/main/java/org/apache/myfaces/util/lang/StreamCharBuffer.java b/impl/src/main/java/org/apache/myfaces/util/lang/StreamCharBuffer.java
index 3047dba81..8a960c35c 100644
--- a/impl/src/main/java/org/apache/myfaces/util/lang/StreamCharBuffer.java
+++ b/impl/src/main/java/org/apache/myfaces/util/lang/StreamCharBuffer.java
@@ -1975,7 +1975,7 @@ public class StreamCharBuffer implements /*Writable,*/CharSequence,
*/
private static final class FixedCharArrayWriter extends Writer
{
- char buf[];
+ char[] buf;
int count = 0;
public FixedCharArrayWriter(int fixedSize)
diff --git a/impl/src/main/java/org/apache/myfaces/util/token/SessionIdGenerator.java b/impl/src/main/java/org/apache/myfaces/util/token/SessionIdGenerator.java
index beb61be5a..3e6dcd309 100644
--- a/impl/src/main/java/org/apache/myfaces/util/token/SessionIdGenerator.java
+++ b/impl/src/main/java/org/apache/myfaces/util/token/SessionIdGenerator.java
@@ -143,7 +143,7 @@ public class SessionIdGenerator
public String generateSessionId()
{
- byte random[] = new byte[16];
+ byte[] random = new byte[16];
// Render the result as a String of hexadecimal digits
StringBuilder buffer = new StringBuilder();
@@ -187,7 +187,7 @@ public class SessionIdGenerator
return buffer.toString();
}
- public void getRandomBytes(byte bytes[])
+ public void getRandomBytes(byte[] bytes)
{
SecureRandom random = randoms.poll();
if (random == null)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java b/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
index c138de84b..b0c55026c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
@@ -1639,7 +1639,7 @@ public class UIRepeat extends UIComponentBase implements NamingContainer
return;
}
- Object values[] = (Object[]) state;
+ Object[] values = (Object[]) state;
super.restoreState(context, values[0]);
if (values.length > 2)
@@ -1690,7 +1690,7 @@ public class UIRepeat extends UIComponentBase implements NamingContainer
}
else
{
- Object values[] = new Object[3];
+ Object[] values = new Object[3];
values[0] = super.saveState(context);
values[1] = null;
values[2] = UIComponentBase.saveAttachedState(context, _rowStates);
@@ -1705,7 +1705,7 @@ public class UIRepeat extends UIComponentBase implements NamingContainer
}
else
{
- Object values[] = new Object[2];
+ Object[] values = new Object[2];
values[0] = super.saveState(context);
values[1] = null;
return values;
@@ -1717,7 +1717,7 @@ public class UIRepeat extends UIComponentBase implements NamingContainer
if (context.getCurrentPhaseId() != null &&
!PhaseId.RENDER_RESPONSE.equals(context.getCurrentPhaseId()))
{
- Object values[] = new Object[3];
+ Object[] values = new Object[3];
values[0] = super.saveState(context);
values[1] = null;
values[2] = UIComponentBase.saveAttachedState(context, _rowStates);
@@ -1725,7 +1725,7 @@ public class UIRepeat extends UIComponentBase implements NamingContainer
}
else
{
- Object values[] = new Object[2];
+ Object[] values = new Object[2];
values[0] = super.saveState(context);
values[1] = null;
return values;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/FaceletState.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/FaceletState.java
index 7981a9843..1254bc88f 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/FaceletState.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/FaceletState.java
@@ -67,7 +67,7 @@ public class FaceletState implements StateHolder, Serializable
{
if (stateMap != null)
{
- Object values[] = new Object[1];
+ Object[] values = new Object[1];
values[0] = UIComponentBase.saveAttachedState(context, stateMap);
return values;
}
@@ -75,7 +75,7 @@ public class FaceletState implements StateHolder, Serializable
}
else
{
- Object values[] = new Object[2];
+ Object[] values = new Object[2];
values[0] = UIComponentBase.saveAttachedState(context, stateMap);
// If the UIViewRoot instance was not marked with initial state, that means
// we need to save the bindingsMap as well because it will not be restored
@@ -96,7 +96,7 @@ public class FaceletState implements StateHolder, Serializable
bindingsMap = null;
return;
}
- Object values[] = (Object[])state;
+ Object[] values = (Object[])state;
if (values.length == 2)
{
// Full state