diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectAdminService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectAdminService.java index 355ab4aebb..b5a986f19b 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectAdminService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectAdminService.java @@ -29,10 +29,8 @@ import java.util.Set; @RpcImpl(version = Version.V2_0) public interface ProjectAdminService extends RemoteJsonService { - @SignInRequired void visibleProjects(AsyncCallback> callback); - @SignInRequired void projectDetail(Project.NameKey projectName, AsyncCallback callback); @@ -49,7 +47,6 @@ public interface ProjectAdminService extends RemoteJsonService { String groupName, String refName, short min, short max, AsyncCallback callback); - @SignInRequired void listBranches(Project.NameKey projectName, AsyncCallback callback); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java index 1d310c3e89..6be86572e4 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java @@ -17,7 +17,7 @@ package com.google.gerrit.client.admin; import com.google.gerrit.client.Dispatcher; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.rpc.ScreenLoadCallback; -import com.google.gerrit.client.ui.AccountScreen; +import com.google.gerrit.client.ui.Screen; import com.google.gerrit.common.data.ProjectDetail; import com.google.gerrit.reviewdb.Project; import com.google.gwt.event.logical.shared.SelectionEvent; @@ -28,7 +28,7 @@ import com.google.gwt.user.client.ui.TabPanel; import java.util.ArrayList; import java.util.List; -public class ProjectAdminScreen extends AccountScreen { +public class ProjectAdminScreen extends Screen { static final String INFO_TAB = "info"; static final String BRANCH_TAB = "branches"; static final String ACCESS_TAB = "access"; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java index 97f1224e7b..642712af75 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java @@ -17,9 +17,9 @@ package com.google.gerrit.client.admin; import com.google.gerrit.client.Dispatcher; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.rpc.ScreenLoadCallback; -import com.google.gerrit.client.ui.AccountScreen; import com.google.gerrit.client.ui.Hyperlink; import com.google.gerrit.client.ui.NavigationTable; +import com.google.gerrit.client.ui.Screen; import com.google.gerrit.client.ui.SmallHeading; import com.google.gerrit.common.PageLinks; import com.google.gerrit.reviewdb.Project; @@ -33,7 +33,7 @@ import com.google.gwt.user.client.ui.HTMLTable.Cell; import java.util.List; -public class ProjectListScreen extends AccountScreen { +public class ProjectListScreen extends Screen { private ProjectTable projects; @Override diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/VisibleProjects.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/VisibleProjects.java index 9d778f1bcf..2588350de1 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/VisibleProjects.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/VisibleProjects.java @@ -18,11 +18,12 @@ package com.google.gerrit.httpd.rpc.project; import com.google.gerrit.httpd.rpc.Handler; import com.google.gerrit.reviewdb.Project; import com.google.gerrit.reviewdb.ReviewDb; -import com.google.gerrit.server.IdentifiedUser; +import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -34,12 +35,12 @@ class VisibleProjects extends Handler> { } private final ProjectControl.Factory projectControlFactory; - private final IdentifiedUser user; + private final CurrentUser user; private final ReviewDb db; @Inject VisibleProjects(final ProjectControl.Factory projectControlFactory, - final IdentifiedUser user, final ReviewDb db) { + final CurrentUser user, final ReviewDb db) { this.projectControlFactory = projectControlFactory; this.user = user; this.db = db;