Merge "SideBySide2: Add preference to hide line numbers"

gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java

@@ -67,6 +67,7 @@ public class GetDiffPreferences implements RestReadView<AccountResource> {
       info.skipDeleted = p.isSkipDeleted() ? true : null;
       info.skipUncommented = p.isSkipUncommented() ? true : null;
       info.hideTopMenu = p.isHideTopMenu() ? true : null;
+      info.hideLineNumbers = p.isHideLineNumbers() ? true : null;
       info.syntaxHighlighting = p.isSyntaxHighlighting() ? true : null;
       info.tabSize = p.getTabSize();
       return info;
@@ -86,6 +87,7 @@ public class GetDiffPreferences implements RestReadView<AccountResource> {
     Boolean skipUncommented;
     Boolean syntaxHighlighting;
     Boolean hideTopMenu;
+    Boolean hideLineNumbers;
     int tabSize;
   }
 }

gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java

@@ -45,6 +45,7 @@ public class SetDiffPreferences implements RestModifyView<AccountResource, Input
     Boolean skipUncommented;
     Boolean syntaxHighlighting;
     Boolean hideTopMenu;
+    Boolean hideLineNumbers;
     Integer tabSize;
   }
 
@@ -120,6 +121,9 @@ public class SetDiffPreferences implements RestModifyView<AccountResource, Input
       if (input.hideTopMenu != null) {
         p.setHideTopMenu(input.hideTopMenu);
       }
+      if (input.hideLineNumbers != null) {
+        p.setHideLineNumbers(input.hideLineNumbers);
+      }
       if (input.tabSize != null) {
         p.setTabSize(input.tabSize);
       }

gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java

@@ -32,7 +32,7 @@ import java.util.List;
 /** A version of the database schema. */
 public abstract class SchemaVersion {
   /** The current schema version. */
-  public static final Class<Schema_90> C = Schema_90.class;
+  public static final Class<Schema_91> C = Schema_91.class;
 
   public static class Module extends AbstractModule {
     @Override

gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_91.java

@@ -0,0 +1,25 @@
+// Copyright (C) 2013 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.schema;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+public class Schema_91 extends SchemaVersion {
+  @Inject
+  Schema_91(Provider<Schema_90> prior) {
+    super(prior);
+  }
+}