commit d8055ef359e17e8210ba2020343f9540acc4f77b
author Edwin Kempin <edwin.kempin@sap.com> Mon Dec 08 16:15:50 2014 +0100
committer Edwin Kempin <edwin.kempin@sap.com> Fri Dec 12 14:07:51 2014 +0100
tree 06b260c7166a947464f5bfcde14b70af5c709d01
parent 976500cd672790506ed3a3638baf9698eb986ae9

Add icons to switch back to normal side-by-side/unified diff

Change-Id: I1575960d3b93a7b1dd841bafe58b093a11e089b6
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocSideBySideDiffScreen.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocSideBySideDiffScreen.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocSideBySideDiffScreen.java
index 543b6ba..e9b0861 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocSideBySideDiffScreen.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocSideBySideDiffScreen.java
@@ -68,6 +68,10 @@
   @Override
   protected void init() {
     addIcon(createIcon(
+        XDocsPlugin.RESOURCES.sideBySideDiff(),
+        "side-by-side text diff",
+        XDocsPlugin.getSideBySideDiffUrl(changeId, base, patchSet, path)));
+    addIcon(createIcon(
         XDocsPlugin.RESOURCES.unifiedDiffPreview(),
         "unified preview diff",
         XDocsPlugin.getUnifiedPreviewDiffUrl(changeId, base, patchSet, path)));

src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocUnifiedDiffScreen.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocUnifiedDiffScreen.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocUnifiedDiffScreen.java
index a5776cd..9004ad7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocUnifiedDiffScreen.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocUnifiedDiffScreen.java
@@ -56,6 +56,10 @@
   @Override
   protected void init() {
     addIcon(createIcon(
+        XDocsPlugin.RESOURCES.unifiedDiff(),
+        "unified text diff",
+        XDocsPlugin.getUnifiedDiffUrl(changeId, base, patchSet, path)));
+    addIcon(createIcon(
         XDocsPlugin.RESOURCES.sideBySideDiffPreview(),
         "side-by-side preview diff",
         XDocsPlugin.getSideBySidePreviewDiffUrl(changeId, base, patchSet, path)));

src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocsPlugin.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocsPlugin.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocsPlugin.java
index 21ce3d6..3d62ac3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocsPlugin.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocsPlugin.java
@@ -34,11 +34,9 @@
         new XDocSideBySideDiffScreen.Factory());
   }
 
-  public static String getSideBySidePreviewDiffUrl(String changeId,
+  public static String getSideBySideDiffUrl(String changeId,
       Integer patchSetIdA, int patchSetIdB, String fileName) {
     StringBuilder url = new StringBuilder();
-    url.append("/x/");
-    url.append(Plugin.get().getPluginName());
     url.append("/c/");
     url.append(changeId);
     url.append("/");
@@ -52,6 +50,21 @@
     return url.toString();
   }
 
+  public static String getUnifiedDiffUrl(String changeId, Integer patchSetIdA,
+      int patchSetIdB, String fileName) {
+    return getSideBySideDiffUrl(changeId, patchSetIdA, patchSetIdB, fileName)
+        + ",unified";
+  }
+
+  public static String getSideBySidePreviewDiffUrl(String changeId,
+      Integer patchSetIdA, int patchSetIdB, String fileName) {
+    StringBuilder url = new StringBuilder();
+    url.append("/x/");
+    url.append(Plugin.get().getPluginName());
+    url.append(getSideBySideDiffUrl(changeId, patchSetIdA, patchSetIdB, fileName));
+    return url.toString();
+  }
+
   public static String getUnifiedPreviewDiffUrl(String changeId,
       Integer patchSetIdA, int patchSetIdB, String fileName) {
     return getSideBySidePreviewDiffUrl(changeId, patchSetIdA, patchSetIdB,