commit 7615e3c34fcd29a44d482a7d76a29da9d7085d70
author Eric Tsai <erictsai53@gmail.com> Thu May 21 15:25:51 2009 +0800
committer Eric Tsai <erictsai53@gmail.com> Sat Jun 06 00:56:40 2009 +0800
tree 971feadd1b9f1aa4eb81f1ce3d9061d742e25821
parent f8b825b9d73e333ae652f536b0e7f7170ea26d9e

Display branch name next to project in change list

Bug: GERRIT-177

src/main/java/com/google/gerrit/client/changes/ChangeConstants.java

diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java b/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
index d83b7c5..0859e53 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
@@ -35,6 +35,7 @@
   String changeTableColumnOwner();
   String changeTableColumnReviewers();
   String changeTableColumnProject();
+  String changeTableColumnBranch();
   String changeTableColumnLastUpdate();
   String changeTableNone();
 

src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties

diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties b/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
index 15df8a4..74228e1 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
@@ -15,6 +15,7 @@
 changeTableColumnOwner = Owner
 changeTableColumnReviewers = Reviewers
 changeTableColumnProject = Project
+changeTableColumnBranch = Branch
 changeTableColumnLastUpdate = LastUpdate
 changeTableNone = (None)
 

src/main/java/com/google/gerrit/client/changes/ChangeTable.java

diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
index d07bccd..a5da645 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
@@ -59,8 +59,9 @@
   private static final int C_SUBJECT = 3;
   private static final int C_OWNER = 4;
   private static final int C_PROJECT = 5;
-  private static final int C_LAST_UPDATE = 6;
-  private static final int COLUMNS = 7;
+  private static final int C_BRANCH = 6;
+  private static final int C_LAST_UPDATE = 7;
+  private static final int COLUMNS = 8;
 
   private final List<Section> sections;
   private HandlerRegistration regSignOut;
@@ -83,6 +84,7 @@
     table.setText(0, C_SUBJECT, Util.C.changeTableColumnSubject());
     table.setText(0, C_OWNER, Util.C.changeTableColumnOwner());
     table.setText(0, C_PROJECT, Util.C.changeTableColumnProject());
+    table.setText(0, C_BRANCH, Util.C.changeTableColumnBranch());
     table.setText(0, C_LAST_UPDATE, Util.C.changeTableColumnLastUpdate());
 
     final FlexCellFormatter fmt = table.getFlexCellFormatter();
@@ -196,6 +198,7 @@
     fmt.addStyleName(row, C_ID, S_C_ID);
     fmt.addStyleName(row, C_SUBJECT, S_C_SUBJECT);
     fmt.addStyleName(row, C_PROJECT, S_C_PROJECT);
+    fmt.addStyleName(row, C_BRANCH, S_C_PROJECT);
     fmt.addStyleName(row, C_LAST_UPDATE, S_C_LAST_UPDATE);
   }
 
@@ -218,6 +221,7 @@
     table.setWidget(row, C_OWNER, link(c.getOwner()));
     table.setWidget(row, C_PROJECT,
         new ProjectOpenLink(c.getProject().getKey()));
+    table.setText(row, C_BRANCH, c.getBranch());
     table.setText(row, C_LAST_UPDATE, mediumFormat(c.getLastUpdatedOn()));
     setRowItem(row, c);
   }

src/main/java/com/google/gerrit/client/data/ChangeInfo.java

diff --git a/src/main/java/com/google/gerrit/client/data/ChangeInfo.java b/src/main/java/com/google/gerrit/client/data/ChangeInfo.java
index ad0f7d1..9511e5b 100644
--- a/src/main/java/com/google/gerrit/client/data/ChangeInfo.java
+++ b/src/main/java/com/google/gerrit/client/data/ChangeInfo.java
@@ -25,6 +25,7 @@
   protected String subject;
   protected Change.Status status;
   protected ProjectInfo project;
+  protected String branch;
   protected boolean starred;
   protected Timestamp lastUpdatedOn;
   protected String sortKey;
@@ -38,6 +39,7 @@
     subject = c.getSubject();
     status = c.getStatus();
     project = new ProjectInfo(c.getDest().getParentKey());
+    branch = c.getDest().getShortName();
     lastUpdatedOn = c.getLastUpdatedOn();
     sortKey = c.getSortKey();
 
@@ -64,6 +66,10 @@
     return project;
   }
 
+  public String getBranch() {
+    return branch;
+  }
+
   public boolean isStarred() {
     return starred;
   }