(tomcat) 01/03: Code clean-up - formatting. No functional change.

2024-05-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit f7ebc3345518dfcdf3da3c06c09a6df6218c4d1a
Author: Mark Thomas 
AuthorDate: Fri May 3 10:06:02 2024 +0100

Code clean-up - formatting. No functional change.
---
 .../apache/catalina/ant/AbstractCatalinaTask.java  |  58 +++
 .../catalina/ant/BaseRedirectorHelperTask.java |  89 ---
 java/org/apache/catalina/ant/DeployTask.java   |  12 +-
 java/org/apache/catalina/ant/FindLeaksTask.java|  12 +-
 .../apache/catalina/ant/JKStatusUpdateTask.java|  96 
 java/org/apache/catalina/ant/JMXGetTask.java   |  25 +--
 java/org/apache/catalina/ant/JMXQueryTask.java |  19 ++-
 java/org/apache/catalina/ant/JMXSetTask.java   |  35 +++--
 java/org/apache/catalina/ant/ListTask.java |   4 +-
 java/org/apache/catalina/ant/ReloadTask.java   |   5 +-
 java/org/apache/catalina/ant/ResourcesTask.java|  10 +-
 java/org/apache/catalina/ant/ServerinfoTask.java   |   3 +-
 java/org/apache/catalina/ant/SessionsTask.java |   3 +-
 .../catalina/ant/SslConnectorCiphersTask.java  |   4 +-
 java/org/apache/catalina/ant/StartTask.java|   4 +-
 java/org/apache/catalina/ant/StopTask.java |   4 +-
 java/org/apache/catalina/ant/ThreaddumpTask.java   |   4 +-
 java/org/apache/catalina/ant/UndeployTask.java |   4 +-
 java/org/apache/catalina/ant/ValidatorTask.java|  12 +-
 java/org/apache/catalina/ant/VminfoTask.java   |   4 +-
 java/org/apache/catalina/ant/jmx/Arg.java  |   8 +-
 .../catalina/ant/jmx/JMXAccessorCondition.java |  40 +++--
 .../catalina/ant/jmx/JMXAccessorConditionBase.java |  36 +++--
 .../catalina/ant/jmx/JMXAccessorCreateTask.java|  49 +++---
 .../ant/jmx/JMXAccessorEqualsCondition.java|   9 +-
 .../catalina/ant/jmx/JMXAccessorGetTask.java   |  26 ++--
 .../catalina/ant/jmx/JMXAccessorInvokeTask.java|  67 
 .../catalina/ant/jmx/JMXAccessorQueryTask.java |  27 ++--
 .../catalina/ant/jmx/JMXAccessorSetTask.java   |  44 +++---
 .../apache/catalina/ant/jmx/JMXAccessorTask.java   | 173 +
 .../ant/jmx/JMXAccessorUnregisterTask.java |  28 ++--
 31 files changed, 420 insertions(+), 494 deletions(-)

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 61ac76e5e5..810929a4d9 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -32,11 +32,11 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 
 /**
- * Abstract base class for Ant tasks that interact with the Manager 
web
- * application for dynamically deploying and undeploying applications. These
- * tasks require Ant 1.4 or later.
+ * Abstract base class for Ant tasks that interact with the Manager 
web application for dynamically deploying
+ * and undeploying applications. These tasks require Ant 1.4 or later.
  *
  * @author Craig R. McClanahan
+ *
  * @since 4.1
  */
 public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask {
@@ -107,16 +107,14 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 }
 
 /**
- * If set to true - ignore the constraint of the first line of the response
- * message that must be "OK -".
+ * If set to true - ignore the constraint of the first line of the 
response message that must be "OK -".
  * 
- * When this attribute is set to {@code false} (the default), the first 
line
- * of server response is expected to start with "OK -". If it does not then
- * the task is considered as failed and the first line is treated as an
- * error message.
+ * When this attribute is set to {@code false} (the default), the first 
line of server response is expected to start
+ * with "OK -". If it does not then the task is considered as failed and 
the first line is treated as an error
+ * message.
  * 
- * When this attribute is set to {@code true}, the first line of the
- * response is treated like any other, regardless of its text.
+ * When this attribute is set to {@code true}, the first line of the 
response is treated like any other, regardless
+ * of its text.
  */
 protected boolean ignoreResponseConstraint = false;
 
