Author: markt
Date: Thu Jan 15 05:38:58 2009
New Revision: 734702
URL: http://svn.apache.org/viewvc?rev=734702&view=rev
Log:
Remove unnecessary casts reported by Eclipse
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/jk/common/JkMX.java
tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=734702&r1=734701&r2=734702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Thu Jan 15
05:38:58 2009
@@ -177,8 +177,7 @@
// Retrieving MBean server
MBeanServer mBeanServer = null;
if (MBeanServerFactory.findMBeanServer(null).size() > 0) {
- mBeanServer =
- (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+ mBeanServer = MBeanServerFactory.findMBeanServer(null).get(0);
} else {
mBeanServer = ManagementFactory.getPlatformMBeanServer();
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=734702&r1=734701&r2=734702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Thu Jan 15 05:38:58 2009
@@ -375,7 +375,7 @@
}
}
- impl = new
McastServiceImpl((MemberImpl)localMember,Long.parseLong(properties.getProperty("mcastFrequency")),
+ impl = new
McastServiceImpl(localMember,Long.parseLong(properties.getProperty("mcastFrequency")),
Long.parseLong(properties.getProperty("memberDropTime")),
Integer.parseInt(properties.getProperty("mcastPort")),
bind,
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=734702&r1=734701&r2=734702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Thu
Jan 15 05:38:58 2009
@@ -213,7 +213,7 @@
//you'd be surprised, but System.currentTimeMillis
//shows up on the profiler
long alive=System.currentTimeMillis()-getServiceStartTime();
- XByteBuffer.toBytes( (long) alive, dataPkg,
TRIBES_MBR_BEGIN.length+4);
+ XByteBuffer.toBytes(alive, dataPkg, TRIBES_MBR_BEGIN.length+4);
}
return dataPkg;
}
@@ -253,7 +253,7 @@
pos += 4;
//alive data
- XByteBuffer.toBytes((long)alive,data,pos);
+ XByteBuffer.toBytes(alive,data,pos);
pos += 8;
//port
XByteBuffer.toBytes(port,data,pos);
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=734702&r1=734701&r2=734702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Thu Jan
15 05:38:58 2009
@@ -142,14 +142,14 @@
public static double coerceToDouble(String s) {
if (s == null || s.length() == 0)
- return (double) 0;
+ return 0;
else
return Double.valueOf(s).doubleValue();
}
public static float coerceToFloat(String s) {
if (s == null || s.length() == 0)
- return (float) 0;
+ return 0;
else
return Float.valueOf(s).floatValue();
}
@@ -170,7 +170,7 @@
public static long coerceToLong(String s) {
if (s == null || s.length() == 0)
- return (long) 0;
+ return 0;
else
return Long.valueOf(s).longValue();
}
Modified: tomcat/trunk/java/org/apache/jk/common/JkMX.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/JkMX.java?rev=734702&r1=734701&r2=734702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/JkMX.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/JkMX.java Thu Jan 15 05:38:58 2009
@@ -359,7 +359,7 @@
MBeanServer getMBeanServer() {
MBeanServer server;
if( MBeanServerFactory.findMBeanServer(null).size() > 0 ) {
-
server=(MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
+ server = MBeanServerFactory.findMBeanServer(null).get(0);
} else {
server=MBeanServerFactory.createMBeanServer();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java?rev=734702&r1=734701&r2=734702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java Thu Jan 15
05:38:58 2009
@@ -131,8 +131,8 @@
StringBuffer sb = new StringBuffer(bytes.length * 2);
for (int i = 0; i < bytes.length; i++) {
- sb.append(convertDigit((int) (bytes[i] >> 4)));
- sb.append(convertDigit((int) (bytes[i] & 0x0f)));
+ sb.append(convertDigit((bytes[i] >> 4)));
+ sb.append(convertDigit((bytes[i] & 0x0f)));
}
return (sb.toString());
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=734702&r1=734701&r2=734702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Thu Jan 15
05:38:58 2009
@@ -74,7 +74,7 @@
}
for (int i = 0; i < s.length(); i++) {
- int c = (int) s.charAt(i);
+ int c = s.charAt(i);
if( safeChars.get( c ) ) {
if( debug > 0 ) log("Safe: " + (char)c);
buf.write((char)c);
@@ -86,7 +86,7 @@
// ( while UCS is 31 ). Amazing...
if (c >= 0xD800 && c <= 0xDBFF) {
if ( (i+1) < s.length()) {
- int d = (int) s.charAt(i+1);
+ int d = s.charAt(i+1);
if (d >= 0xDC00 && d <= 0xDFFF) {
if( debug > 0 ) log("Unsafe: " + c);
c2b.convert( (char)d);
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=734702&r1=734701&r2=734702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Thu Jan 15
05:38:58 2009
@@ -533,8 +533,7 @@
if (server == null) {
if( MBeanServerFactory.findMBeanServer(null).size() > 0 ) {
- server = (MBeanServer) MBeanServerFactory.findMBeanServer(
- null).get(0);
+ server = MBeanServerFactory.findMBeanServer(null).get(0);
if( log.isDebugEnabled() ) {
log.debug("Using existing MBeanServer " +
(System.currentTimeMillis() - t1 ));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
