Move toProject into PageLinks for reuse
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:
		@@ -18,6 +18,8 @@ import com.google.gerrit.common.data.AccountInfo;
 | 
				
			|||||||
import com.google.gerrit.common.data.ChangeInfo;
 | 
					import com.google.gerrit.common.data.ChangeInfo;
 | 
				
			||||||
import com.google.gerrit.reviewdb.Account;
 | 
					import com.google.gerrit.reviewdb.Account;
 | 
				
			||||||
import com.google.gerrit.reviewdb.Change;
 | 
					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;
 | 
					import com.google.gwtorm.client.KeyUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class PageLinks {
 | 
					public class PageLinks {
 | 
				
			||||||
@@ -63,6 +65,21 @@ public class PageLinks {
 | 
				
			|||||||
    return "q," + KeyUtil.encode(query) + "," + TOP;
 | 
					    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() {
 | 
					  protected PageLinks() {
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -58,7 +58,6 @@ import com.google.gerrit.reviewdb.Change;
 | 
				
			|||||||
import com.google.gerrit.reviewdb.Patch;
 | 
					import com.google.gerrit.reviewdb.Patch;
 | 
				
			||||||
import com.google.gerrit.reviewdb.PatchSet;
 | 
					import com.google.gerrit.reviewdb.PatchSet;
 | 
				
			||||||
import com.google.gerrit.reviewdb.Project;
 | 
					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.GWT;
 | 
				
			||||||
import com.google.gwt.core.client.RunAsyncCallback;
 | 
					import com.google.gwt.core.client.RunAsyncCallback;
 | 
				
			||||||
import com.google.gwtorm.client.KeyUtil;
 | 
					import com.google.gwtorm.client.KeyUtil;
 | 
				
			||||||
@@ -84,21 +83,6 @@ public class Dispatcher {
 | 
				
			|||||||
    return "admin,project," + n.toString() + "," + tab;
 | 
					    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) {
 | 
					  void display(final String token) {
 | 
				
			||||||
    assert token != null;
 | 
					    assert token != null;
 | 
				
			||||||
    try {
 | 
					    try {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,10 +15,10 @@
 | 
				
			|||||||
package com.google.gerrit.client.ui;
 | 
					package com.google.gerrit.client.ui;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.google.gerrit.client.Gerrit;
 | 
					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.ByProjectAbandonedChangesScreen;
 | 
				
			||||||
import com.google.gerrit.client.changes.ByProjectMergedChangesScreen;
 | 
					import com.google.gerrit.client.changes.ByProjectMergedChangesScreen;
 | 
				
			||||||
import com.google.gerrit.client.changes.ByProjectOpenChangesScreen;
 | 
					import com.google.gerrit.client.changes.ByProjectOpenChangesScreen;
 | 
				
			||||||
 | 
					import com.google.gerrit.common.PageLinks;
 | 
				
			||||||
import com.google.gerrit.reviewdb.Change;
 | 
					import com.google.gerrit.reviewdb.Change;
 | 
				
			||||||
import com.google.gerrit.reviewdb.Project;
 | 
					import com.google.gerrit.reviewdb.Project;
 | 
				
			||||||
import com.google.gerrit.reviewdb.Change.Status;
 | 
					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,
 | 
					  public ProjectLink(final String text, final Project.NameKey proj,
 | 
				
			||||||
      Change.Status stat) {
 | 
					      Change.Status stat) {
 | 
				
			||||||
    super(text, Dispatcher.toProject(proj, stat));
 | 
					    super(text, PageLinks.toProject(proj, stat));
 | 
				
			||||||
    status = stat;
 | 
					    status = stat;
 | 
				
			||||||
    project = proj;
 | 
					    project = proj;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user