This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-digester.git
commit b02d25fd5bb0660c5f3980ae676e2e5e720142b4
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Aug 23 08:45:11 2023 -0400
Normalize array type declarations
---
.../java/org/apache/commons/digester3/CallMethodRule.java | 2 +-
.../java/org/apache/commons/digester3/CallParamRule.java | 4 ++--
.../java/org/apache/commons/digester3/ObjectParamRule.java | 2 +-
.../java/org/apache/commons/digester3/PathCallParamRule.java | 2 +-
.../java/org/apache/commons/digester3/DigesterTestCase.java | 4 ++--
.../src/test/java/org/apache/commons/digester3/TestBean.java | 10 +++++-----
.../main/java/org/apache/commons/digester3/rss/Channel.java | 12 ++++++------
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallMethodRule.java
b/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallMethodRule.java
index e0c4e13f..8e9e437b 100644
---
a/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallMethodRule.java
+++
b/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallMethodRule.java
@@ -345,7 +345,7 @@ public class CallMethodRule
// Push an array to capture the parameter values if necessary
if ( paramCount > 0 )
{
- final Object parameters[] = new Object[paramCount];
+ final Object[] parameters = new Object[paramCount];
fill( parameters, null );
getDigester().pushParams( parameters );
}
diff --git
a/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallParamRule.java
b/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallParamRule.java
index eb19063f..00476ea1 100644
---
a/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallParamRule.java
+++
b/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallParamRule.java
@@ -174,7 +174,7 @@ public class CallParamRule
if ( param != null )
{
- final Object parameters[] = getDigester().peekParams();
+ final Object[] parameters = getDigester().peekParams();
parameters[paramIndex] = param;
}
}
@@ -208,7 +208,7 @@ public class CallParamRule
if ( bodyTextStack != null && !bodyTextStack.empty() )
{
// what we do now is push one parameter onto the top set of
parameters
- final Object parameters[] = getDigester().peekParams();
+ final Object[] parameters = getDigester().peekParams();
parameters[paramIndex] = bodyTextStack.pop();
}
}
diff --git
a/commons-digester3-core/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
b/commons-digester3-core/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
index 382bbc83..5c481553 100644
---
a/commons-digester3-core/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
+++
b/commons-digester3-core/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
@@ -96,7 +96,7 @@ public class ObjectParamRule
throws Exception
{
Object anAttribute = null;
- final Object parameters[] = getDigester().peekParams();
+ final Object[] parameters = getDigester().peekParams();
if ( attributeName != null )
{
diff --git
a/commons-digester3-core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
b/commons-digester3-core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
index e1994c16..9e77cf1d 100644
---
a/commons-digester3-core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
+++
b/commons-digester3-core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
@@ -68,7 +68,7 @@ public class PathCallParamRule
if ( param != null )
{
- final Object parameters[] = getDigester().peekParams();
+ final Object[] parameters = getDigester().peekParams();
parameters[paramIndex] = param;
}
}
diff --git
a/commons-digester3-core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
b/commons-digester3-core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
index aef786b2..c12f0b9b 100644
---
a/commons-digester3-core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
+++
b/commons-digester3-core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
@@ -64,7 +64,7 @@ public class DigesterTestCase
* The set of public identifiers, and corresponding resource names, for
the versions of the DTDs that we know about.
* There <strong>MUST</strong> be an even number of Strings in this array.
*/
- protected static final String registrations[] = { "-//Netscape
Communications//DTD RSS 0.9//EN",
+ protected static final String[] registrations = { "-//Netscape
Communications//DTD RSS 0.9//EN",
"/org/apache/commons/digester3/rss/rss-0.9.dtd", "-//Netscape
Communications//DTD RSS 0.91//EN",
"/org/apache/commons/digester3/rss/rss-0.91.dtd", };
@@ -249,7 +249,7 @@ public class DigesterTestCase
map = digester.getRegistrations();
assertEquals( "Registered two URLs", n, map.size() );
- final int count[] = new int[n];
+ final int[] count = new int[n];
for ( int i = 0; i < n; i++ ) {
count[i] = 0;
}
diff --git
a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestBean.java
b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestBean.java
index deaff66f..7a9cb248 100644
---
a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestBean.java
+++
b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestBean.java
@@ -116,7 +116,7 @@ public class TestBean
/**
* Integer arrays that are accessed as an array as well as indexed.
*/
- private int intArray[] = { 0, 10, 20, 30, 40 };
+ private int[] intArray = { 0, 10, 20, 30, 40 };
public int[] getIntArray()
{
@@ -128,7 +128,7 @@ public class TestBean
this.intArray = intArray;
}
- private final int intIndexed[] = { 0, 10, 20, 30, 40 };
+ private final int[] intIndexed = { 0, 10, 20, 30, 40 };
public int getIntIndexed( final int index )
{
@@ -140,7 +140,7 @@ public class TestBean
intIndexed[index] = value;
}
- private int intMultibox[] = new int[0];
+ private int[] intMultibox = new int[0];
public int[] getIntMultibox()
{
@@ -258,7 +258,7 @@ public class TestBean
/**
* String arrays that are accessed as an array as well as indexed.
*/
- private String stringArray[] = { "String 0", "String 1", "String 2",
"String 3", "String 4" };
+ private String[] stringArray = { "String 0", "String 1", "String 2",
"String 3", "String 4" };
public String[] getStringArray()
{
@@ -270,7 +270,7 @@ public class TestBean
this.stringArray = stringArray;
}
- private final String stringIndexed[] = { "String 0", "String 1", "String
2", "String 3", "String 4" };
+ private final String[] stringIndexed = { "String 0", "String 1", "String
2", "String 3", "String 4" };
public String getStringIndexed( final int index )
{
diff --git
a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java
b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java
index a529c334..fdee8c5e 100644
---
a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java
+++
b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java
@@ -316,7 +316,7 @@ public class Channel
{
synchronized ( items )
{
- final Item items[] = new Item[this.items.size()];
+ final Item[] items = new Item[this.items.size()];
return this.items.toArray( items );
}
}
@@ -336,7 +336,7 @@ public class Channel
{
synchronized ( skipDays )
{
- final String skipDays[] = new String[this.skipDays.size()];
+ final String[] skipDays = new String[this.skipDays.size()];
return this.skipDays.toArray( skipDays );
}
}
@@ -356,7 +356,7 @@ public class Channel
{
synchronized ( skipHours )
{
- final String skipHours[] = new String[this.skipHours.size()];
+ final String[] skipHours = new String[this.skipHours.size()];
return this.skipHours.toArray( skipHours );
}
}
@@ -596,7 +596,7 @@ public class Channel
writer.println();
}
- final String skipDays[] = findSkipDays();
+ final String[] skipDays = findSkipDays();
if ( skipDays.length > 0 )
{
writer.println( " <skipDays>" );
@@ -608,7 +608,7 @@ public class Channel
writer.println( " </skipDays>" );
}
- final String skipHours[] = findSkipHours();
+ final String[] skipHours = findSkipHours();
if ( skipHours.length > 0 )
{
writer.println( " <skipHours>" );
@@ -621,7 +621,7 @@ public class Channel
writer.println();
}
- final Item items[] = findItems();
+ final Item[] items = findItems();
for (final Item item : items) {
item.render( writer );
writer.println();
