You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/12/07 16:40:07 UTC
svn commit: r1043103 - in /tomcat/trunk/java/org/apache/tomcat: jni/ util/
util/bcel/ util/digester/ util/http/mapper/ util/modeler/ util/net/ util/res/
Author: markt
Date: Tue Dec 7 15:40:06 2010
New Revision: 1043103
URL: http://svn.apache.org/viewvc?rev=1043103&view=rev
Log:
Fix modifier order in org.apache.tomcat.*
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Tue Dec 7 15:40:06 2010
@@ -32,7 +32,7 @@ public final class Library {
/*
* A handle to the unique Library singleton instance.
*/
- static private Library _instance = null;
+ private static Library _instance = null;
private Library()
throws Exception
@@ -163,7 +163,7 @@ public final class Library {
* called for any APR library.
* @param libraryName the name of the library to load
*/
- static public boolean initialize(String libraryName)
+ public static boolean initialize(String libraryName)
throws Exception
{
if (_instance == null) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Tue Dec 7 15:40:06 2010
@@ -231,7 +231,7 @@ public final class IntrospectionUtils {
}
}
- public final static String PATH_SEPARATOR = System.getProperty("path.separator");
+ public static final String PATH_SEPARATOR = System.getProperty("path.separator");
/**
* Adds classpath entries from a vector of URL's to the "tc_path_add" System
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Tue Dec 7 15:40:06 2010
@@ -27,71 +27,71 @@ public interface Constants {
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_FINAL = 0x0010;
+ public static final short ACC_FINAL = 0x0010;
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_INTERFACE = 0x0200;
+ public static final short ACC_INTERFACE = 0x0200;
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_ABSTRACT = 0x0400;
+ public static final short ACC_ABSTRACT = 0x0400;
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_ENUM = 0x4000;
+ public static final short ACC_ENUM = 0x4000;
// Applies to classes compiled by new compilers only
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_SUPER = 0x0020;
+ public static final short ACC_SUPER = 0x0020;
/** One of the access flags for fields, methods, or classes.
*/
- public final static short MAX_ACC_FLAG = ACC_ENUM;
+ public static final short MAX_ACC_FLAG = ACC_ENUM;
/** The names of the access flags. */
- public final static String[] ACCESS_NAMES = {
+ public static final String[] ACCESS_NAMES = {
"public", "private", "protected", "static", "final", "synchronized",
"volatile", "transient", "native", "interface", "abstract", "strictfp",
"synthetic", "annotation", "enum"
};
/** Marks a constant pool entry as type UTF-8. */
- public final static byte CONSTANT_Utf8 = 1;
+ public static final byte CONSTANT_Utf8 = 1;
/** Marks a constant pool entry as type Integer. */
- public final static byte CONSTANT_Integer = 3;
+ public static final byte CONSTANT_Integer = 3;
/** Marks a constant pool entry as type Float. */
- public final static byte CONSTANT_Float = 4;
+ public static final byte CONSTANT_Float = 4;
/** Marks a constant pool entry as type Long. */
- public final static byte CONSTANT_Long = 5;
+ public static final byte CONSTANT_Long = 5;
/** Marks a constant pool entry as type Double. */
- public final static byte CONSTANT_Double = 6;
+ public static final byte CONSTANT_Double = 6;
/** Marks a constant pool entry as a Class. */
- public final static byte CONSTANT_Class = 7;
+ public static final byte CONSTANT_Class = 7;
/** Marks a constant pool entry as a Field Reference. */
- public final static byte CONSTANT_Fieldref = 9;
+ public static final byte CONSTANT_Fieldref = 9;
/** Marks a constant pool entry as type String. */
- public final static byte CONSTANT_String = 8;
+ public static final byte CONSTANT_String = 8;
/** Marks a constant pool entry as a Method Reference. */
- public final static byte CONSTANT_Methodref = 10;
+ public static final byte CONSTANT_Methodref = 10;
/** Marks a constant pool entry as an Interface Method Reference. */
- public final static byte CONSTANT_InterfaceMethodref = 11;
+ public static final byte CONSTANT_InterfaceMethodref = 11;
/** Marks a constant pool entry as a name and type. */
- public final static byte CONSTANT_NameAndType = 12;
+ public static final byte CONSTANT_NameAndType = 12;
/** The names of the types of entries in a constant pool. */
- public final static String[] CONSTANT_NAMES = {
+ public static final String[] CONSTANT_NAMES = {
"", "CONSTANT_Utf8", "", "CONSTANT_Integer",
"CONSTANT_Float", "CONSTANT_Long", "CONSTANT_Double",
"CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref",
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java Tue Dec 7 15:40:06 2010
@@ -25,7 +25,7 @@ import org.xml.sax.Attributes;
* <p>Abstract base class for <code>ObjectCreationFactory</code>
* implementations.</p>
*/
-abstract public class AbstractObjectCreationFactory implements ObjectCreationFactory {
+public abstract class AbstractObjectCreationFactory implements ObjectCreationFactory {
// ----------------------------------------------------- Instance Variables
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java Tue Dec 7 15:40:06 2010
@@ -37,7 +37,7 @@ import java.util.List;
* @since 1.5
*/
-abstract public class AbstractRulesImpl implements Rules {
+public abstract class AbstractRulesImpl implements Rules {
// ------------------------------------------------------------- Fields
@@ -117,12 +117,12 @@ abstract public class AbstractRulesImpl
* @param pattern Nesting pattern to be matched for this Rule
* @param rule Rule instance to be registered
*/
- abstract protected void registerRule(String pattern, Rule rule);
+ protected abstract void registerRule(String pattern, Rule rule);
/**
* Clear all existing Rule instance registrations.
*/
- abstract public void clear();
+ public abstract void clear();
/**
@@ -136,7 +136,7 @@ abstract public class AbstractRulesImpl
* or <code>null</code> to match regardless of namespace URI
* @param pattern Nesting pattern to be matched
*/
- abstract public List<Rule> match(String namespaceURI, String pattern);
+ public abstract List<Rule> match(String namespaceURI, String pattern);
/**
@@ -146,6 +146,6 @@ abstract public class AbstractRulesImpl
* in the order originally registered through the <code>add()</code>
* method.
*/
- abstract public List<Rule> rules();
+ public abstract List<Rule> rules();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java Tue Dec 7 15:40:06 2010
@@ -1452,7 +1452,7 @@ public final class Mapper {
// ------------------------------------------------- MapElement Inner Class
- protected static abstract class MapElement {
+ protected abstract static class MapElement {
public String name = null;
public Object object = null;
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Tue Dec 7 15:40:06 2010
@@ -150,7 +150,7 @@ public class Registry implements Registr
*
* @since 1.1
*/
- public synchronized static Registry getRegistry(Object key, Object guard) {
+ public static synchronized Registry getRegistry(Object key, Object guard) {
Registry localRegistry;
if( perLoaderRegistries!=null ) {
if( key==null )
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Tue Dec 7 15:40:06 2010
@@ -45,7 +45,7 @@ public class NioSelectorPool {
private static final Log log = LogFactory.getLog(NioSelectorPool.class);
- protected final static boolean SHARED =
+ protected static final boolean SHARED =
Boolean.valueOf(System.getProperty("org.apache.tomcat.util.net.NioSelectorShared", "true")).booleanValue();
protected NioBlockingSelector blockingSelector;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Tue Dec 7 15:40:06 2010
@@ -27,7 +27,7 @@ import javax.net.ssl.SSLSession;
@author EKR
*/
-abstract public class SSLImplementation {
+public abstract class SSLImplementation {
private static final org.apache.juli.logging.Log logger = org.apache.juli.logging.LogFactory
.getLog(SSLImplementation.class);
@@ -78,11 +78,11 @@ abstract public class SSLImplementation
}
}
- abstract public String getImplementationName();
+ public abstract String getImplementationName();
- abstract public ServerSocketFactory getServerSocketFactory();
+ public abstract ServerSocketFactory getServerSocketFactory();
- abstract public SSLSupport getSSLSupport(Socket sock);
+ public abstract SSLSupport getSSLSupport(Socket sock);
- abstract public SSLSupport getSSLSupport(SSLSession session);
+ public abstract SSLSupport getSSLSupport(SSLSession session);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Tue Dec 7 15:40:06 2010
@@ -174,7 +174,7 @@ public class StringManager {
*
* @param packageName The package name
*/
- public synchronized static final StringManager getManager(
+ public static final synchronized StringManager getManager(
String packageName) {
return getManager(packageName, Locale.getDefault());
}
@@ -187,7 +187,7 @@ public class StringManager {
* @param packageName The package name
* @param locale The Locale
*/
- public synchronized static final StringManager getManager(
+ public static final synchronized StringManager getManager(
String packageName, Locale locale) {
Map<Locale,StringManager> map = managers.get(packageName);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org