Select default/configured gc period in create/edit repository page

James Moger

2014-02-21 b23b67c1cc0b2541580f23c9aec97c0b84a823f4

 src/main/java/com/gitblit/manager/NotificationManager.java

@@ -32,7 +32,7 @@

import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.MailExecutor;
import com.gitblit.service.MailService;

/**
 * The notification manager dispatches notifications.  Currently, email is the
@@ -50,11 +50,11 @@

   private final IStoredSettings settings;

   private final MailExecutor mailExecutor;
   private final MailService mailExecutor;

   public NotificationManager(IStoredSettings settings) {
      this.settings = settings;
      this.mailExecutor = new MailExecutor(settings);
      this.mailExecutor = new MailService(settings);
   }

   @Override
@@ -142,7 +142,20 @@
    */
   @Override
   public void sendHtmlMail(String subject, String message, Collection<String> toAddresses) {
      this.sendHtmlMail(subject, message, toAddresses.toArray(new String[0]));
      this.sendHtmlMail(null, subject, message, toAddresses.toArray(new String[0]));
   }

   /**
    * Notify users by email of something.
    *
    * @param from
    * @param subject
    * @param message
    * @param toAddresses
    */
   @Override
   public void sendHtmlMail(String from, String subject, String message, Collection<String> toAddresses) {
      this.sendHtmlMail(from, subject, message, toAddresses.toArray(new String[0]));
   }

   /**
@@ -154,12 +167,25 @@
    */
   @Override
   public void sendHtmlMail(String subject, String message, String... toAddresses) {
      this.sendHtmlMail(null, message, toAddresses);
   }

   /**
    * Notify users by email of something.
    *
    * @param from
    * @param subject
    * @param message
    * @param toAddresses
    */
   @Override
   public void sendHtmlMail(String from, String subject, String message, String... toAddresses) {
      if (toAddresses == null || toAddresses.length == 0) {
         logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
         logger.debug("Dropping message {} because there are no recipients", subject);
         return;
      }
      try {
         Message mail = mailExecutor.createMessage(toAddresses);
         Message mail = mailExecutor.createMessage(from, toAddresses);
         if (mail != null) {
            mail.setSubject(subject);