From a763539f48138a2039a9e58a990fe36d15c20656 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Fri, 12 Apr 2013 13:37:06 +0900
Subject: [PATCH] Remove deprecated methods from FormatUtil

Change-Id: Idb3e4fc64a3babd983a90352697da06eb0c8b438
---
 .../main/java/com/google/gerrit/client/FormatUtil.java | 10 ----------
 .../google/gerrit/client/ui/AccountSuggestOracle.java  |  4 ++--
 .../google/gerrit/client/ui/ReviewerSuggestOracle.java |  4 ++--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
index 4f4e8a7ee9..5448dc0d53 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
@@ -119,11 +119,6 @@ public class FormatUtil {
     }
   }
 
-  @Deprecated
-  public static String nameEmail(com.google.gerrit.common.data.AccountInfo acct) {
-    return nameEmail(asInfo(acct));
-  }
-
   /**
    * Formats an account as a name and an email address.
    * <p>
@@ -160,11 +155,6 @@ public class FormatUtil {
     return name(asInfo(acct));
   }
 
-  @Deprecated
-  public static String name(com.google.gerrit.common.data.AccountInfo acct) {
-    return name(asInfo(acct));
-  }
-
   /**
    * Formats an account name.
    * <p>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
index b113a3b732..0bf0ea9df3 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
@@ -53,11 +53,11 @@ public class AccountSuggestOracle extends SuggestAfterTypingNCharsOracle {
     }
 
     public String getDisplayString() {
-      return FormatUtil.nameEmail(info);
+      return FormatUtil.nameEmail(FormatUtil.asInfo(info));
     }
 
     public String getReplacementString() {
-      return FormatUtil.nameEmail(info);
+      return FormatUtil.nameEmail(FormatUtil.asInfo(info));
     }
   }
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ReviewerSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ReviewerSuggestOracle.java
index f3b1439199..3f1de2b699 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ReviewerSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ReviewerSuggestOracle.java
@@ -65,7 +65,7 @@ public class ReviewerSuggestOracle extends SuggestAfterTypingNCharsOracle {
     public String getDisplayString() {
       final AccountInfo accountInfo = reviewerInfo.getAccountInfo();
       if (accountInfo != null) {
-        return FormatUtil.nameEmail(accountInfo);
+        return FormatUtil.nameEmail(FormatUtil.asInfo(accountInfo));
       }
       return reviewerInfo.getGroup().getName() + " ("
           + Util.C.suggestedGroupLabel() + ")";
@@ -74,7 +74,7 @@ public class ReviewerSuggestOracle extends SuggestAfterTypingNCharsOracle {
     public String getReplacementString() {
       final AccountInfo accountInfo = reviewerInfo.getAccountInfo();
       if (accountInfo != null) {
-        return FormatUtil.nameEmail(accountInfo);
+        return FormatUtil.nameEmail(FormatUtil.asInfo(accountInfo));
       }
       return reviewerInfo.getGroup().getName();
     }