You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2011/12/26 20:48:13 UTC
svn commit: r1224796 - in
/james/protocols/trunk/imap/src/main/java/org/apache/james/imap:
api/message/ decode/parser/ main/ processor/ processor/base/ processor/fetch/
Author: norman
Date: Mon Dec 26 19:48:12 2011
New Revision: 1224796
URL: http://svn.apache.org/viewvc?rev=1224796&view=rev
Log:
Make compatible with java5. See PROTOCOLS-73
Modified:
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/main/OutputStreamImapResponseWriter.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java?rev=1224796&r1=1224795&r2=1224796&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java Mon Dec 26 19:48:12 2011
@@ -171,7 +171,6 @@ public final class IdRange implements It
*
* @return rangeIt
*/
- @Override
public Iterator<Long> iterator() {
long from = getLowVal();
if (from == Long.MAX_VALUE) {
@@ -195,12 +194,18 @@ public final class IdRange implements It
this.current = from;
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see java.util.Iterator#hasNext()
+ */
public boolean hasNext() {
return current <= to;
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see java.util.Iterator#next()
+ */
public Long next() {
if (hasNext()) {
return current++;
@@ -209,14 +214,20 @@ public final class IdRange implements It
}
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see java.util.Iterator#remove()
+ */
public void remove() {
throw new UnsupportedOperationException("Read-Only");
}
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
public int compareTo(IdRange range2) {
// Correctly sort and respect "*" and "*:*" ranges. See IMAP-289
if (getLowVal() == Long.MAX_VALUE && getHighVal() == Long.MAX_VALUE && range2.getLowVal() == Long.MAX_VALUE && range2.getHighVal() == Long.MAX_VALUE) {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java?rev=1224796&r1=1224795&r2=1224796&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java Mon Dec 26 19:48:12 2011
@@ -84,7 +84,10 @@ public abstract class AbstractSelectionC
request.consumeWord(new CharacterValidator() {
int pos = 0;
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator#isValid(char)
+ */
public boolean isValid(char chr) {
if (pos >= QRESYNC.length) {
return false;
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java?rev=1224796&r1=1224795&r2=1224796&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java Mon Dec 26 19:48:12 2011
@@ -78,7 +78,12 @@ public class FetchCommandParser extends
// Now check for the CHANGEDSINCE option which is part of CONDSTORE
request.consumeWord(new CharacterValidator() {
int pos = 0;
- @Override
+
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator#isValid(char)
+ */
public boolean isValid(char chr) {
if (pos > CHANGEDSINCE.length) {
return false;
@@ -95,7 +100,11 @@ public class FetchCommandParser extends
// Check for the VANISHED option which is part of QRESYNC
request.consumeWord(new CharacterValidator() {
int pos = 0;
- @Override
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator#isValid(char)
+ */
public boolean isValid(char chr) {
if (pos > VANISHED.length) {
return false;
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java?rev=1224796&r1=1224795&r2=1224796&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java Mon Dec 26 19:48:12 2011
@@ -141,7 +141,10 @@ public class SearchCommandParser extends
request.consumeQuoted();
request.consumeWord(new CharacterValidator() {
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator#isValid(char)
+ */
public boolean isValid(char chr) {
return true;
}
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/main/OutputStreamImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/main/OutputStreamImapResponseWriter.java?rev=1224796&r1=1224795&r2=1224796&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/main/OutputStreamImapResponseWriter.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/main/OutputStreamImapResponseWriter.java Mon Dec 26 19:48:12 2011
@@ -64,7 +64,10 @@ public class OutputStreamImapResponseWri
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.encode.ImapResponseWriter#write(byte[])
+ */
public void write(byte[] buffer) throws IOException {
output.write(buffer);
}
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java?rev=1224796&r1=1224795&r2=1224796&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java Mon Dec 26 19:48:12 2011
@@ -435,17 +435,26 @@ abstract class AbstractSelectionProcesso
}
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.processor.CapabilityImplementingProcessor#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
+ */
public List<String> getImplementedCapabilities(ImapSession session) {
return CAPS;
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.processor.PermitEnableCapabilityProcessor#getPermitEnableCapabilities(org.apache.james.imap.api.process.ImapSession)
+ */
public List<String> getPermitEnableCapabilities(ImapSession session) {
return CAPS;
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.processor.PermitEnableCapabilityProcessor#enable(org.apache.james.imap.api.ImapMessage, org.apache.james.imap.api.process.ImapProcessor.Responder, org.apache.james.imap.api.process.ImapSession, java.lang.String)
+ */
public void enable(ImapMessage message, Responder responder, ImapSession session, String capability) throws EnableException {
if (EnableProcessor.getEnabledCapabilities(session).contains(capability) == false) {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java?rev=1224796&r1=1224795&r2=1224796&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java Mon Dec 26 19:48:12 2011
@@ -123,22 +123,34 @@ public class ListProcessor extends Abstr
results = new ArrayList<MailboxMetaData>(1);
results.add(new MailboxMetaData() {
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.MailboxMetaData#inferiors()
+ */
public Children inferiors() {
return Children.CHILDREN_ALLOWED_BUT_UNKNOWN;
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.MailboxMetaData#getSelectability()
+ */
public Selectability getSelectability() {
return Selectability.NOSELECT;
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.MailboxMetaData#getHierarchyDelimiter()
+ */
public char getHierarchyDelimiter() {
return mailboxSession.getPathDelimiter();
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.MailboxMetaData#getPath()
+ */
public MailboxPath getPath() {
return rootPath;
}
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java?rev=1224796&r1=1224795&r2=1224796&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java Mon Dec 26 19:48:12 2011
@@ -173,7 +173,6 @@ public class SelectedMailboxImpl impleme
/**
* @see SelectedMailbox#getFirstUid()
*/
- @Override
public synchronized long getFirstUid() {
if (uidToMsn.isEmpty()) {
return -1;
@@ -185,7 +184,6 @@ public class SelectedMailboxImpl impleme
/**
* @see SelectedMailbox#getLastUid()
*/
- @Override
public synchronized long getLastUid() {
if (uidToMsn.isEmpty()) {
return -1;
@@ -195,7 +193,7 @@ public class SelectedMailboxImpl impleme
}
- @Override
+
public synchronized void deselect() {
MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
@@ -220,7 +218,7 @@ public class SelectedMailboxImpl impleme
/**
* @see org.apache.james.imap.api.process.SelectedMailbox#removeRecent(long)
*/
- @Override
+
public synchronized boolean removeRecent(long uid) {
final boolean result = recentUids.remove(uid);
if (result) {
@@ -239,7 +237,7 @@ public class SelectedMailboxImpl impleme
/**
* @see org.apache.james.imap.api.process.SelectedMailbox#getRecent()
*/
- @Override
+
public synchronized Collection<Long> getRecent() {
checkExpungedRecents();
return new ArrayList<Long>(recentUids);
@@ -248,7 +246,7 @@ public class SelectedMailboxImpl impleme
/**
* @see org.apache.james.imap.api.process.SelectedMailbox#recentCount()
*/
- @Override
+
public synchronized int recentCount() {
checkExpungedRecents();
return recentUids.size();
@@ -257,7 +255,7 @@ public class SelectedMailboxImpl impleme
/**
* @see org.apache.james.imap.api.process.SelectedMailbox#getPath()
*/
- @Override
+
public synchronized MailboxPath getPath() {
return path;
}
@@ -271,7 +269,7 @@ public class SelectedMailboxImpl impleme
/**
* @see org.apache.james.imap.api.process.SelectedMailbox#isRecent(long)
*/
- @Override
+
public synchronized boolean isRecent(long uid) {
return recentUids.contains(uid);
}
@@ -280,7 +278,7 @@ public class SelectedMailboxImpl impleme
* @see
* org.apache.james.imap.api.process.SelectedMailbox#isRecentUidRemoved()
*/
- @Override
+
public synchronized boolean isRecentUidRemoved() {
return recentUidRemoved;
}
@@ -289,7 +287,7 @@ public class SelectedMailboxImpl impleme
* @see
* org.apache.james.imap.api.process.SelectedMailbox#resetRecentUidRemoved()
*/
- @Override
+
public synchronized void resetRecentUidRemoved() {
recentUidRemoved = false;
}
@@ -308,7 +306,7 @@ public class SelectedMailboxImpl impleme
* @see
* org.apache.james.imap.api.process.SelectedMailbox#remove(java.lang.Long)
*/
- @Override
+
public synchronized int remove(Long uid) {
final int result = msn(uid);
expunge(uid);
@@ -339,7 +337,7 @@ public class SelectedMailboxImpl impleme
}
- @Override
+
public synchronized void resetExpungedUids() {
expungedUids.clear();
}
@@ -370,7 +368,7 @@ public class SelectedMailboxImpl impleme
*
* @return true if new messages have been added, false otherwise
*/
- @Override
+
public synchronized final boolean isSizeChanged() {
return sizeChanged;
}
@@ -381,7 +379,7 @@ public class SelectedMailboxImpl impleme
* @return true when the mailbox has been deleted by another session, false
* otherwise
*/
- @Override
+
public synchronized final boolean isDeletedByOtherSession() {
return isDeletedByOtherSession;
}
@@ -391,7 +389,7 @@ public class SelectedMailboxImpl impleme
*
* @return uids
*/
- @Override
+
public synchronized Collection<Long> flagUpdateUids() {
// copy the TreeSet to fix possible
// java.util.ConcurrentModificationException
@@ -405,7 +403,7 @@ public class SelectedMailboxImpl impleme
*
* @return uids
*/
- @Override
+
public synchronized Collection<Long> expungedUids() {
// copy the TreeSet to fix possible
// java.util.ConcurrentModificationException
@@ -417,22 +415,22 @@ public class SelectedMailboxImpl impleme
- @Override
+
public synchronized Flags getApplicableFlags() {
return applicableFlags;
}
- @Override
+
public synchronized boolean hasNewApplicableFlags() {
return applicableFlagsChanged;
}
- @Override
+
public synchronized void resetNewApplicableFlags() {
applicableFlagsChanged = false;
}
- @Override
+
public synchronized void event(Event event) {
// Check if the event was for the mailbox we are observing
@@ -520,7 +518,7 @@ public class SelectedMailboxImpl impleme
}
}
- @Override
+
public synchronized int msn(long uid) {
Integer msn = uidToMsn.get(uid);
if (msn != null) {
@@ -530,7 +528,7 @@ public class SelectedMailboxImpl impleme
}
}
- @Override
+
public synchronized long uid(int msn) {
if (msn == -1) {
return SelectedMailbox.NO_SUCH_MESSAGE;
@@ -543,7 +541,7 @@ public class SelectedMailboxImpl impleme
}
}
- @Override
+
public synchronized long existsCount() {
return uidToMsn.size();
}
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java?rev=1224796&r1=1224795&r2=1224796&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java Mon Dec 26 19:48:12 2011
@@ -37,7 +37,10 @@ public class EmptyContent implements Con
return 0;
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.Content#getInputStream()
+ */
public InputStream getInputStream() throws IOException {
return new ByteArrayInputStream("".getBytes());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org