From 920d7c7dd48eb303375dda6a2d90fc0051136a68 Mon Sep 17 00:00:00 2001
From: Edwin Kempin <edwin.kempin@sap.com>
Date: Thu, 25 Apr 2013 08:48:54 +0200
Subject: [PATCH] Use Diffy as avatar for the Gerrit server itself

Display Diffy as avatar for comments on changes that were created
by the Gerrit server, e.g. for the comment that is created if a change
needs to be rebased due to a path conflict.

Change-Id: I9bdd2e356fa1562ac1a20c4c9d17a557094d9018
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
---
 .../com/google/gerrit/client/AvatarImage.java    |  13 ++++++++++++-
 .../google/gerrit/client/GerritResources.java    |   3 +++
 .../main/java/com/google/gerrit/client/diffy.png | Bin 0 -> 4822 bytes
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy.png

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/AvatarImage.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/AvatarImage.java
index 873ab4d7f2..0cfd05f258 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/AvatarImage.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/AvatarImage.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.client;
 
 import com.google.gerrit.client.account.AccountInfo;
+import com.google.gerrit.client.changes.Util;
 import com.google.gerrit.client.rpc.RestApi;
 import com.google.gwt.event.dom.client.ErrorEvent;
 import com.google.gwt.event.dom.client.ErrorHandler;
@@ -56,7 +57,8 @@ public class AvatarImage extends Image {
    *        avatar image
    */
   public AvatarImage(AccountInfo account, int size, boolean addPopup) {
-    super(url(account.email(), size));
+    super(isGerritServer(account) ? getGerritServerAvatarUrl() :
+        url(account.email(), size));
 
     if (size > 0) {
       // If the provider does not resize the image, force it in the browser.
@@ -80,6 +82,15 @@ public class AvatarImage extends Image {
     }
   }
 
+  private static boolean isGerritServer(AccountInfo account) {
+    return account._account_id() == 0
+        && Util.C.messageNoAuthor().equals(account.name());
+  }
+
+  private static String getGerritServerAvatarUrl() {
+    return Gerrit.RESOURCES.gerritAvatar().getSafeUri().asString();
+  }
+
   private static String url(String email, int size) {
     if (email == null) {
       return "";
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
index fc7ea53cbf..d3f47c04fc 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
@@ -51,4 +51,7 @@ public interface GerritResources extends ClientBundle {
 
   @Source("addFileComment.png")
   public ImageResource addFileComment();
+
+  @Source("diffy.png")
+  public ImageResource gerritAvatar();
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy.png
new file mode 100644
index 0000000000000000000000000000000000000000..4be4541a0526b8b168ae31c2715eafe85d693078
GIT binary patch
literal 4822
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

literal 0
HcmV?d00001