@@ -132,9 +130,8 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 // - Public Methods
 
 /**
- * Execute the specified command. This logic only performs the common
- * attribute validation required by all subclasses; it does not perform any
- * functional logic directly.
+ * Execute the specified command. This logic only performs the common 
attribute validation required by all

(tomcat) 01/03: Code clean-up. Formatting. No functional change.

2024-02-20 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 799eea5b1ba1a2dcf5fb592a178a8cd768358bb8
Author: Mark Thomas 
AuthorDate: Tue Feb 20 12:45:18 2024 +

Code clean-up. Formatting. No functional change.
---
 java/jakarta/el/RecordELResolver.java | 18 +++---
 java/jakarta/el/Util.java |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/java/jakarta/el/RecordELResolver.java 
b/java/jakarta/el/RecordELResolver.java
index 6a5683924f..fcb70fe7e9 100644
--- a/java/jakarta/el/RecordELResolver.java
+++ b/java/jakarta/el/RecordELResolver.java
@@ -22,9 +22,9 @@ import java.util.Objects;
 /**
  * Defines property resolution behavior on instances of {@link Record}.
  * 
- * The resolver handles base objects of type {@link Record}. It accepts any 
non-{@code null} object as a property and coerces it to a
- * String using {@link Object#toString()}. The property string is used to find 
an accessor method for a field
- * with the same name.
+ * The resolver handles base objects of type {@link Record}. It accepts any 
non-{@code null} object as a property and
+ * coerces it to a String using {@link Object#toString()}. The property string 
is used to find an accessor method for a
+ * field with the same name.
  * 
  * This resolver is always read-only since {@link Record}s are always 
read-only.
  * 
@@ -67,8 +67,7 @@ public class RecordELResolver extends ELResolver {
 method = base.getClass().getMethod(propertyName);
 } catch (NoSuchMethodException nsme) {
 throw new PropertyNotFoundException(
-Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName),
-nsme);
+Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName), nsme);
 }
 
 try {
@@ -112,8 +111,7 @@ public class RecordELResolver extends ELResolver {
 base.getClass().getMethod(propertyName);
 } catch (NoSuchMethodException nsme) {
 throw new PropertyNotFoundException(
-Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName),
-nsme);
+Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName), nsme);
 }
 }
 return null;
@@ -150,8 +148,7 @@ public class RecordELResolver extends ELResolver {
 base.getClass().getMethod(propertyName);
 } catch (NoSuchMethodException nsme) {
 throw new PropertyNotFoundException(
-Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName),
-nsme);
+Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName), nsme);
 }
 
 throw new PropertyNotWritableException(
@@ -187,8 +184,7 @@ public class RecordELResolver extends ELResolver {
 base.getClass().getMethod(propertyName);
 } catch (NoSuchMethodException nsme) {
 throw new PropertyNotFoundException(
-Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName),
-nsme);
+Util.message(context, "propertyNotFound", 
base.getClass().getName(), propertyName), nsme);
 }
 
 return true;
diff --git a/java/jakarta/el/Util.java b/java/jakarta/el/Util.java
index f44b662063..c168de6e5b 100644
--- a/java/jakarta/el/Util.java
+++ b/java/jakarta/el/Util.java
@@ -494,8 +494,8 @@ class Util {
  */
 private static boolean isCoercibleFrom(ELContext context, Object src, 
Class target) {
 /*
- *  TODO: This isn't pretty but it works. Significant refactoring 
would be required to avoid the exception. See
- *also OptionalELResolver.convertToType().
+ * TODO: This isn't pretty but it works. Significant refactoring would 
be required to avoid the exception. See
+ * also OptionalELResolver.convertToType().
  */
 try {
 context.convertToType(src, target);


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/03: Code clean-up - formatting. No functional change.

2023-06-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit eb2c56ed3320cc0a3925ee3949b3bb000cb80e75
Author: Mark Thomas 
AuthorDate: Wed Jun 14 12:19:32 2023 +0100

Code clean-up - formatting. No functional change.
---
 java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 12 ++--
 java/org/apache/tomcat/util/http/HttpMessages.java   |  6 +++---
 java/org/apache/tomcat/util/http/LegacyCookieProcessor.java  |  8 
 java/org/apache/tomcat/util/http/Parameters.java |  8 
 java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java |  4 ++--
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java 
b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index 6c941c984e..cbb7be9151 100644
--- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
+++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
@@ -35,8 +35,8 @@ public final class FastHttpDateFormat {
 // -- Variables
 
 
-private static final int CACHE_SIZE = Integer
-
.getInteger("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE", 
1000).intValue();
+private static final int CACHE_SIZE =
+
Integer.getInteger("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE", 
1000).intValue();
 
 
 /**
@@ -66,8 +66,8 @@ public final class FastHttpDateFormat {
 FORMAT_OBSOLETE_RFC850 = new 
ConcurrentDateFormat(DATE_OBSOLETE_RFC850, Locale.US, tz);
 FORMAT_OBSOLETE_ASCTIME = new 
ConcurrentDateFormat(DATE_OBSOLETE_ASCTIME, Locale.US, tz);
 
-httpParseFormats = new ConcurrentDateFormat[] { FORMAT_RFC5322, 
FORMAT_OBSOLETE_RFC850,
-FORMAT_OBSOLETE_ASCTIME };
+httpParseFormats =
+new ConcurrentDateFormat[] { FORMAT_RFC5322, 
FORMAT_OBSOLETE_RFC850, FORMAT_OBSOLETE_ASCTIME };
 }
 
 /**
@@ -85,13 +85,13 @@ public final class FastHttpDateFormat {
 /**
  * Formatter cache.
  */
-private static final Map formatCache = new 
ConcurrentHashMap<>(CACHE_SIZE);
+private static final Map formatCache = new 
ConcurrentHashMap<>(CACHE_SIZE);
 
 
 /**
  * Parser cache.
  */
-private static final Map parseCache = new 
ConcurrentHashMap<>(CACHE_SIZE);
+private static final Map parseCache = new 
ConcurrentHashMap<>(CACHE_SIZE);
 
 
 // - Public Methods
diff --git a/java/org/apache/tomcat/util/http/HttpMessages.java 
b/java/org/apache/tomcat/util/http/HttpMessages.java
index dee85c18fd..816b0e9cb5 100644
--- a/java/org/apache/tomcat/util/http/HttpMessages.java
+++ b/java/org/apache/tomcat/util/http/HttpMessages.java
@@ -33,10 +33,10 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class HttpMessages {
 
-private static final Map instances = new 
ConcurrentHashMap<>();
+private static final Map instances = new 
ConcurrentHashMap<>();
 
-private static final HttpMessages DEFAULT = new HttpMessages(
-StringManager.getManager("org.apache.tomcat.util.http.res", 
Locale.getDefault()));
+private static final HttpMessages DEFAULT =
+new 
HttpMessages(StringManager.getManager("org.apache.tomcat.util.http.res", 
Locale.getDefault()));
 
 
 // XXX move message resources in this package
diff --git a/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
b/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
index d41b829ae3..6494ba75f1 100644
--- a/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
+++ b/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
@@ -52,8 +52,8 @@ public final class LegacyCookieProcessor extends 
CookieProcessorBase {
 
 // Excludes '/' since configuration controls whether or not to treat '/' as
 // a separator
-private static final char[] HTTP_SEPARATORS = new char[] { '\t', ' ', 
'\"', '(', ')', ',', ':', ';', '<', '=', '>',
-'?', '@', '[', '\\', ']', '{', '}' };
+private static final char[] HTTP_SEPARATORS =
+new char[] { '\t', ' ', '\"', '(', ')', ',', ':', ';', '<', '=', 
'>', '?', '@', '[', '\\', ']', '{', '}' };
 
 static {
 for (char c : V0_SEPARATORS) {
@@ -61,8 +61,8 @@ public final class LegacyCookieProcessor extends 
CookieProcessorBase {
 }
 }
 
-private final boolean STRICT_SERVLET_COMPLIANCE = Boolean
-.getBoolean("org.apache.catalina.STRICT_SERVLET_COMPLIANCE");
+private final boolean STRICT_SERVLET_COMPLIANCE =
+
Boolean.getBoolean("org.apache.catalina.STRICT_SERVLET_COMPLIANCE");
 
 private boolean allowEqualsInValue = false;
 
diff --git a/java/org/apache/tomcat/util/http/Parameters.java 

[tomcat] 01/03: Code clean-up - formatting. No functional change.

2023-06-14 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e664967cafc80e9580202280e89693857e353294
Author: Mark Thomas 
AuthorDate: Wed Jun 14 12:17:24 2023 +0100

Code clean-up - formatting. No functional change.
---
 java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 12 ++--
 java/org/apache/tomcat/util/http/LegacyCookieProcessor.java  |  8 
 java/org/apache/tomcat/util/http/Parameters.java |  8 
 java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java 
b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index 6c941c984e..cbb7be9151 100644
--- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
+++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
@@ -35,8 +35,8 @@ public final class FastHttpDateFormat {
 // -- Variables
 
 
-private static final int CACHE_SIZE = Integer
-
.getInteger("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE", 
1000).intValue();
+private static final int CACHE_SIZE =
+
Integer.getInteger("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE", 
1000).intValue();
 
 
 /**
@@ -66,8 +66,8 @@ public final class FastHttpDateFormat {
 FORMAT_OBSOLETE_RFC850 = new 
ConcurrentDateFormat(DATE_OBSOLETE_RFC850, Locale.US, tz);
 FORMAT_OBSOLETE_ASCTIME = new 
ConcurrentDateFormat(DATE_OBSOLETE_ASCTIME, Locale.US, tz);
 
-httpParseFormats = new ConcurrentDateFormat[] { FORMAT_RFC5322, 
FORMAT_OBSOLETE_RFC850,
-FORMAT_OBSOLETE_ASCTIME };
+httpParseFormats =
+new ConcurrentDateFormat[] { FORMAT_RFC5322, 
FORMAT_OBSOLETE_RFC850, FORMAT_OBSOLETE_ASCTIME };
 }
 
 /**
@@ -85,13 +85,13 @@ public final class FastHttpDateFormat {
 /**
  * Formatter cache.
  */
-private static final Map formatCache = new 
ConcurrentHashMap<>(CACHE_SIZE);
+private static final Map formatCache = new 
ConcurrentHashMap<>(CACHE_SIZE);
 
 
 /**
  * Parser cache.
  */
-private static final Map parseCache = new 
ConcurrentHashMap<>(CACHE_SIZE);
+private static final Map parseCache = new 
ConcurrentHashMap<>(CACHE_SIZE);
 
 
 // - Public Methods
diff --git a/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
b/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
index 55656306c4..5e622d8f2f 100644
--- a/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
+++ b/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
@@ -52,8 +52,8 @@ public final class LegacyCookieProcessor extends 
CookieProcessorBase {
 
 // Excludes '/' since configuration controls whether or not to treat '/' as
 // a separator
-private static final char[] HTTP_SEPARATORS = new char[] { '\t', ' ', 
'\"', '(', ')', ',', ':', ';', '<', '=', '>',
-'?', '@', '[', '\\', ']', '{', '}' };
+private static final char[] HTTP_SEPARATORS =
+new char[] { '\t', ' ', '\"', '(', ')', ',', ':', ';', '<', '=', 
'>', '?', '@', '[', '\\', ']', '{', '}' };
 
 static {
 for (char c : V0_SEPARATORS) {
@@ -61,8 +61,8 @@ public final class LegacyCookieProcessor extends 
CookieProcessorBase {
 }
 }
 
-private final boolean STRICT_SERVLET_COMPLIANCE = Boolean
-.getBoolean("org.apache.catalina.STRICT_SERVLET_COMPLIANCE");
+private final boolean STRICT_SERVLET_COMPLIANCE =
+
Boolean.getBoolean("org.apache.catalina.STRICT_SERVLET_COMPLIANCE");
 
 private boolean allowEqualsInValue = false;
 
diff --git a/java/org/apache/tomcat/util/http/Parameters.java 
b/java/org/apache/tomcat/util/http/Parameters.java
index debf968acf..e56793b3de 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -44,7 +44,7 @@ public final class Parameters {
 
 private static final StringManager sm = 
StringManager.getManager("org.apache.tomcat.util.http");
 
-private final Map> paramHashValues = new 
LinkedHashMap<>();
+private final Map> paramHashValues = new 
LinkedHashMap<>();
 private boolean didQueryParameters = false;
 
 private MessageBytes queryMB;
@@ -418,8 +418,8 @@ public final class Parameters {
 } else if (log.isInfoEnabled()) {
 UserDataHelper.Mode logMode = 
userDataLog.getNextMode();
 if (logMode != null) {
-String message = 
sm.getString("parameters.decodeFail.info", tmpName.toString(),
-tmpValue.toString());
+String 

[tomcat] 01/03: Code clean-up

2019-07-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 46940e02675c631a48caa20554b84b59ffd1bbde
Author: Mark Thomas 
AuthorDate: Tue Jul 2 21:05:30 2019 +0100

Code clean-up
---
 test/javax/el/TestArrayELResolver.java  | 2 +-
 test/javax/el/TestBeanELResolver.java   | 2 +-
 test/javax/el/TestBeanNameELResolver.java   | 2 +-
 test/javax/el/TestImportHandler.java| 4 ++--
 test/javax/el/TestListELResolver.java   | 2 +-
 test/javax/el/TestMapELResolver.java| 2 +-
 test/javax/el/TestResourceBundleELResolver.java | 2 +-
 test/javax/el/TestStaticFieldELResolver.java| 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/javax/el/TestArrayELResolver.java 
b/test/javax/el/TestArrayELResolver.java
index ccad23e..cea9b97 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -385,7 +385,7 @@ public class TestArrayELResolver {
 Assert.assertFalse(context.isPropertyResolved());
 }
 
-private static enum MethodUnderTest {
+private enum MethodUnderTest {
 GET_VALUE, SET_VALUE, GET_TYPE
 }
 
diff --git a/test/javax/el/TestBeanELResolver.java 
b/test/javax/el/TestBeanELResolver.java
index 6368ad5..7bd9bce 100644
--- a/test/javax/el/TestBeanELResolver.java
+++ b/test/javax/el/TestBeanELResolver.java
@@ -981,7 +981,7 @@ public class TestBeanELResolver {
 Assert.assertFalse(context.isPropertyResolved());
 }
 
-private static enum MethodUnderTest {
+private enum MethodUnderTest {
 GET_VALUE, SET_VALUE, GET_TYPE, INVOKE
 }
 
diff --git a/test/javax/el/TestBeanNameELResolver.java 
b/test/javax/el/TestBeanNameELResolver.java
index a7c90c6..f5ea30f 100644
--- a/test/javax/el/TestBeanNameELResolver.java
+++ b/test/javax/el/TestBeanNameELResolver.java
@@ -606,7 +606,7 @@ public class TestBeanNameELResolver {
 }
 
 
-private static enum MethodUnderTest {
+private enum MethodUnderTest {
 GET_VALUE,
 SET_VALUE,
 GET_TYPE,
diff --git a/test/javax/el/TestImportHandler.java 
b/test/javax/el/TestImportHandler.java
index 0ddf708..537d80d 100644
--- a/test/javax/el/TestImportHandler.java
+++ b/test/javax/el/TestImportHandler.java
@@ -203,11 +203,11 @@ public class TestImportHandler {
 public void testImportStatic01() {
 ImportHandler handler = new ImportHandler();
 
-handler.importStatic("org.apache.tomcat.util.buf.Constants.Package");
+handler.importStatic("org.apache.tomcat.util.scan.Constants.Package");
 
 Class result = handler.resolveStatic("Package");
 
-Assert.assertEquals(org.apache.tomcat.util.buf.Constants.class, 
result);
+Assert.assertEquals(org.apache.tomcat.util.scan.Constants.class, 
result);
 }
 
 
diff --git a/test/javax/el/TestListELResolver.java 
b/test/javax/el/TestListELResolver.java
index cb9d574..60aea8c 100644
--- a/test/javax/el/TestListELResolver.java
+++ b/test/javax/el/TestListELResolver.java
@@ -381,7 +381,7 @@ public class TestListELResolver {
 Assert.assertFalse(context.isPropertyResolved());
 }
 
-private static enum MethodUnderTest {
+private enum MethodUnderTest {
 GET_VALUE, SET_VALUE, GET_TYPE
 }
 
diff --git a/test/javax/el/TestMapELResolver.java 
b/test/javax/el/TestMapELResolver.java
index fa8bb63..1a87b7f 100644
--- a/test/javax/el/TestMapELResolver.java
+++ b/test/javax/el/TestMapELResolver.java
@@ -312,7 +312,7 @@ public class TestMapELResolver {
 Assert.assertFalse(context.isPropertyResolved());
 }
 
-private static enum MethodUnderTest {
+private enum MethodUnderTest {
 GET_VALUE, SET_VALUE, GET_TYPE
 }
 }
diff --git a/test/javax/el/TestResourceBundleELResolver.java 
b/test/javax/el/TestResourceBundleELResolver.java
index 3f9ebc7..5acf029 100644
--- a/test/javax/el/TestResourceBundleELResolver.java
+++ b/test/javax/el/TestResourceBundleELResolver.java
@@ -321,7 +321,7 @@ public class TestResourceBundleELResolver {
 Assert.assertFalse(context.isPropertyResolved());
 }
 
-private static enum MethodUnderTest {
+private enum MethodUnderTest {
 GET_VALUE, SET_VALUE, GET_TYPE
 }
 }
diff --git a/test/javax/el/TestStaticFieldELResolver.java 
b/test/javax/el/TestStaticFieldELResolver.java
index 7efa86d..3655865 100644
--- a/test/javax/el/TestStaticFieldELResolver.java
+++ b/test/javax/el/TestStaticFieldELResolver.java
@@ -483,7 +483,7 @@ public class TestStaticFieldELResolver {
 }
 }
 
-private static enum MethodUnderTest {
+private enum MethodUnderTest {
 GET_VALUE, SET_VALUE, GET_TYPE, INVOKE
 }
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org