Author: sebb
Date: Wed Mar 12 15:24:03 2008
New Revision: 636541
URL: http://svn.apache.org/viewvc?rev=636541&view=rev
Log:
Remove unnecessary casts
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Wed Mar 12 15:24:03 2008
@@ -497,7 +497,7 @@
if (pasv() != FTPReply.ENTERING_PASSIVE_MODE)
return null;
- __parsePassiveModeReply((String)_replyLines.get(_replyLines.size()
- 1));
+ __parsePassiveModeReply(_replyLines.get(_replyLines.size() - 1));
socket = _socketFactory_.createSocket(__passiveHost,
__passivePort);
if ((__restartOffset > 0) && !restart(__restartOffset))
@@ -886,7 +886,7 @@
return false;
__dataConnectionMode = PASSIVE_REMOTE_DATA_CONNECTION_MODE;
- __parsePassiveModeReply((String)_replyLines.get(0));
+ __parsePassiveModeReply(_replyLines.get(0));
return true;
}
@@ -1798,7 +1798,7 @@
if (pwd() != FTPReply.PATHNAME_CREATED)
return null;
- return __parsePathname((String)_replyLines.get( _replyLines.size() -
1));
+ return __parsePathname(_replyLines.get( _replyLines.size() - 1));
}
@@ -1845,7 +1845,7 @@
// in practice FTP servers deviate, so we soften the condition to
// a positive completion.
if (__systemName == null && FTPReply.isPositiveCompletion(syst()))
- __systemName = ((String)_replyLines.get(_replyLines.size() -
1)).substring(4);
+ __systemName = _replyLines.get(_replyLines.size() -
1).substring(4);
return __systemName;
}
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
Wed Mar 12 15:24:03 2008
@@ -191,7 +191,7 @@
tmpResults.add(temp);
count--;
}
- return (FTPFile[]) tmpResults.toArray(new FTPFile[0]);
+ return tmpResults.toArray(new FTPFile[0]);
}
@@ -230,7 +230,7 @@
tmpResults.add(0,temp);
count--;
}
- return (FTPFile[]) tmpResults.toArray(new FTPFile[0]);
+ return tmpResults.toArray(new FTPFile[0]);
}
/**
@@ -255,7 +255,7 @@
FTPFile temp = this.parser.parseFTPEntry(entry);
tmpResults.add(temp);
}
- return (FTPFile[]) tmpResults.toArray(new FTPFile[0]);
+ return tmpResults.toArray(new FTPFile[0]);
}
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
Wed Mar 12 15:24:03 2008
@@ -188,12 +188,12 @@
public FTPFileEntryParser createUnixFTPEntryParser()
{
- return (FTPFileEntryParser) new UnixFTPEntryParser();
+ return new UnixFTPEntryParser();
}
public FTPFileEntryParser createVMSVersioningFTPEntryParser()
{
- return (FTPFileEntryParser) new VMSVersioningFTPEntryParser();
+ return new VMSVersioningFTPEntryParser();
}
public FTPFileEntryParser createNetwareFTPEntryParser() {
@@ -217,7 +217,7 @@
public FTPFileEntryParser createOS2FTPEntryParser()
{
- return (FTPFileEntryParser) new OS2FTPEntryParser();
+ return new OS2FTPEntryParser();
}
public FTPFileEntryParser createOS400FTPEntryParser()
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
Wed Mar 12 15:24:03 2008
@@ -129,7 +129,7 @@
String name = result.group(1);
String version = result.group(2);
NameVersion nv = new NameVersion(name, version);
- NameVersion existing = (NameVersion) existingEntries.get(name);
+ NameVersion existing = existingEntries.get(name);
if (null != existing) {
if (nv.versionNumber < existing.versionNumber) {
iter.remove(); // removal removes from original list.
@@ -153,7 +153,7 @@
String name = result.group(1);
String version = result.group(2);
NameVersion nv = new NameVersion(name, version);
- NameVersion existing = (NameVersion) existingEntries.get(name);
+ NameVersion existing = existingEntries.get(name);
if (null != existing) {
if (nv.versionNumber < existing.versionNumber) {
iter.remove(); // removal removes from original list.
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
Wed Mar 12 15:24:03 2008
@@ -128,7 +128,7 @@
*/
public int getPoll()
{
- return (int) (buf[POLL_INDEX]);
+ return buf[POLL_INDEX];
}
/***
@@ -150,7 +150,7 @@
*/
public int getPrecision()
{
- return (int) buf[PRECISION_INDEX];
+ return buf[PRECISION_INDEX];
}
/***
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java
Wed Mar 12 15:24:03 2008
@@ -463,7 +463,7 @@
for (String line : _replyLines)
{
- buffer.append((String)line);
+ buffer.append(line);
buffer.append(SocketClient.NETASCII_EOL);
}
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java
Wed Mar 12 15:24:03 2008
@@ -1271,12 +1271,12 @@
{
try
{
- if (ch != (int) '\r')
+ if (ch != '\r')
{
spyStream.write(ch);
- if (ch == (int) '\n')
+ if (ch == '\n')
{
- spyStream.write((int) '\r');
+ spyStream.write('\r');
}
spyStream.flush();
}
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
Wed Mar 12 15:24:03 2008
@@ -102,7 +102,7 @@
for (int ii = 0; ii < termType.length(); ii++)
{
- response[ii + 2] = (int) termType.charAt(ii);
+ response[ii + 2] = termType.charAt(ii);
}
return response;
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
Wed Mar 12 15:24:03 2008
@@ -161,7 +161,7 @@
) {
nTurnedOnBits = 0xFF;
nTurnedOnBits <<= nShift;
- response[nIndex] = ((int)nCompoundWindowSize &
nTurnedOnBits) >>> nShift;
+ response[nIndex] = (nCompoundWindowSize &
nTurnedOnBits) >>> nShift;
if (response[nIndex] == 0xff) {
// 3 //
nIndex++;
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/time/TimeTCPClient.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
Wed Mar 12 15:24:03 2008
@@ -81,7 +81,7 @@
{
DataInputStream input;
input = new DataInputStream(_input_);
- return (long)(input.readInt() & 0xffffffffL);
+ return (input.readInt() & 0xffffffffL);
}
/***
Modified:
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java?rev=636541&r1=636540&r2=636541&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Wed Mar 12 15:24:03 2008
@@ -138,7 +138,7 @@
// the only difference should be the two hours
// difference, no rolling back a year should occur.
assertEquals("no.rollback.because.of.time.zones",
- (long)TWO_HOURS_OF_MILLISECONDS,
+ TWO_HOURS_OF_MILLISECONDS,
cal.getTime().getTime() -
parsed.getTime().getTime());
} catch (ParseException e){
fail("Unable to parse " + fmtTimePlusOneHour);
