gephi.team team mailing list archive

[Andrew Ross <andrew@xxxxxxxxxxxxxxxx>]

Andrew Ross has proposed merging lp:~rockclimb/gephi/javamail-api-only into lp:gephi.

Requested reviews:
  Gephi Team (gephi.team)

For more details, see:
https://code.launchpad.net/~rockclimb/gephi/javamail-api-only/+merge/55026

It might be better if the JavaMailWrapper module only exported classes in the JavaMail API, leaving out the implementation classes. This branch achieves that. I had to modify one source file which was using the com.sun.mail classes, but the changes don't affect anything, since the old code was:

if (msg instanceof POP3Message) {
  // do something
} else if (msg instanceof IMAPMessage) {
  // do the same thing
} else if (msg instanceof MimeMessage) {
  // do the same thing
}

Since POP3Message and IMAPMessage are both subclasses of MimeMessage this should still work without the first two if statements.

-- 
https://code.launchpad.net/~rockclimb/gephi/javamail-api-only/+merge/55026
Your team Gephi Team is requested to review the proposed merge of lp:~rockclimb/gephi/javamail-api-only into lp:gephi.

=== modified file 'DesktopRecentFiles/nbproject/genfiles.properties'
--- DesktopRecentFiles/nbproject/genfiles.properties	2011-03-13 01:18:25 +0000
+++ DesktopRecentFiles/nbproject/genfiles.properties	2011-03-27 22:04:30 +0000
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=9412fa29
+build.xml.data.CRC32=cbf82cd7
 build.xml.script.CRC32=d11e6704
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.42.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=9412fa29
+nbproject/build-impl.xml.data.CRC32=cbf82cd7
 nbproject/build-impl.xml.script.CRC32=d3095729
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.1

=== modified file 'DesktopRecentFiles/nbproject/project.xml'
--- DesktopRecentFiles/nbproject/project.xml	2011-03-13 01:18:25 +0000
+++ DesktopRecentFiles/nbproject/project.xml	2011-03-27 22:04:30 +0000
@@ -35,7 +35,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.38.2</specification-version>
+                        <specification-version>7.32.1.1.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

=== modified file 'JavaMailWrapper/nbproject/genfiles.properties'
--- JavaMailWrapper/nbproject/genfiles.properties	2011-03-06 23:45:43 +0000
+++ JavaMailWrapper/nbproject/genfiles.properties	2011-03-27 22:04:30 +0000
@@ -3,6 +3,6 @@
 build.xml.stylesheet.CRC32=a56c6a5b@1.42.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=428f779a
+nbproject/build-impl.xml.data.CRC32=b80f8d7f
 nbproject/build-impl.xml.script.CRC32=09938fda
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.1

=== modified file 'JavaMailWrapper/nbproject/project.xml'
--- JavaMailWrapper/nbproject/project.xml	2011-03-06 23:45:43 +0000
+++ JavaMailWrapper/nbproject/project.xml	2011-03-27 22:04:30 +0000
@@ -7,16 +7,6 @@
             <suite-component/>
             <module-dependencies/>
             <public-packages>
-                <package>com.sun.mail.auth</package>
-                <package>com.sun.mail.dsn</package>
-                <package>com.sun.mail.handlers</package>
-                <package>com.sun.mail.iap</package>
-                <package>com.sun.mail.imap</package>
-                <package>com.sun.mail.imap.protocol</package>
-                <package>com.sun.mail.pop3</package>
-                <package>com.sun.mail.smtp</package>
-                <package>com.sun.mail.util</package>
-                <package>com.sun.mail.util.logging</package>
                 <package>javax.mail</package>
                 <package>javax.mail.event</package>
                 <package>javax.mail.internet</package>

=== modified file 'SpigotPlugin/src/org/gephi/io/spigot/plugin/EmailImporter.java'
--- SpigotPlugin/src/org/gephi/io/spigot/plugin/EmailImporter.java	2011-03-06 23:50:08 +0000
+++ SpigotPlugin/src/org/gephi/io/spigot/plugin/EmailImporter.java	2011-03-27 22:04:30 +0000
@@ -20,8 +20,6 @@
 */
 package org.gephi.io.spigot.plugin;
 
-import com.sun.mail.imap.IMAPMessage;
-import com.sun.mail.pop3.POP3Message;
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.Collection;
@@ -476,23 +474,7 @@
      */
     private InternetAddress constructFromAddress(Message msg) throws MessagingException{
         InternetAddress address = new InternetAddress();
-        if (msg instanceof POP3Message) {
-            String fromHeader = ((POP3Message) msg).getHeader("From")[0];
-            if (fromHeader.contains("<") && fromHeader.contains(">")) {
-                address.setAddress(fromHeader.substring(fromHeader.lastIndexOf('<') + 1, fromHeader.lastIndexOf('>')));
-            } else {
-                report.log("Can't parse pop3 message :"+ msg.toString());
-                return null;
-            }
-        } else if (msg instanceof IMAPMessage) {
-            String fromHeader = ((IMAPMessage) msg).getHeader("From")[0];
-            if (fromHeader.contains("<") && fromHeader.contains(">")) {
-                address.setAddress(fromHeader.substring(fromHeader.lastIndexOf('<') + 1, fromHeader.lastIndexOf('>')));
-            } else {
-                report.log("Can't parse imap message :"+ msg.toString());
-                return null;
-            }
-        } else if (msg instanceof MimeMessage) {
+        if (msg instanceof MimeMessage) {
             String fromHeader = msg.getHeader("From")[0];
             if (fromHeader.contains("<") && fromHeader.contains(">")) {
                 address.setAddress(fromHeader.substring(fromHeader.lastIndexOf('<') + 1, fromHeader.lastIndexOf('>')));