1 files changed, 31 insertions, 15 deletions

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScriptSettingsPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScriptSettingsPanel.java
index 404eeebc26..871eb2bd2d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScriptSettingsPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScriptSettingsPanel.java
@@ -20,8 +20,8 @@ import com.google.gerrit.client.account.Util;
 import com.google.gerrit.client.rpc.GerritCallback;
 import com.google.gerrit.client.ui.ListenableAccountDiffPreference;
 import com.google.gerrit.client.ui.NpIntTextBox;
-import com.google.gerrit.reviewdb.AccountDiffPreference;
-import com.google.gerrit.reviewdb.AccountDiffPreference.Whitespace;
+import com.google.gerrit.reviewdb.client.AccountDiffPreference;
+import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.KeyCodes;
@@ -41,7 +41,7 @@ import com.google.gwt.user.client.ui.FocusWidget;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;
-import com.google.gwtjsonrpc.client.VoidResult;
+import com.google.gwtjsonrpc.common.VoidResult;
 
 public class PatchScriptSettingsPanel extends Composite implements
     HasValueChangeHandlers<AccountDiffPreference> {
@@ -79,7 +79,7 @@ public class PatchScriptSettingsPanel extends Composite implements
   CheckBox showTabs;
 
   @UiField
-  CheckBox reviewed;
+  CheckBox manualReview;
 
   @UiField
   CheckBox skipDeleted;
@@ -87,10 +87,18 @@ public class PatchScriptSettingsPanel extends Composite implements
   @UiField
   CheckBox skipUncommented;
 
+  @UiField
+  CheckBox expandAllComments;
+
+  @UiField
+  CheckBox retainHeader;
 
   @UiField
   Button update;
 
+  @UiField
+  Button save;
+
   /**
    * Counts +1 for every setEnabled(true) and -1 for every setEnabled(false)
    *
@@ -111,14 +119,14 @@ public class PatchScriptSettingsPanel extends Composite implements
     initIgnoreWhitespace(ignoreWhitespace);
     initContext(context);
     if (!Gerrit.isSignedIn()) {
-      reviewed.setVisible(false);
+      save.setVisible(false);
     }
 
     KeyPressHandler onEnter = new KeyPressHandler() {
       @Override
       public void onKeyPress(KeyPressEvent event) {
         if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER) {
-          update();
+          save();
         }
       }
     };
@@ -157,7 +165,7 @@ public class PatchScriptSettingsPanel extends Composite implements
     } else {
       syntaxHighlighting.setValue(false);
     }
-    toggleEnabledStatus(update.isEnabled());
+    toggleEnabledStatus(save.isEnabled());
   }
 
   public void setEnableIntralineDifference(final boolean on) {
@@ -167,7 +175,7 @@ public class PatchScriptSettingsPanel extends Composite implements
     } else {
       intralineDifference.setValue(false);
     }
-    toggleEnabledStatus(update.isEnabled());
+    toggleEnabledStatus(save.isEnabled());
   }
 
   private void toggleEnabledStatus(final boolean on) {
@@ -179,10 +187,6 @@ public class PatchScriptSettingsPanel extends Composite implements
     syntaxHighlighting.setTitle(title);
   }
 
-  public CheckBox getReviewedCheckBox() {
-    return reviewed;
-  }
-
   public AccountDiffPreference getValue() {
     return listenablePrefs.get();
   }
@@ -209,6 +213,9 @@ public class PatchScriptSettingsPanel extends Composite implements
     showTabs.setValue(dp.isShowTabs());
     skipDeleted.setValue(dp.isSkipDeleted());
     skipUncommented.setValue(dp.isSkipUncommented());
+    expandAllComments.setValue(dp.isExpandAllComments());
+    retainHeader.setValue(dp.isRetainHeader());
+    manualReview.setValue(dp.isManualReview());
   }
 
   @UiHandler("update")
@@ -216,6 +223,11 @@ public class PatchScriptSettingsPanel extends Composite implements
     update();
   }
 
+  @UiHandler("save")
+  void onSave(ClickEvent event) {
+    save();
+  }
+
   private void update() {
     if (colWidth.getIntValue() <= 0) {
       new ErrorDialog(PatchUtil.C.illegalNumberOfColumns()).center();
@@ -233,9 +245,15 @@ public class PatchScriptSettingsPanel extends Composite implements
     dp.setShowTabs(showTabs.getValue());
     dp.setSkipDeleted(skipDeleted.getValue());
     dp.setSkipUncommented(skipUncommented.getValue());
+    dp.setExpandAllComments(expandAllComments.getValue());
+    dp.setRetainHeader(retainHeader.getValue());
+    dp.setManualReview(manualReview.getValue());
 
     listenablePrefs.set(dp);
+  }
 
+  private void save() {
+    update();
     if (Gerrit.isSignedIn()) {
       persistDiffPreferences();
     }
@@ -243,11 +261,9 @@ public class PatchScriptSettingsPanel extends Composite implements
 
   private void persistDiffPreferences() {
     setEnabled(false);
-    Util.ACCOUNT_SVC.changeDiffPreferences(getValue(),
-        new GerritCallback<VoidResult>() {
+    listenablePrefs.save(new GerritCallback<VoidResult>() {
       @Override
       public void onSuccess(VoidResult result) {
-        Gerrit.setAccountDiffPreference(getValue());
         setEnabled(true);
       }