From: markt Date: Sun, 23 Nov 2008 13:49:26 +0000 (+0000) Subject: Generics fixes for o.a.jk X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f5378713333f3994bf989ba336729286acfddf79;p=tomcat7.0 Generics fixes for o.a.jk git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719988 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/jk/apr/AprImpl.java b/java/org/apache/jk/apr/AprImpl.java index 271e73a31..bb4038f1b 100644 --- a/java/org/apache/jk/apr/AprImpl.java +++ b/java/org/apache/jk/apr/AprImpl.java @@ -40,7 +40,7 @@ public class AprImpl extends JkHandler { // This will be o.a.t.util.handler.TcHa static boolean ok=true; boolean initialized=false; // Handlers for native callbacks - Hashtable jkHandlers=new Hashtable(); + Hashtable jkHandlers= new Hashtable(); // Name of the so used in inprocess mode String jniModeSo="inprocess"; diff --git a/java/org/apache/jk/apr/TomcatStarter.java b/java/org/apache/jk/apr/TomcatStarter.java index 7efa319dd..65ab02571 100644 --- a/java/org/apache/jk/apr/TomcatStarter.java +++ b/java/org/apache/jk/apr/TomcatStarter.java @@ -27,7 +27,7 @@ import java.lang.reflect.Method; * */ public class TomcatStarter implements Runnable { - Class c; + Class c; String args[]; AprImpl apr = new AprImpl(); @@ -45,7 +45,7 @@ public class TomcatStarter implements Runnable { try { AprImpl.jniMode(); // Find the class - Class c=null; + Class c=null; for( int i=0; i c, String args[] ) { this.c=c; this.args=args; } @@ -77,7 +77,7 @@ public class TomcatStarter implements Runnable { public void run() { System.err.println("Starting " + c.getName()); try { - Class argClass=args.getClass(); + Class argClass=args.getClass(); Method m=c.getMethod( "main", new Class[] {argClass} ); m.invoke( c, new Object[] { args } ); System.out.println("TomcatStarter: Done"); diff --git a/java/org/apache/jk/common/ChannelNioSocket.java b/java/org/apache/jk/common/ChannelNioSocket.java index b34bea46f..ffefdd836 100644 --- a/java/org/apache/jk/common/ChannelNioSocket.java +++ b/java/org/apache/jk/common/ChannelNioSocket.java @@ -917,7 +917,7 @@ public class ChannelNioSocket extends JkHandler log.error("Error closing connection", e); } try{ - Request req = (Request)ep.getRequest(); + Request req = ep.getRequest(); if( req != null ) { ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote); if( roname != null ) { @@ -958,10 +958,10 @@ public class ChannelNioSocket extends JkHandler if(log.isDebugEnabled()) log.debug("Selecting "+ns+" channels"); if(ns > 0) { - Set sels = selector.selectedKeys(); - Iterator it = sels.iterator(); + Set sels = selector.selectedKeys(); + Iterator it = sels.iterator(); while(it.hasNext()) { - SelectionKey sk = (SelectionKey)it.next(); + SelectionKey sk = it.next(); if(sk.isAcceptable()) { acceptConnections(); } else { diff --git a/java/org/apache/jk/common/ChannelSocket.java b/java/org/apache/jk/common/ChannelSocket.java index 592757df9..68dbb8dde 100644 --- a/java/org/apache/jk/common/ChannelSocket.java +++ b/java/org/apache/jk/common/ChannelSocket.java @@ -722,7 +722,7 @@ public class ChannelSocket extends JkHandler log.error( "Error, closing connection", e); } try{ - Request req = (Request)ep.getRequest(); + Request req = ep.getRequest(); if( req != null ) { ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote); if( roname != null ) { diff --git a/java/org/apache/jk/common/ChannelUn.java b/java/org/apache/jk/common/ChannelUn.java index 1da79bd9f..d9f2899a1 100644 --- a/java/org/apache/jk/common/ChannelUn.java +++ b/java/org/apache/jk/common/ChannelUn.java @@ -310,7 +310,7 @@ public class ChannelUn extends JniHandler implements JkChannel { if( log.isDebugEnabled() ) log.debug( "Closing un channel"); try{ - Request req = (Request)ep.getRequest(); + Request req = ep.getRequest(); if( req != null ) { ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote); if( roname != null ) { diff --git a/java/org/apache/jk/common/HandlerRequest.java b/java/org/apache/jk/common/HandlerRequest.java index ead0bbdb6..97357e80b 100644 --- a/java/org/apache/jk/common/HandlerRequest.java +++ b/java/org/apache/jk/common/HandlerRequest.java @@ -261,8 +261,7 @@ public class HandlerRequest extends JkHandler decodeRequest( msg, ep, tmpMB ); if (twa != null) { twa.setCurrentStage(control, "JkService"); - twa.setParam(control, - ((Request)ep.getRequest()).unparsedURI()); + twa.setParam(control, ep.getRequest().unparsedURI()); } } catch( Exception ex ) { log.error( "Error decoding request ", ex ); @@ -377,7 +376,7 @@ public class HandlerRequest extends JkHandler // Translate the HTTP method code to a String. byte methodCode = msg.getByte(); if (methodCode != AjpConstants.SC_M_JK_STORED) { - String mName=AjpConstants.methodTransArray[(int)methodCode - 1]; + String mName=AjpConstants.methodTransArray[methodCode - 1]; req.method().setString(mName); } @@ -652,7 +651,7 @@ public class HandlerRequest extends JkHandler int port = 0; int mult = 1; for (int i = valueL - 1; i > colonPos; i--) { - int charValue = HexUtils.DEC[(int) valueB[i + valueS]]; + int charValue = HexUtils.DEC[valueB[i + valueS]]; if (charValue == -1) { // Invalid character throw new CharConversionException("Invalid char in port: " + valueB[i + valueS]); diff --git a/java/org/apache/jk/common/JkMX.java b/java/org/apache/jk/common/JkMX.java index dd341c4f6..ceb93d34c 100644 --- a/java/org/apache/jk/common/JkMX.java +++ b/java/org/apache/jk/common/JkMX.java @@ -380,7 +380,7 @@ public class JkMX extends JkHandler private ObjectName registerObject(String className, String oName) throws Exception { - Class c = Class.forName(className); + Class c = Class.forName(className); Object o = c.newInstance(); ObjectName objN = new ObjectName(oName); mserver.registerMBean(o, objN); diff --git a/java/org/apache/jk/common/Shm.java b/java/org/apache/jk/common/Shm.java index 4d5130f24..c4360678e 100644 --- a/java/org/apache/jk/common/Shm.java +++ b/java/org/apache/jk/common/Shm.java @@ -51,7 +51,7 @@ public class Shm extends JniHandler { boolean reset=false; String dumpFile=null; - Vector groups=new Vector(); + Vector groups = new Vector(); // Will be dynamic ( getMethodId() ) after things are stable static final int SHM_WRITE_SLOT=2; @@ -149,7 +149,7 @@ public class Shm extends JniHandler { public void resetScoreboard() throws IOException { if( apr==null ) return; MsgContext mCtx=createMsgContext(); - Msg msg=(Msg)mCtx.getMsg(0); + Msg msg=mCtx.getMsg(0); msg.reset(); msg.appendByte( SHM_RESET ); @@ -160,7 +160,7 @@ public class Shm extends JniHandler { public void dumpScoreboard(String fname) throws IOException { if( apr==null ) return; MsgContext mCtx=createMsgContext(); - Msg msg=(Msg)mCtx.getMsg(0); + Msg msg=mCtx.getMsg(0); C2BConverter c2b=mCtx.getConverter(); msg.reset(); @@ -181,7 +181,7 @@ public class Shm extends JniHandler { String slotName="TOMCAT:" + instanceId; MsgContext mCtx=createMsgContext(); - Msg msg=(Msg)mCtx.getMsg(0); + Msg msg=mCtx.getMsg(0); msg.reset(); C2BConverter c2b=mCtx.getConverter(); @@ -194,7 +194,7 @@ public class Shm extends JniHandler { // number of groups. 0 means the default lb. msg.appendInt( groups.size() ); for( int i=0; i NamedVirtualHosts=null; public ApacheConfig() { } diff --git a/java/org/apache/jk/config/GeneratorApache2.java b/java/org/apache/jk/config/GeneratorApache2.java index c66a8ce73..fe833f25b 100644 --- a/java/org/apache/jk/config/GeneratorApache2.java +++ b/java/org/apache/jk/config/GeneratorApache2.java @@ -98,10 +98,10 @@ public class GeneratorApache2 implements WebXml2Jk.MappingGenerator { } private void generateWelcomeFiles( PrintWriter out ) { - Vector wf= wxml.getWellcomeFiles(); + Vector wf= wxml.getWellcomeFiles(); out.print(" DirectoryIndex "); for( int i=0; i urls, Vector methods, + Vector roles, boolean isSSL ) { for( int i=0; i"); if( methods.size() > 0 ) { out.print(" " ); @@ -179,7 +180,7 @@ public class GeneratorApache2 implements WebXml2Jk.MappingGenerator { out.println( " AuthType basic" ); out.print( " Require group " ); for( int j=0; j wf ) { } - public void generateConstraints( Vector urls, Vector methods, Vector roles, boolean isSSL ) { + public void generateConstraints( Vector urls, Vector methods, + Vector roles, boolean isSSL ) { for( int i=0; i wf ) { } - public void generateConstraints( Vector urls, Vector methods, Vector roles, boolean isSSL ) { + public void generateConstraints(Vector urls, Vector methods, + Vector roles, boolean isSSL ) { for( int i=0; i wF = new Vector(); if( n0!=null ) { for( Node mapN=getChild( webN, "welcome-file" ); mapN != null; mapN = getNext( mapN ) ) { @@ -240,9 +241,9 @@ public class WebXml2Jk { for( Node mapN=getChild( webN, "security-constraint" ); mapN != null; mapN = getNext( mapN )) { - Vector methods=new Vector(); - Vector urls=new Vector(); - Vector roles=new Vector(); + Vector methods = new Vector(); + Vector urls= new Vector(); + Vector roles= new Vector(); boolean isSSL=false; Node wrcN=getChild( mapN, "web-resource-collection"); @@ -340,7 +341,7 @@ public class WebXml2Jk { /* do ant-style property setting */ IntrospectionUtils.processArgs( w2jk, args, new String[] {}, - null, new Hashtable()); + null, new Hashtable()); w2jk.execute(); } catch( Exception ex ) { ex.printStackTrace(); diff --git a/java/org/apache/jk/core/WorkerEnv.java b/java/org/apache/jk/core/WorkerEnv.java index 18145ebe6..c6d19b10a 100644 --- a/java/org/apache/jk/core/WorkerEnv.java +++ b/java/org/apache/jk/core/WorkerEnv.java @@ -33,7 +33,7 @@ import javax.management.ObjectName; */ public class WorkerEnv { - Hashtable properties; + Hashtable properties; public static final int ENDPOINT_NOTE=0; public static final int REQUEST_NOTE=1; @@ -42,7 +42,8 @@ public class WorkerEnv { String noteName[][]=new String[4][]; private Object notes[]=new Object[32]; - Hashtable handlersMap=new Hashtable(); + Hashtable handlersMap = + new Hashtable(); JkHandler handlersTable[]=new JkHandler[20]; int handlerCount=0; @@ -122,7 +123,7 @@ public class WorkerEnv { } public final JkHandler getHandler( String name ) { - return (JkHandler)handlersMap.get(name); + return handlersMap.get(name); } public final JkHandler getHandler( int id ) { diff --git a/java/org/apache/jk/server/JkMain.java b/java/org/apache/jk/server/JkMain.java index 079ee9f96..0bca8e4d5 100644 --- a/java/org/apache/jk/server/JkMain.java +++ b/java/org/apache/jk/server/JkMain.java @@ -159,7 +159,7 @@ public class JkMain implements MBeanRegistration * Retrieve a property. */ public Object getProperty(String name) { - String alias = (String)replacements.get(name); + String alias = replacements.get(name); Object result = null; if(alias != null) { result = props.get(alias); @@ -419,7 +419,7 @@ public class JkMain implements MBeanRegistration jkMain=new JkMain(); IntrospectionUtils.processArgs( jkMain, args, new String[] {}, - null, new Hashtable()); + null, new Hashtable()); jkMain.init(); jkMain.start(); @@ -476,7 +476,8 @@ public class JkMain implements MBeanRegistration } // translate top-level keys ( from coyote or generic ) into component keys - static Hashtable replacements=new Hashtable(); + static Hashtable replacements = + new Hashtable(); static { replacements.put("port","channelSocket.port"); replacements.put("maxThreads", "channelSocket.maxThreads"); @@ -493,11 +494,12 @@ public class JkMain implements MBeanRegistration } private void preProcessProperties() { - Enumeration keys=props.keys(); - Vector v=new Vector(); + // TODO This can be fixed in Java 6 + Enumeration keys = (Enumeration) props.keys(); + Vector v=new Vector(); while( keys.hasMoreElements() ) { - String key=(String)keys.nextElement(); + String key=keys.nextElement(); Object newName=replacements.get(key); if( newName !=null ) { v.addElement(key); @@ -505,9 +507,9 @@ public class JkMain implements MBeanRegistration } keys=v.elements(); while( keys.hasMoreElements() ) { - String key=(String)keys.nextElement(); - Object propValue=props.getProperty( key ); - String replacement=(String)replacements.get(key); + String key = keys.nextElement(); + Object propValue = props.getProperty( key ); + String replacement = replacements.get(key); props.put(replacement, propValue); if( log.isDebugEnabled()) log.debug("Substituting " + key + " " + replacement + " " + @@ -517,10 +519,10 @@ public class JkMain implements MBeanRegistration private void processProperties() { preProcessProperties(); - Enumeration keys=props.keys(); + Enumeration keys = (Enumeration) props.keys(); while( keys.hasMoreElements() ) { - String name=(String)keys.nextElement(); + String name= keys.nextElement(); String propValue=props.getProperty( name ); processProperty( name, propValue ); @@ -577,7 +579,7 @@ public class JkMain implements MBeanRegistration return null; } try { - Class channelclass = Class.forName(classN); + Class channelclass = Class.forName(classN); handler=(JkHandler)channelclass.newInstance(); } catch (Throwable ex) { handler=null; @@ -599,11 +601,11 @@ public class JkMain implements MBeanRegistration } private void processModules() { - Enumeration keys=props.keys(); + Enumeration keys = (Enumeration)props.keys(); int plen=6; while( keys.hasMoreElements() ) { - String k=(String)keys.nextElement(); + String k=keys.nextElement(); if( ! k.startsWith( "class." ) ) continue; @@ -616,14 +618,14 @@ public class JkMain implements MBeanRegistration } private String[] split(String s, String delim ) { - Vector v=new Vector(); + Vector v = new Vector(); StringTokenizer st=new StringTokenizer(s, delim ); while( st.hasMoreTokens() ) { v.addElement( st.nextToken()); } String res[]=new String[ v.size() ]; for( int i=0; i