opendev/gerrit
Code Issues Proposed changes

Move toProject into PageLinks for reuse

Browse Source 
This way its part of the common package and the server code
can reuse it to generate a link into a project.

Change-Id: Ia02adb4165e079aaf62be0c64126eeb6aa312762
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-01-14 18:15:30 -08:00
parent ac90f0abd3
commit c30f24210f
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java
View File

@@ -18,6 +18,8 @@ import com.google.gerrit.common.data.AccountInfo;
import com.google.gerrit.common.data.ChangeInfo;
import com.google.gerrit.reviewdb.Account;
import com.google.gerrit.reviewdb.Change;
import com.google.gerrit.reviewdb.Project;
import com.google.gerrit.reviewdb.Change.Status;
import com.google.gwtorm.client.KeyUtil;
public class PageLinks {
@@ -63,6 +65,21 @@ public class PageLinks {
return "q," + KeyUtil.encode(query) + "," + TOP;
}
public static String toProject(final Project.NameKey proj, Status status) {
switch (status) {
case ABANDONED:
return "project,abandoned," + proj.toString() + ",n,z";
case MERGED:
return "project,merged," + proj.toString() + ",n,z";
case NEW:
case SUBMITTED:
default:
return "project,open," + proj.toString() + ",n,z";
}
}
protected PageLinks() {
}
}

16
gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
View File

@@ -58,7 +58,6 @@ import com.google.gerrit.reviewdb.Change;
import com.google.gerrit.reviewdb.Patch;
import com.google.gerrit.reviewdb.PatchSet;
import com.google.gerrit.reviewdb.Project;
import com.google.gerrit.reviewdb.Change.Status;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
import com.google.gwtorm.client.KeyUtil;
@@ -84,21 +83,6 @@ public class Dispatcher {
return "admin,project," + n.toString() + "," + tab;
}
public static String toProject(final Project.NameKey proj, Status status) {
switch (status) {
case ABANDONED:
return "project,abandoned," + proj.toString() + ",n,z";
case MERGED:
return "project,merged," + proj.toString() + ",n,z";
case NEW:
case SUBMITTED:
default:
return "project,open," + proj.toString() + ",n,z";
}
}
void display(final String token) {
assert token != null;
try {

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectLink.java
View File

@@ -15,10 +15,10 @@
package com.google.gerrit.client.ui;
import com.google.gerrit.client.Gerrit;
import com.google.gerrit.client.Dispatcher;
import com.google.gerrit.client.changes.ByProjectAbandonedChangesScreen;
import com.google.gerrit.client.changes.ByProjectMergedChangesScreen;
import com.google.gerrit.client.changes.ByProjectOpenChangesScreen;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.reviewdb.Change;
import com.google.gerrit.reviewdb.Project;
import com.google.gerrit.reviewdb.Change.Status;
@@ -34,7 +34,7 @@ public class ProjectLink extends InlineHyperlink {
public ProjectLink(final String text, final Project.NameKey proj,
Change.Status stat) {
super(text, Dispatcher.toProject(proj, stat));
super(text, PageLinks.toProject(proj, stat));
status = stat;
project = proj;
}