commit e6784e9701b1aa13132f62b1b9f97961e75c951f
author Martin Fick <mfick@codeaurora.org> Fri Jul 23 09:33:55 2010 -0600
committer Martin Fick <mfick@codeaurora.org> Fri Jul 23 11:27:01 2010 -0600
tree e1ca9486dc5b7c8546854ecc0bcf5d3b3f6b92f9
parent df89f998d5c0fa5802a70482d4582b6313a018e4

Fix method duplication incurred when splitting OutgoingEmail

Remove the methods that were duplicated by accident in
ChangeEmail, and fix some access rights to those which
are now solely in OutoingEmail so that ChangeEmail can
still use them.

Change-Id: Iaf53b6314e0f57c84a6c99a7fe4fdb1deaf01f01

gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
index 3448cd6..e7c463c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
@@ -237,16 +237,6 @@
     return null;
   }
 
-  private String getSettingsUrl() {
-    if (getGerritUrl() != null) {
-      final StringBuilder r = new StringBuilder();
-      r.append(getGerritUrl());
-      r.append("settings");
-      return r.toString();
-    }
-    return null;
-  }
-
   protected String getChangeMessageThreadId() {
     final StringBuilder r = new StringBuilder();
     r.append('<');
@@ -328,13 +318,6 @@
     return r != null ? r.getOwners() : Collections.<AccountGroup.Id> emptySet();
   }
 
-  /** Schedule this message for delivery to the listed accounts. */
-  protected void add(final RecipientType rt, final Collection<Account.Id> list) {
-    for (final Account.Id id : list) {
-      add(rt, id);
-    }
-  }
-
   /** TO or CC all vested parties (change owner, patch set uploader, author). */
   protected void rcptToAuthors(final RecipientType rt) {
     add(rt, change.getOwner());
@@ -347,12 +330,6 @@
     }
   }
 
-  private void add(final RecipientType rt, final UserIdentity who) {
-    if (who != null && who.getAccount() != null) {
-      add(rt, who.getAccount());
-    }
-  }
-
   /** BCC any user who has starred this change. */
   protected void bccStarredBy() {
     try {

gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
index 8f34d9e..fe66636 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
@@ -195,7 +195,7 @@
     return SystemReader.getInstance().getHostname();
   }
 
-  private String getSettingsUrl() {
+  public String getSettingsUrl() {
     if (getGerritUrl() != null) {
       final StringBuilder r = new StringBuilder();
       r.append(getGerritUrl());
@@ -291,7 +291,7 @@
     }
   }
 
-  private void add(final RecipientType rt, final UserIdentity who) {
+  protected void add(final RecipientType rt, final UserIdentity who) {
     if (who != null && who.getAccount() != null) {
       add(rt, who.getAccount());
     }