Remove redundant 'Prev' and 'Next' string constants

The 'Prev' and 'Next' strings used in paginated lists of groups
and projects are the same, but are defined in separate constants.

Replace them with constants that are used by both.

Change-Id: I88e6bc0a9553c871eac408aca216dd223217fa28
This commit is contained in:
David Pursehouse
2014-08-20 12:02:49 +09:00
parent 709a173fb2
commit b94f9abe9e
4 changed files with 8 additions and 14 deletions

View File

@@ -135,9 +135,6 @@ public interface AdminConstants extends Constants {
String sectionTypeSection(); String sectionTypeSection();
Map<String, String> sectionNames(); Map<String, String> sectionNames();
String pagedProjectListPrev(); String pagedListPrev();
String pagedProjectListNext(); String pagedListNext();
String pagedGroupListPrev();
String pagedGroupListNext();
} }

View File

@@ -99,11 +99,8 @@ noGroupSelected = (No group selected)
errorNoMatchingGroups = No Matching Groups errorNoMatchingGroups = No Matching Groups
errorNoGitRepository = No Git Repository errorNoGitRepository = No Git Repository
pagedProjectListPrev = &#x21e6;Prev pagedListPrev = &#x21e6;Prev
pagedProjectListNext = Next&#x21e8; pagedListNext = Next&#x21e8;
pagedGroupListPrev = &#x21e6;Prev
pagedGroupListNext = Next&#x21e8;
addPermission = Add Permission ... addPermission = Add Permission ...

View File

@@ -148,10 +148,10 @@ public class GroupListScreen extends AccountScreen implements FilteredUserInterf
setPageTitle(Util.C.groupListTitle()); setPageTitle(Util.C.groupListTitle());
initPageHeader(); initPageHeader();
prev = new Hyperlink(Util.C.pagedGroupListPrev(), true, ""); prev = new Hyperlink(Util.C.pagedListPrev(), true, "");
prev.setVisible(false); prev.setVisible(false);
next = new Hyperlink(Util.C.pagedGroupListNext(), true, ""); next = new Hyperlink(Util.C.pagedListNext(), true, "");
next.setVisible(false); next.setVisible(false);
groups = new GroupTable(PageLinks.ADMIN_GROUPS); groups = new GroupTable(PageLinks.ADMIN_GROUPS);

View File

@@ -161,10 +161,10 @@ public class ProjectListScreen extends Screen implements FilteredUserInterface {
setPageTitle(Util.C.projectListTitle()); setPageTitle(Util.C.projectListTitle());
initPageHeader(); initPageHeader();
prev = new Hyperlink(Util.C.pagedProjectListPrev(), true, ""); prev = new Hyperlink(Util.C.pagedListPrev(), true, "");
prev.setVisible(false); prev.setVisible(false);
next = new Hyperlink(Util.C.pagedProjectListNext(), true, ""); next = new Hyperlink(Util.C.pagedListNext(), true, "");
next.setVisible(false); next.setVisible(false);
projects = new ProjectsTable() { projects = new ProjectsTable() {