From 045808f28b03ed9914c256348b11d7f24a6a91b5 Mon Sep 17 00:00:00 2001
From: Bruce Zu <bruce.zu@sonymobile.com>
Date: Wed, 27 Nov 2013 22:12:00 +0800
Subject: [PATCH] Trim the Dispatcher.patch()

Make Dispatcher.patch() concise and easy to read.
Please refer the logic from ce8620d7.

Change-Id: Ibf5d8c4d24f09f23e666e0e308c0462c9147edab
---
 .../com/google/gerrit/client/Dispatcher.java  | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

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 750ccaf678..7e82f4f9e0 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
@@ -601,16 +601,7 @@ public class Dispatcher {
             panel = 0 <= c ? token.substring(c + 1) : "";
           }
 
-          if ("sidebyside".equals(panel)) {
-            return new PatchScreen.SideBySide( //
-                id, //
-                patchIndex, //
-                patchSetDetail, //
-                patchTable, //
-                top, //
-                baseId //
-            );
-          } else if ("unified".equals(panel)) {
+          if ("unified".equals(panel)) {
             return new PatchScreen.Unified( //
                 id, //
                 patchIndex, //
@@ -634,14 +625,14 @@ public class Dispatcher {
               );
             }
             return new SideBySide2(baseId, id.getParentKey(), id.get());
-          } else if ("".equals(panel)) {
-            return new PatchScreen.SideBySide(
-                id,
-                patchIndex,
-                patchSetDetail,
-                patchTable,
-                top,
-                baseId);
+          } else if ("".equals(panel) || "sidebyside".equals(panel)) {
+            return new PatchScreen.SideBySide(//
+                id, //
+                patchIndex,//
+                patchSetDetail,//
+                patchTable,//
+                top,//
+                baseId);//
           }
         }