From 2a65129eb7eba50938d0bec4ebccfbcf0814432a Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Fri, 18 Dec 2009 21:02:00 -0800
Subject: [PATCH] Update to gwtexpui-1.2.0-SNAPSHOT

This version of gwtexpui is fully updated to GWT 2.0.0, which we
are also moving towards.

The clippy widget now allows for a smaller preview text, removing
the need for us to force the clippy movie to line wrap onto the
next line through a CSS hack.

Change-Id: I879f2b7e57c1743cc773d4054847cbf8451b4d06
Signed-off-by: Shawn O. Pearce <sop@google.com>
---
 .../main/java/com/google/gerrit/GerritGwtUI.gwt.xml  |  1 -
 .../gerrit/client/account/SshHostKeyPanel.java       |  6 ++++--
 .../com/google/gerrit/client/account/SshPanel.java   | 12 ++++++------
 .../main/java/com/google/gerrit/public/gerrit.css    |  6 ------
 pom.xml                                              |  2 +-
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
index d11e742c0a..6255c8e843 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
@@ -17,7 +17,6 @@
   <inherits name='com.google.gwt.user.User'/>
   <inherits name='com.google.gwt.resources.Resources'/>
   <inherits name='com.google.gwt.user.theme.chrome.Chrome'/>
-  <inherits name='com.google.gwtexpui.css.CSS'/>
   <inherits name='com.google.gwtexpui.clippy.Clippy'/>
   <inherits name='com.google.gwtexpui.globalkey.GlobalKey'/>
   <inherits name='com.google.gwtexpui.progress.Progress'/>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java
index 175cb05a52..f1a0c99afa 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java
@@ -39,8 +39,10 @@ class SshHostKeyPanel extends Composite {
       final HTML hdr = new HTML(Util.C.sshHostKeyKnownHostEntry());
       hdr.setStyleName("gerrit-SshHostKeyPanel-Heading");
       body.add(hdr);
-      final CopyableLabel lbl =
-          new CopyableLabel(info.getHostIdent() + " " + info.getHostKey());
+
+      final CopyableLabel lbl;
+      lbl = new CopyableLabel(info.getHostIdent() + " " + info.getHostKey());
+      lbl.setPreviewText(SshPanel.elide(lbl.getText(), 80));
       lbl.addStyleName("gerrit-SshHostKeyPanel-KnownHostEntry");
       body.add(lbl);
     }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java
index d49c61c4a1..e6b81cc6cc 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java
@@ -561,7 +561,7 @@ class SshPanel extends Composite {
         fmt.addStyleName(row, 2, S_INVALID);
       }
       table.setText(row, 3, k.getAlgorithm());
-      table.setText(row, 4, elide(k.getEncodedKey()));
+      table.setText(row, 4, elide(k.getEncodedKey(), 40));
       table.setText(row, 5, k.getComment());
       table.setText(row, 6, FormatUtil.mediumFormat(k.getLastUsedOn()));
       table.setText(row, 7, FormatUtil.mediumFormat(k.getStoredOn()));
@@ -577,12 +577,12 @@ class SshPanel extends Composite {
 
       setRowItem(row, k);
     }
+  }
 
-    String elide(final String s) {
-      if (s == null || s.length() < 40) {
-        return s;
-      }
-      return s.substring(0, 30) + "..." + s.substring(s.length() - 10);
+  static String elide(final String s, final int len) {
+    if (s == null || s.length() < len || len <= 10) {
+      return s;
     }
+    return s.substring(0, len - 10) + "..." + s.substring(s.length() - 10);
   }
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/public/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/public/gerrit.css
index 8bab4ed5b0..9f811d46d7 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/public/gerrit.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/public/gerrit.css
@@ -901,14 +901,8 @@
   white-space: nowrap;
   font-family: 'Lucida Console', 'Lucida Sans Typewriter', Monaco, monospace;
   font-size: small;
-  overflow: hidden;
   width: 80em;
 }
-.gerrit-SshHostKeyPanel-KnownHostEntry .gwtexpui-Clippy-Control {
-  display: block;
-  margin-left: 0px;
-  margin-top: 2px;
-}
 
 .gerrit-ContributorAgreement-Button {
   font-weight: bold;
diff --git a/pom.xml b/pom.xml
index 255444db25..a6b63a447b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@ limitations under the License.
     <jgitVersion>0.5.1.51-g96b2e76</jgitVersion>
     <gwtormVersion>1.1.2</gwtormVersion>
     <gwtjsonrpcVersion>1.2.1-SNAPSHOT</gwtjsonrpcVersion>
-    <gwtexpuiVersion>1.1.4</gwtexpuiVersion>
+    <gwtexpuiVersion>1.2.0-SNAPSHOT</gwtexpuiVersion>
     <gwtVersion>2.0.0</gwtVersion>
     <slf4jVersion>1.5.8</slf4jVersion>
     <guiceVersion>2.0</guiceVersion>