commit 614675be0d96dbfb9646e941b80b6d80e03a4ffd
author Christian Aistleitner <christian@quelltextlich.at> Thu Apr 04 10:45:53 2013 +0200
committer Christian Aistleitner <christian@quelltextlich.at> Thu Apr 04 11:02:54 2013 +0200
tree fe01d4ca91ee9958cfba524e31a2624fc02ce509
parent a3cf7138cb3b6a631fe7aca7e01290dff8c8f585

Change default comment visibility to expand all recent comments

Users had a hard time following change discussions, when all but the
most recent comment were collapsed on the change screen per
default. So we change the default to expand all comments that are not
older than a week.

Change-Id: Id2fc7c18e928331e66ac82c02d25b0483e1cd64f

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
index 639a1cf..3d1d30e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
@@ -218,7 +218,7 @@
         p.getTimeFormat());
     relativeDateInChangeTable.setValue(p.isRelativeDateInChangeTable());
     setListBox(commentVisibilityStrategy,
-        AccountGeneralPreferences.CommentVisibilityStrategy.EXPAND_MOST_RECENT,
+        AccountGeneralPreferences.CommentVisibilityStrategy.EXPAND_RECENT,
         p.getCommentVisibilityStrategy());
   }
 
@@ -285,7 +285,7 @@
         AccountGeneralPreferences.TimeFormat.values()));
     p.setRelativeDateInChangeTable(relativeDateInChangeTable.getValue());
     p.setCommentVisibilityStrategy(getListBox(commentVisibilityStrategy,
-        CommentVisibilityStrategy.EXPAND_MOST_RECENT,
+        CommentVisibilityStrategy.EXPAND_RECENT,
         CommentVisibilityStrategy.values()));
 
     enable(false);

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
index c219fa3..65b1b70 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
@@ -387,7 +387,7 @@
     final Timestamp aged = new Timestamp(System.currentTimeMillis() - AGE);
 
     CommentVisibilityStrategy commentVisibilityStrategy =
-        CommentVisibilityStrategy.EXPAND_MOST_RECENT;
+        CommentVisibilityStrategy.EXPAND_RECENT;
     if (Gerrit.isSignedIn()) {
       commentVisibilityStrategy = Gerrit.getUserAccount()
           .getGeneralPreferences().getCommentVisibilityStrategy();
@@ -422,16 +422,16 @@
       switch (commentVisibilityStrategy) {
         case COLLAPSE_ALL:
           break;
-        case EXPAND_RECENT:
-          isOpen = isRecent;
-          break;
         case EXPAND_ALL:
           isOpen = true;
           break;
         case EXPAND_MOST_RECENT:
-        default:
           isOpen = i == msgList.size() - 1;
           break;
+        case EXPAND_RECENT:
+        default:
+          isOpen = isRecent;
+          break;
       }
       cp.setOpen(isOpen);
       comments.add(cp);

gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGeneralPreferences.java

diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGeneralPreferences.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGeneralPreferences.java
index ad0f130..abdf879 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGeneralPreferences.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGeneralPreferences.java
@@ -249,7 +249,7 @@
 
   public CommentVisibilityStrategy getCommentVisibilityStrategy() {
     if (commentVisibilityStrategy == null) {
-      return CommentVisibilityStrategy.EXPAND_MOST_RECENT;
+      return CommentVisibilityStrategy.EXPAND_RECENT;
     }
     return CommentVisibilityStrategy.valueOf(commentVisibilityStrategy);
   }