Skip to content

Commit

Permalink
Reviewed MAIL module code, made improvements (readability)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dizzzz
dizzzz committed Jul 9, 2014
1 parent 6b22fa6 commit 93e9e8f
Show file tree
Hide file tree
Showing 2 changed files with 249 additions and 260 deletions.
120 changes: 59 additions & 61 deletions extensions/modules/src/org/exist/xquery/modules/mail/MessageListFunctions.java
View file
Expand Up @@ -271,9 +271,9 @@ private void prefetchMessages( Folder folder, Message[] msgList ) throws Messagi
FetchProfile fp = new FetchProfile(); FetchProfile fp = new FetchProfile();
fp.add( FetchProfile.Item.ENVELOPE ); fp.add( FetchProfile.Item.ENVELOPE );


for( int i = 0; i < PREFETCH_HEADERS.length; i++ ) { for (String PREFETCH_HEADERS : PREFETCH_HEADERS) {
fp.add( PREFETCH_HEADERS[i] ); fp.add(PREFETCH_HEADERS);
} }
folder.fetch( msgList, fp ); folder.fetch( msgList, fp );
} }


Expand Down Expand Up @@ -337,84 +337,82 @@ private Sequence getMessageListAsXML( Sequence[] args, Sequence contextSequence
// Recipients // Recipients
builder.startElement( new QName( "recipients", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.startElement( new QName( "recipients", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
// To Recipients // To Recipients
Address[] to = message.getRecipients( Message.RecipientType.TO ); Address[] toAddresses = message.getRecipients( Message.RecipientType.TO );
if( to != null ) { if( toAddresses != null ) {
for( int j = 0; j < to.length; j++ ) { for (Address to : toAddresses) {
builder.startElement( new QName( "recipient", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.startElement( new QName( "recipient", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.addAttribute( new QName( "type", null, null ), "to" ); builder.addAttribute( new QName( "type", null, null ), "to" );
builder.characters( to[j].toString() ); builder.characters(to.toString());
builder.endElement(); builder.endElement();
} }
} }


// cc Recipients // cc Recipients
Address[] cc = message.getRecipients( Message.RecipientType.CC ); Address[] ccAddresses = message.getRecipients( Message.RecipientType.CC );
if( cc != null ) { if( ccAddresses != null ) {
for( int j = 0; j < cc.length; j++ ) { for (Address ccAddress : ccAddresses) {
builder.startElement( new QName( "recipient", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.startElement( new QName( "recipient", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.addAttribute( new QName( "type", null, null ), "cc" ); builder.addAttribute( new QName( "type", null, null ), "cc" );
builder.characters( cc[j].toString() ); builder.characters(ccAddress.toString());
builder.endElement(); builder.endElement();
} }
} }


// bcc Recipients // bcc Recipients
Address[] bccAddresses = message.getRecipients( Message.RecipientType.BCC ); Address[] bccAddresses = message.getRecipients( Message.RecipientType.BCC );
if( bccAddresses != null ) { if( bccAddresses != null ) {
for (Address bccAddress : bccAddresses) { for (Address bccAddress : bccAddresses) {
builder.startElement( new QName( "recipient", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.startElement( new QName( "recipient", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.addAttribute( new QName( "type", null, null ), "bcc" ); builder.addAttribute( new QName( "type", null, null ), "bcc" );
builder.characters(bccAddress.toString()); builder.characters(bccAddress.toString());
builder.endElement(); builder.endElement();
} }
} }
builder.endElement(); builder.endElement();


// Flags // Flags


Flags flags = message.getFlags(); Flags flags = message.getFlags();
Flags.Flag[] sf = flags.getSystemFlags(); Flags.Flag[] systemFlags = flags.getSystemFlags();
String[] uf = flags.getUserFlags(); String[] userFlags = flags.getUserFlags();


if( sf.length > 0 || uf.length > 0 ) { if( systemFlags.length > 0 || userFlags.length > 0 ) {
builder.startElement( new QName( "flags", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.startElement( new QName( "flags", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );


// System Flags for (Flags.Flag systemFlag : systemFlags) {
for( int f = 0; f < sf.length; f++ ) { if (systemFlag == Flags.Flag.ANSWERED) {
if( sf[f] == Flags.Flag.ANSWERED ) { builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.addAttribute( new QName( "type", null, null ), "answered" );
builder.addAttribute( new QName( "type", null, null ), "answered" ); builder.endElement();
builder.endElement(); } else if (systemFlag == Flags.Flag.DELETED) {
} else if( sf[f] == Flags.Flag.DELETED ) { builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.addAttribute( new QName( "type", null, null ), "deleted" );
builder.addAttribute( new QName( "type", null, null ), "deleted" ); builder.endElement();
builder.endElement(); } else if (systemFlag == Flags.Flag.DRAFT) {
} else if( sf[f] == Flags.Flag.DRAFT ) { builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.addAttribute( new QName( "type", null, null ), "draft" );
builder.addAttribute( new QName( "type", null, null ), "draft" ); builder.endElement();
builder.endElement(); } else if (systemFlag == Flags.Flag.FLAGGED) {
} else if( sf[f] == Flags.Flag.FLAGGED ) { builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.addAttribute( new QName( "type", null, null ), "flagged" );
builder.addAttribute( new QName( "type", null, null ), "flagged" ); builder.endElement();
builder.endElement(); } else if (systemFlag == Flags.Flag.RECENT) {
} else if( sf[f] == Flags.Flag.RECENT ) { builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.addAttribute( new QName( "type", null, null ), "recent" );
builder.addAttribute( new QName( "type", null, null ), "recent" ); builder.endElement();
builder.endElement(); } else if (systemFlag == Flags.Flag.SEEN) {
} else if( sf[f] == Flags.Flag.SEEN ) { builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.addAttribute( new QName( "type", null, null ), "seen" );
builder.addAttribute( new QName( "type", null, null ), "seen" ); builder.endElement();
builder.endElement(); }
} }
}


// User Flags for (String userFlag : userFlags) {
for( int f = 0; f < uf.length; f++ ) { builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null );
builder.startElement( new QName( "flag", MailModule.NAMESPACE_URI, MailModule.PREFIX ), null ); builder.addAttribute( new QName( "type", null, null ), "user" );
builder.addAttribute( new QName( "type", null, null ), "user" ); builder.addAttribute(new QName( "value", null, null ), userFlag);
builder.addAttribute( new QName( "value", null, null ), uf[ f ] ); builder.endElement();
builder.endElement(); }
}


builder.endElement(); builder.endElement();
} }
Expand Down

0 comments on commit 93e9e8f

Please sign in to comment.