opendev/gerrit
Code Issues Proposed changes

Remove duplicate MyGroupsListScreen

Browse Source 
This was identical in implementation to MyGroupsScreen,
but available at a different URL. Map both to the same
URL so the screen can reuse implementation and properly
fall into the "settings" split, avoiding this code from
being in the initial download.

Change-Id: I28d654930bef00348b6a9b6c7fa41e06ce464b46
This commit is contained in:
Shawn Pearce
2015-01-15 10:52:54 -08:00
parent 0ddfb83db9
commit 4d20e64b59
2 changed files with 9 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,6 @@ import com.google.gerrit.client.admin.AccountGroupScreen;
import com.google.gerrit.client.admin.CreateGroupScreen; import com.google.gerrit.client.admin.CreateGroupScreen;
import com.google.gerrit.client.admin.CreateProjectScreen; import com.google.gerrit.client.admin.CreateProjectScreen;
import com.google.gerrit.client.admin.GroupListScreen; import com.google.gerrit.client.admin.GroupListScreen;
import com.google.gerrit.client.admin.MyGroupsListScreen;
import com.google.gerrit.client.admin.PluginListScreen; import com.google.gerrit.client.admin.PluginListScreen;
import com.google.gerrit.client.admin.ProjectAccessScreen; import com.google.gerrit.client.admin.ProjectAccessScreen;
import com.google.gerrit.client.admin.ProjectBranchesScreen; import com.google.gerrit.client.admin.ProjectBranchesScreen;
@@ -225,21 +224,19 @@ public class Dispatcher {
} else if (matchPrefix(PROJECTS, token)) { } else if (matchPrefix(PROJECTS, token)) {
projects(token); projects(token);
} else if (matchExact(SETTINGS, token) // } else if (matchExact(SETTINGS, token)
|| matchPrefix("/settings/", token) // || matchPrefix("/settings/", token)
|| matchExact("register", token) // || matchExact(MY_GROUPS, token)
|| matchExact(REGISTER, token) // || matchExact("register", token)
|| matchPrefix("/register/", token) // || matchExact(REGISTER, token)
|| matchPrefix("/VE/", token) || matchPrefix("VE,", token) // || matchPrefix("/register/", token)
|| matchPrefix("/VE/", token) || matchPrefix("VE,", token)
|| matchPrefix("/SignInFailure,", token)) { || matchPrefix("/SignInFailure,", token)) {
settings(token); settings(token);
} else if (matchPrefix("/admin/", token)) { } else if (matchPrefix("/admin/", token)) {
admin(token); admin(token);
} else if (matchExact(MY_GROUPS, token)) {
Gerrit.display(token, new MyGroupsListScreen());
} else if (/* DEPRECATED URL */matchPrefix("/c2/", token)) { } else if (/* DEPRECATED URL */matchPrefix("/c2/", token)) {
change(token); change(token);
} else if (/* LEGACY URL */matchPrefix("all,", token)) { } else if (/* LEGACY URL */matchPrefix("all,", token)) {
@@ -683,7 +680,8 @@ public class Dispatcher {
return new MyPasswordScreen(); return new MyPasswordScreen();
} }
if (matchExact(SETTINGS_MYGROUPS, token)) { if (matchExact(MY_GROUPS, token)
|| matchExact(SETTINGS_MYGROUPS, token)) {
return new MyGroupsScreen(); return new MyGroupsScreen();
} }

41
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/MyGroupsListScreen.java
View File

@@ -1,41 +0,0 @@
// Copyright (C) 2014 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.client.admin;
import com.google.gerrit.client.groups.GroupList;
import com.google.gerrit.client.rpc.ScreenLoadCallback;
import com.google.gerrit.client.ui.AccountScreen;
public class MyGroupsListScreen extends AccountScreen {
private GroupTable groups;
@Override
protected void onInitUI() {
super.onInitUI();
groups = new GroupTable();
add(groups);
}
@Override
protected void onLoad() {
super.onLoad();
GroupList.my(new ScreenLoadCallback<GroupList>(this) {
@Override
protected void preDisplay(GroupList result) {
groups.display(result);
groups.finishDisplay();
}});
}
}