X-Git-Url: http://jaekl.net/gitweb/?p=cfb.git;a=blobdiff_plain;f=prod%2Fnet%2Fjaekl%2Fcfb%2Fanalyze%2FNotifier.java;fp=prod%2Fnet%2Fjaekl%2Fcfb%2Fanalyze%2FNotifier.java;h=7fdcfd31f1ccaff549b34e1fcce0d6ea2bf24346;hp=bf92fc107368607e4a1cccfc07b3045051fe2684;hb=7ef6c36cd147216c5354082b11aa33cf6b5c6f49;hpb=59715b74a1ef7cb3fcdb48544b6f4f2cf8208805

diff --git a/prod/net/jaekl/cfb/analyze/Notifier.java b/prod/net/jaekl/cfb/analyze/Notifier.java
index bf92fc1..7fdcfd3 100644
--- a/prod/net/jaekl/cfb/analyze/Notifier.java
+++ b/prod/net/jaekl/cfb/analyze/Notifier.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
 
 import net.jaekl.cfb.CfbBundle;
 import net.jaekl.cfb.Config;
+import net.jaekl.cfb.store.Run;
 import net.jaekl.qd.util.MailException;
 import net.jaekl.qd.util.MimePart;
 import net.jaekl.qd.util.SendMail;
@@ -27,10 +28,31 @@ public class Notifier {
 			sendEmail(pw, report);
 		}
 	}
+
+	// --- end of public interface ---
 	
-	void sendEmail(PrintWriter pw, HtmlReport report) {
-		SendMail sendMail = new SendMail();
+	String constructSubject(HtmlReport report) {
+		String earlier;
+		Run earlierRun = report.getDelta().getEarlier();
+		if (null == earlierRun) {
+			earlier = m_bundle.get(CfbBundle.NO_EARLIER_RUN);
+		}
+		else {
+			earlier = report.getDelta().getEarlier().constructVersionText(m_bundle);
+		}
 		
+		String later = report.getDelta().getLater().constructVersionText(m_bundle);
+
+		String subject = m_bundle.get(CfbBundle.CFB_MAIL_SUBJECT, earlier, later);
+		return subject;
+	}
+
+	SendMail createSendMail() {
+		return new SendMail();
+	}
+	
+	void sendEmail(PrintWriter pw, HtmlReport report) {
+		SendMail sendMail = createSendMail();
 		sendMail.setSmtpHost(m_config.getMailSmtpHost());
 		
 		ArrayList<String> recipients = m_config.getNotify();
@@ -41,11 +63,8 @@ public class Notifier {
 		PrintWriter mailWriter = null;
 		
 		try {
-			String earlier = report.getDelta().getEarlier().constructVersionText(m_bundle);
-			String later   = report.getDelta().getLater().constructVersionText(m_bundle);
-
+			sendMail.setSubject(constructSubject(report));
 			sendMail.setFrom(m_config.getMailFrom());
-			sendMail.setSubject(m_bundle.get(CfbBundle.CFB_MAIL_SUBJECT, earlier, later));
 			
 			for (String recipient : recipients) {
 				sendMail.addTo(recipient);