Author: norman
Date: Mon Apr 4 08:17:09 2011
New Revision: 1088499
URL: http://svn.apache.org/viewvc?rev=1088499&view=rev
Log:
Replace tabs with spaces
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirHeader.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirProperty.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/model/MaildirSubscription.java
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java?rev=1088499&r1=1088498&r2=1088499&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
Mon Apr 4 08:17:09 2011
@@ -220,6 +220,10 @@ public class MaildirStore implements Uid
return getFolderName(mailboxPath.getNamespace(),
mailboxPath.getUser(), mailboxPath.getName());
}
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.mailbox.store.mail.UidProvider#nextUid(org.apache.james.mailbox.MailboxSession,
org.apache.james.mailbox.store.mail.model.Mailbox)
+ */
public long nextUid(MailboxSession session, Mailbox<Integer> mailbox)
throws MailboxException {
try {
return createMaildirFolder(mailbox).getLastUid() +1;
@@ -228,6 +232,10 @@ public class MaildirStore implements Uid
}
}
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.mailbox.store.mail.UidProvider#lastUid(org.apache.james.mailbox.MailboxSession,
org.apache.james.mailbox.store.mail.model.Mailbox)
+ */
public long lastUid(MailboxSession session, Mailbox<Integer> mailbox)
throws MailboxException {
try {
return createMaildirFolder(mailbox).getLastUid();
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java?rev=1088499&r1=1088498&r2=1088499&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java
Mon Apr 4 08:17:09 2011
@@ -29,7 +29,10 @@ public class MaildirSubscriptionManager
super(mf);
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.mailbox.store.StoreSubscriptionManager#createSubscription(org.apache.james.mailbox.MailboxSession,
java.lang.String)
+ */
protected Subscription createSubscription(MailboxSession session, String
mailbox) {
return new MaildirSubscription(session.getUser().getUserName(),
mailbox);
}
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java?rev=1088499&r1=1088498&r2=1088499&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
Mon Apr 4 08:17:09 2011
@@ -432,44 +432,44 @@ public class MaildirMessageMapper extend
final MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
findInMailbox(mailbox, set, new MailboxMembershipCallback<Integer>() {
-
- public void
onMailboxMembers(List<MailboxMembership<Integer>> members)
- throws MailboxException {
- for (final MailboxMembership<Integer>
member:members) {
- Flags originalFlags = member.createFlags();
- if (replace) {
- member.setFlags(flags);
- } else {
- Flags current = member.createFlags();
- if (value) {
- current.add(flags);
- } else {
- current.remove(flags);
- }
- member.setFlags(current);
- }
- Flags newFlags = member.createFlags();
-
- try {
- AbstractMaildirMessage maildirMessage =
(AbstractMaildirMessage) member;
- MaildirMessageName messageName =
folder.getMessageNameByUid(maildirMessage.getUid());
- File messageFile = messageName.getFile();
- //System.out.println("save existing " + message
+ " as " + messageFile.getName());
-
messageName.setFlags(maildirMessage.createFlags());
- // this automatically moves messages from new
to cur if needed
- String newMessageName =
messageName.getFullName();
- messageFile.renameTo(new
File(folder.getCurFolder(), newMessageName));
- long uid = maildirMessage.getUid();
- folder.update(uid, newMessageName);
- } catch (IOException e) {
- throw new MailboxException("Failure while save
Message " + member + " in Mailbox " + mailbox, e );
- }
-
- updatedFlags.add(new
UpdatedFlags(member.getUid(),originalFlags, newFlags));
- }
- }
- });
-
+
+ public void onMailboxMembers(List<MailboxMembership<Integer>>
members) throws MailboxException {
+ for (final MailboxMembership<Integer> member : members) {
+ Flags originalFlags = member.createFlags();
+ if (replace) {
+ member.setFlags(flags);
+ } else {
+ Flags current = member.createFlags();
+ if (value) {
+ current.add(flags);
+ } else {
+ current.remove(flags);
+ }
+ member.setFlags(current);
+ }
+ Flags newFlags = member.createFlags();
+
+ try {
+ AbstractMaildirMessage maildirMessage =
(AbstractMaildirMessage) member;
+ MaildirMessageName messageName =
folder.getMessageNameByUid(maildirMessage.getUid());
+ File messageFile = messageName.getFile();
+ // System.out.println("save existing " + message +
+ // " as " + messageFile.getName());
+ messageName.setFlags(maildirMessage.createFlags());
+ // this automatically moves messages from new to cur if
+ // needed
+ String newMessageName = messageName.getFullName();
+ messageFile.renameTo(new File(folder.getCurFolder(),
newMessageName));
+ long uid = maildirMessage.getUid();
+ folder.update(uid, newMessageName);
+ } catch (IOException e) {
+ throw new MailboxException("Failure while save Message
" + member + " in Mailbox " + mailbox, e);
+ }
+
+ updatedFlags.add(new UpdatedFlags(member.getUid(),
originalFlags, newFlags));
+ }
+ }
+ });
return updatedFlags.iterator();
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirHeader.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirHeader.java?rev=1088499&r1=1088498&r2=1088499&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirHeader.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirHeader.java
Mon Apr 4 08:17:09 2011
@@ -25,11 +25,12 @@ import org.apache.james.mailbox.store.ma
public class MaildirHeader extends AbstractComparableHeader {
private int lineNumber;
- private String field;
- private String value;
+ private String field;
+ private String value;
- /**
+ /**
* Copies the content of an existing header.
+ *
* @param header
*/
public MaildirHeader(Header header) {
@@ -42,29 +43,32 @@ public class MaildirHeader extends Abstr
this.field = field;
this.value = value;
}
-
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Header#getFieldName()
- */
- public String getFieldName() {
- return field;
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Header#getLineNumber()
- */
- public int getLineNumber() {
- return lineNumber;
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Header#getValue()
- */
- public String getValue() {
- return value;
- }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.james.mailbox.store.mail.model.Header#getFieldName()
+ */
+ public String getFieldName() {
+ return field;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.james.mailbox.store.mail.model.Header#getLineNumber()
+ */
+ public int getLineNumber() {
+ return lineNumber;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.james.mailbox.store.mail.model.Header#getValue()
+ */
+ public String getValue() {
+ return value;
+ }
}
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java?rev=1088499&r1=1088498&r2=1088499&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java
Mon Apr 4 08:17:09 2011
@@ -27,8 +27,8 @@ public class MaildirMailbox implements M
private String namespace;
private String user;
private String name;
- private long lastUid;
- private long uidValidity;
+ private long lastUid;
+ private long uidValidity;
public MaildirMailbox(MailboxPath path, long uidValidity, long lastUid) {
this.namespace = path.getNamespace();
@@ -46,27 +46,31 @@ public class MaildirMailbox implements M
this.uidValidity = mailbox.getUidValidity();
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Mailbox#consumeUid()
- */
- public void consumeUid() {
- lastUid++;
- }
-
- public void setMailboxId(Integer id) {
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.james.mailbox.store.mail.model.Mailbox#consumeUid()
+ */
+ public void consumeUid() {
+ lastUid++;
+ }
+
+ public void setMailboxId(Integer id) {
this.id = id;
- }
+ }
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId()
- */
- public Integer getMailboxId() {
- return id;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId()
+ */
+ public Integer getMailboxId() {
+ return id;
+ }
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.james.mailbox.store.mail.model.Mailbox#getNamespace()
*/
public String getNamespace() {
@@ -94,71 +98,79 @@ public class MaildirMailbox implements M
this.user = user;
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Mailbox#getName()
- */
- public String getName() {
- return name;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.james.mailbox.store.mail.model.Mailbox#getName()
+ */
+ public String getName() {
+ return name;
+ }
/*
* (non-Javadoc)
- * @see
org.apache.james.mailbox.store.mail.model.Mailbox#setName(java.lang.String)
+ *
+ * @see
+ *
org.apache.james.mailbox.store.mail.model.Mailbox#setName(java.lang.String
+ * )
*/
public void setName(String name) {
this.name = name;
}
- /*
- * (non-Javadoc)
- * @see
org.apache.james.mailbox.store.mail.model.Mailbox#getUidValidity()
- */
- public long getUidValidity() {
- return uidValidity;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (obj == this) {
- return true;
- }
- if (obj instanceof MaildirMailbox) {
- if (id != null) {
- if (id.equals(((MaildirMailbox)
obj).getMailboxId()))
- return true;
- } else {
- if (((MaildirMailbox) obj).getMailboxId() == null)
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- final int PRIME = 31;
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUidValidity()
+ */
+ public long getUidValidity() {
+ return uidValidity;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (obj instanceof MaildirMailbox) {
+ if (id != null) {
+ if (id.equals(((MaildirMailbox) obj).getMailboxId()))
+ return true;
+ } else {
+ if (((MaildirMailbox) obj).getMailboxId() == null)
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int PRIME = 31;
int result = 1;
result = PRIME * result + namespace.hashCode();
result = PRIME * result + user.hashCode();
result = PRIME * result + name.hashCode();
return result;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return namespace + ":" + user + ":" + name;
- }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return namespace + ":" + user + ":" + name;
+ }
}
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java?rev=1088499&r1=1088498&r2=1088499&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
Mon Apr 4 08:17:09 2011
@@ -280,14 +280,26 @@ public class MaildirMessage extends Abst
return modified;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.mail.model.Message#getFullContent()
+ */
public InputStream getFullContent() throws IOException {
return rawFullContent;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.mail.model.Message#getBodyContent()
+ */
public InputStream getBodyContent() throws IOException {
return new LazySkippingInputStream(rawFullContent, bodyStartOctet);
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.mail.model.Message#getBodyOctets()
+ */
public long getBodyOctets() {
return getFullContentOctets() - bodyStartOctet;
}
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirProperty.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirProperty.java?rev=1088499&r1=1088498&r2=1088499&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirProperty.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirProperty.java
Mon Apr 4 08:17:09 2011
@@ -43,7 +43,6 @@ public class MaildirProperty extends Abs
* (non-Javadoc)
* @see
org.apache.james.mailbox.store.mail.model.AbstractComparableProperty#getOrder()
*/
- @Override
public int getOrder() {
return order;
}
@@ -56,10 +55,18 @@ public class MaildirProperty extends Abs
return localName;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.mail.model.Property#getNamespace()
+ */
public String getNamespace() {
return namespace;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.mail.model.Property#getValue()
+ */
public String getValue() {
return value;
}
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/model/MaildirSubscription.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/model/MaildirSubscription.java?rev=1088499&r1=1088498&r2=1088499&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/model/MaildirSubscription.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/model/MaildirSubscription.java
Mon Apr 4 08:17:09 2011
@@ -30,10 +30,19 @@ public class MaildirSubscription impleme
this.mailbox = mailbox;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.user.model.Subscription#getMailbox()
+ */
public String getMailbox() {
return mailbox;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailbox.store.user.model.Subscription#getUser()
+ */
public String getUser() {
return user;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
