opendev/gerrit
Code Issues Proposed changes

Remove deprecated methods from FormatUtil

Browse Source 
Change-Id: Idb3e4fc64a3babd983a90352697da06eb0c8b438
This commit is contained in:
David Pursehouse
2013-04-12 13:37:06 +09:00
parent 4a86020db2
commit a763539f48
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
View File

@@ -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. * Formats an account as a name and an email address.
* <p> * <p>
@@ -160,11 +155,6 @@ public class FormatUtil {
return name(asInfo(acct)); return name(asInfo(acct));
} }
@Deprecated
public static String name(com.google.gerrit.common.data.AccountInfo acct) {
return name(asInfo(acct));
}
/** /**
* Formats an account name. * Formats an account name.
* <p> * <p>

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
View File

@@ -53,11 +53,11 @@ public class AccountSuggestOracle extends SuggestAfterTypingNCharsOracle {
} }
public String getDisplayString() { public String getDisplayString() {
return FormatUtil.nameEmail(info); return FormatUtil.nameEmail(FormatUtil.asInfo(info));
} }
public String getReplacementString() { public String getReplacementString() {
return FormatUtil.nameEmail(info); return FormatUtil.nameEmail(FormatUtil.asInfo(info));
} }
} }
} }

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ReviewerSuggestOracle.java
View File

@@ -65,7 +65,7 @@ public class ReviewerSuggestOracle extends SuggestAfterTypingNCharsOracle {
public String getDisplayString() { public String getDisplayString() {
final AccountInfo accountInfo = reviewerInfo.getAccountInfo(); final AccountInfo accountInfo = reviewerInfo.getAccountInfo();
if (accountInfo != null) { if (accountInfo != null) {
return FormatUtil.nameEmail(accountInfo); return FormatUtil.nameEmail(FormatUtil.asInfo(accountInfo));
} }
return reviewerInfo.getGroup().getName() + " (" return reviewerInfo.getGroup().getName() + " ("
+ Util.C.suggestedGroupLabel() + ")"; + Util.C.suggestedGroupLabel() + ")";
@@ -74,7 +74,7 @@ public class ReviewerSuggestOracle extends SuggestAfterTypingNCharsOracle {
public String getReplacementString() { public String getReplacementString() {
final AccountInfo accountInfo = reviewerInfo.getAccountInfo(); final AccountInfo accountInfo = reviewerInfo.getAccountInfo();
if (accountInfo != null) { if (accountInfo != null) {
return FormatUtil.nameEmail(accountInfo); return FormatUtil.nameEmail(FormatUtil.asInfo(accountInfo));
} }
return reviewerInfo.getGroup().getName(); return reviewerInfo.getGroup().getName();
} }