commit fa563a2ae3c8f374de520fc095d483a5bb9945f7
author Shawn O. Pearce <sop@google.com> Fri May 29 14:25:27 2009 -0700
committer Shawn O. Pearce <sop@google.com> Fri May 29 14:25:27 2009 -0700
tree 5481fd36f783da0b8fda662fd0435464c5c9f09c
parent 4a45271ab0dd4e29a3a112c8199e36158192cef2

Remove spurious whitespace from blank lines in diff views

We shouldn't put an   entity into the line if the line is empty,
as it shows a space when the user tries to select the line text.  In
theory I had put these here to preserve the line height, but that is
already taken care of for us by the line numbers which appear in the
same table row, using the same font.

Bug: GERRIT-211
Signed-off-by: Shawn O. Pearce <sop@google.com>

src/main/java/com/google/gerrit/client/patches/SideBySideTable.java

diff --git a/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java b/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
index aace582..1edf12a 100644
--- a/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
+++ b/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
@@ -180,13 +180,11 @@
     m.openTd();
     m.addStyleName(S_ICON_CELL);
     m.addStyleName("FileColumnHeader");
-    m.nbsp();
     m.closeTd();
 
     m.openTd();
     m.addStyleName("FileColumnHeader");
     m.addStyleName("LineNumber");
-    m.nbsp();
     m.closeTd();
 
     m.openTd();
@@ -198,7 +196,6 @@
     m.openTd();
     m.addStyleName("FileColumnHeader");
     m.addStyleName("LineNumber");
-    m.nbsp();
     m.closeTd();
 
     m.openTd();
@@ -215,7 +212,6 @@
 
     m.openTd();
     m.setStyleName(S_ICON_CELL);
-    m.nbsp();
     m.closeTd();
 
     m.openTd();
@@ -232,7 +228,6 @@
 
     m.openTd();
     m.setStyleName(S_ICON_CELL);
-    m.nbsp();
     m.closeTd();
   }
 
@@ -248,26 +243,19 @@
     m.addStyleName("FileLine");
     m.addStyleName("FileLine-" + type.name());
     final String text = src.get(i);
-    if ("".equals(text)) {
-      m.nbsp();
-    } else {
-      final boolean ws = type == INSERT;
-      m.append(PatchUtil
-          .lineToSafeHtml(text, PatchUtil.DEFAULT_LINE_LENGTH, ws));
-    }
+    final boolean ws = type == INSERT;
+    m.append(PatchUtil.lineToSafeHtml(text, PatchUtil.DEFAULT_LINE_LENGTH, ws));
     m.closeTd();
   }
 
   private void appendLineNone(final SafeHtmlBuilder m) {
     m.openTd();
     m.setStyleName("LineNumber");
-    m.nbsp();
     m.closeTd();
 
     m.openTd();
     m.addStyleName("FileLine");
     m.addStyleName("FileLineNone");
-    m.nbsp();
     m.closeTd();
   }
 

src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java

diff --git a/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java b/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
index 9911fa9..830f433 100644
--- a/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
+++ b/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
@@ -239,22 +239,16 @@
     m.addStyleName("DiffText-" + type.name());
     switch (type) {
       case CONTEXT:
-        if ("".equals(text)) {
-          m.nbsp();
-        } else {
-          m.append(" ");
-          m.append(PatchUtil.lineToSafeHtml(text, len, false));
-        }
+        m.nbsp();
         break;
       case DELETE:
         m.append("-");
-        m.append(PatchUtil.lineToSafeHtml(text, len, false));
         break;
       case INSERT:
         m.append("+");
-        m.append(PatchUtil.lineToSafeHtml(text, len, true));
         break;
     }
+    m.append(PatchUtil.lineToSafeHtml(text, len, false));
     m.closeTd();
   }
 
@@ -275,7 +269,6 @@
     m.setAttribute("valign", "top");
     m.openTd();
     m.setStyleName(S_ICON_CELL);
-    m.nbsp();
     m.closeTd();
   }
 
@@ -286,7 +279,6 @@
   private void padLineNumber(final SafeHtmlBuilder m) {
     m.openTd();
     m.setStyleName("LineNumber");
-    m.nbsp();
     m.closeTd();
   }