make email factor out usable

diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java
index 1f232490eddbdbdc40cc980c3a82e1064bd22fc4..ba40bb849cf208bdceef4292efd978a6edda6d29 100644 (file)
--- a/src/org/cacert/gigi/email/EmailProvider.java
+++ b/src/org/cacert/gigi/email/EmailProvider.java
@@ -6,7 +6,7 @@ public abstract class EmailProvider {
        public abstract void sendmail(String to, String subject, String message,
                        String from, String replyto, String toname, String fromname,
                        String errorsto, boolean extra) throws IOException;
        public abstract void sendmail(String to, String subject, String message,
                        String from, String replyto, String toname, String fromname,
                        String errorsto, boolean extra) throws IOException;

-       private static EmailProvider instance;
+       private static EmailProvider instance = new Sendmail();

        public static EmailProvider getInstance() {
                return instance;
        }
        public static EmailProvider getInstance() {
                return instance;
        }

diff --git a/src/org/cacert/gigi/email/Sendmail.java b/src/org/cacert/gigi/email/Sendmail.java
index f709169e4dd3185259f95398791169ffb01955c8..5a85cd78baa6c98f2a471cffd6f19d58683b0be1 100644 (file)
--- a/src/org/cacert/gigi/email/Sendmail.java
+++ b/src/org/cacert/gigi/email/Sendmail.java
@@ -11,13 +11,14 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
 import java.util.Locale;
 import java.util.regex.Pattern;
 

-class Sendmail {
-       private Sendmail() {
+public class Sendmail extends EmailProvider {
+       protected Sendmail() {

        }
        private static final Pattern NON_ASCII = Pattern
                        .compile("[^a-zA-Z0-9 .-\\[\\]!_@]");
 
        }
        private static final Pattern NON_ASCII = Pattern
                        .compile("[^a-zA-Z0-9 .-\\[\\]!_@]");
 

-       public static void sendmail(String to, String subject, String message,
+       @Override
+       public void sendmail(String to, String subject, String message,

                        String from, String replyto, String toname, String fromname,
                        String errorsto, boolean extra) throws IOException {
 
                        String from, String replyto, String toname, String fromname,
                        String errorsto, boolean extra) throws IOException {