commit 33d8738a92bc81361ea914c81b6ec640c7bc0e89
author Edwin Kempin <edwin.kempin@sap.com> Tue Jun 03 15:05:54 2014 +0200
committer Edwin Kempin <edwin.kempin@sap.com> Tue Jun 03 15:05:54 2014 +0200
tree 59d6148cf6ee05e2b9d3f4c7e969e3072c8b927b
parent e5b4943e485768041daccc55e1bdfd7bfe1d469d

ChangeScreen2: Respect user preference for unified diff view

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

gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
index 1b89a5a..666c3e2 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
@@ -652,6 +652,12 @@
 
           if ("".equals(panel)) {
             if (isChangeScreen2()) {
+              if (Gerrit.isSignedIn()
+                  && DiffView.UNIFIED_DIFF.equals(Gerrit.getUserAccount()
+                      .getGeneralPreferences().getDiffView())) {
+                return new PatchScreen.Unified(id, patchIndex, patchSetDetail,
+                    patchTable, top, baseId);
+              }
               return new SideBySide2(baseId, id.getParentKey(), id.get(),
                   side, line);
             }
@@ -672,8 +678,7 @@
                 top, //
                 baseId //
             );
-          } else if (("cm".equals(panel) && Gerrit.getConfig().getNewFeatures())
-              || ("".equals(panel) && isChangeScreen2())) {
+          } else if ("cm".equals(panel) && Gerrit.getConfig().getNewFeatures()) {
             if (Gerrit.isSignedIn()
                 && DiffView.UNIFIED_DIFF.equals(Gerrit.getUserAccount()
                     .getGeneralPreferences().getDiffView())) {