made newMessage a static method and Message() private

[org.ibex.mail.git] / src / org / ibex / mail / target / Script.java

diff --git a/src/org/ibex/mail/target/Script.java b/src/org/ibex/mail/target/Script.java
index 1f822a7..67eb64b 100644 (file)
--- a/src/org/ibex/mail/target/Script.java
+++ b/src/org/ibex/mail/target/Script.java
@@ -142,10 +142,7 @@ public class Script extends Target {
                         if ("from".equalsIgnoreCase(key)) from = Address.parse(val);
                         if ("to".equalsIgnoreCase(key)) to = Address.parse(val);
                     }
-                    Message message = new Message(new org.ibex.io.Stream(headers.toString() + "\r\n" + body),
-                                                  new Message.Envelope(from,
-                                                                       to,
-                                                                       new Date()));
+                    Message message = Message.newMessage(new org.ibex.io.Stream(headers.toString() + "\r\n" + body), from, to);
                     //org.ibex.mail.protocol.SMTP.Outgoing.accept(message);
                     boolean ok = org.ibex.mail.protocol.SMTP.Outgoing.attempt(message);
                     if (!ok) throw new JSExn("SMTP server rejected message");
@@ -154,10 +151,9 @@ public class Script extends Target {
                 if (name.equals("mail.forward")) { return new Target() {
                         public void accept(Message m) throws MailException {
                             try {
-                                Message m2 = new Message(new org.ibex.io.Stream(m.toString()),
-                                                         new Message.Envelope(m.envelope.from,
-                                                                              new Address(a.toString()),
-                                                                              new Date()));
+                                Message m2 = Message.newMessage(new org.ibex.io.Stream(m.toString()),
+                                                         m.envelopeFrom,
+                                                         new Address(a.toString()));
                                 org.ibex.mail.protocol.SMTP.Outgoing.accept(m2);
                             } catch (Exception e) {
                                 throw new MailException(e.toString());