Author: norman
Date: Tue Jan 25 15:06:39 2011
New Revision: 1063311
URL: http://svn.apache.org/viewvc?rev=1063311&view=rev
Log:
Just cleanup some stuff which findbugs was reporting
Modified:
james/imap/trunk/parent/pom.xml
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
Modified: james/imap/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Tue Jan 25 15:06:39 2011
@@ -169,6 +169,11 @@
<plugin>
<artifactId>maven-site-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
</plugins>
</reporting>
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Tue Jan 25 15:06:39 2011
@@ -182,7 +182,7 @@ abstract public class AbstractMailboxPro
final Flags flags = mr.getFlags();
final Long uidOut;
if (useUid) {
- uidOut = new Long(uid);
+ uidOut = uid;
} else {
uidOut = null;
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
Tue Jan 25 15:06:39 2011
@@ -46,13 +46,10 @@ import org.apache.james.mailbox.MessageM
public class AppendProcessor extends AbstractMailboxProcessor {
- final StatusResponseFactory statusResponseFactory;
-
public AppendProcessor(final ImapProcessor next,
final MailboxManager mailboxManager,
final StatusResponseFactory statusResponseFactory) {
super(next, mailboxManager, statusResponseFactory);
- this.statusResponseFactory = statusResponseFactory;
}
protected boolean isAcceptable(ImapMessage message) {
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
Tue Jan 25 15:06:39 2011
@@ -23,6 +23,7 @@ import static org.apache.james.imap.api.
import java.util.Arrays;
import java.util.List;
+import java.util.Locale;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.james.imap.api.ImapCommand;
@@ -91,7 +92,7 @@ public class IdleProcessor extends Abstr
closed.set(true);
session.popLineHandler();
- if (!"DONE".equals(line.toUpperCase())) {
+ if (!"DONE".equals(line.toUpperCase(Locale.US))) {
StatusResponse response = factory.taggedBad(tag,
command,
HumanReadableText.INVALID_COMMAND);
responder.respond(response);
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
Tue Jan 25 15:06:39 2011
@@ -181,6 +181,8 @@ public class ListProcessor extends Abstr
case NOSELECT:
noSelect = true;
break;
+ default:
+ break;
}
responder.respond(createResponse(noInferior, noSelect, marked,
unmarked, hasChildren, hasNoChildren, mailboxName, delimiter));
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
Tue Jan 25 15:06:39 2011
@@ -92,7 +92,7 @@ public class LoginProcessor extends Abst
}
if (failures < MAX_FAILURES) {
session.setAttribute(ATTRIBUTE_NUMBER_OF_FAILURES,
- new Integer(failures));
+ failures);
no(command, tag, responder,
HumanReadableText.INVALID_LOGIN);
} else {
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
Tue Jan 25 15:06:39 2011
@@ -108,10 +108,10 @@ public class SearchProcessor extends Abs
final long uid = it.next();
final Long number;
if (useUids) {
- number = new Long(uid);
+ number = uid;
} else {
final int msn = session.getSelected().msn(uid);
- number = new Long(msn);
+ number = (long)msn;
}
if (number == SelectedMailbox.NO_SUCH_MESSAGE == false)
results.add(number);
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
Tue Jan 25 15:06:39 2011
@@ -107,7 +107,7 @@ public class StatusProcessor extends Abs
final Long uidValidity;
if (statusDataItems.isUidValidity()) {
final long uidValidityValue = metaData.getUidValidity();
- uidValidity = new Long(uidValidityValue);
+ uidValidity =uidValidityValue;
} else {
uidValidity = null;
}
@@ -119,7 +119,7 @@ public class StatusProcessor extends Abs
final Long uidNext;
if (statusDataItems.isUidNext()) {
final long uidNextValue = metaData.getUidNext();
- uidNext = new Long(uidNextValue);
+ uidNext = uidNextValue;
} else {
uidNext = null;
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
Tue Jan 25 15:06:39 2011
@@ -95,7 +95,7 @@ public class StoreProcessor extends Abst
final Flags resultFlags = entry.getValue();
final Long resultUid;
if (useUids) {
- resultUid = new Long(uid);
+ resultUid = uid;
} else {
resultUid = null;
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
Tue Jan 25 15:06:39 2011
@@ -50,6 +50,8 @@ public class SystemMessageProcessor exte
case FORCE_LOGOUT:
forceLogout(session);
break;
+ default:
+ break;
}
} catch (MailboxException e) {
final Log log = session.getLog();
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java
Tue Jan 25 15:06:39 2011
@@ -95,11 +95,11 @@ public class MailboxEventAnalyser implem
FlagsUpdated updated = (FlagsUpdated) messageEvent;
if (interestingFlags(updated)
&& (sessionId != eventSessionId ||
!silentFlagChanges)) {
- final Long uidObject = new Long(uid);
+ final Long uidObject = uid;
flagUpdateUids.add(uidObject);
}
} else if (messageEvent instanceof Expunged) {
- final Long uidObject = new Long(uid);
+ final Long uidObject = uid;
expungedUids.add(uidObject);
}
} else if (event instanceof MailboxDeletion) {
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java
Tue Jan 25 15:06:39 2011
@@ -110,7 +110,7 @@ public class UidToMsnConverter implement
final int msn = getMsn(uid);
remove(msn, uid);
final List<Integer> renumberMsns = new ArrayList<Integer>(msnToUid
- .tailMap(new Integer(msn + 1)).keySet());
+ .tailMap(msn + 1).keySet());
for (final Integer msnInteger: renumberMsns) {
int aMsn = msnInteger.intValue();
long aUid = getUid(aMsn);
@@ -131,7 +131,7 @@ public class UidToMsnConverter implement
* @param uid
*/
public synchronized void add(long uid) {
- if (!uidToMsn.containsKey(new Long(uid))) {
+ if (!uidToMsn.containsKey(uid)) {
highestMsn++;
add(highestMsn, uid);
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java?rev=1063311&r1=1063310&r2=1063311&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
Tue Jan 25 15:06:39 2011
@@ -232,6 +232,8 @@ public class FetchProcessor extends Abst
addContent(result, path, isBase,
MessageResult.FetchGroup.BODY_CONTENT);
break;
+ default:
+ break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
