Skip to content

Commit 4266a9a

Browse files
tulinkryVladimir Kotal
authored andcommitted
refactoring the private variables of project helper to be more readable (#1594)
fixes #1567
1 parent a99d1bb commit 4266a9a

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/org/opensolaris/opengrok/web/ProjectHelper.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,25 @@ public final class ProjectHelper {
6363
/**
6464
* Set of projects (not repositories) without group
6565
*/
66-
private final Set<Project> projects;
66+
private final Set<Project> ungroupedProjects;
6767
/**
6868
* Set of all repositories without group
6969
*/
70-
private final Set<Project> repositories;
70+
private final Set<Project> ungroupedRepositories;
7171
/**
7272
* Set of all projects with group
7373
*/
74-
private final Set<Project> all_projects = new TreeSet<>();
74+
private final Set<Project> allProjects = new TreeSet<>();
7575
/**
7676
* Set of all repositories with group
7777
*/
78-
private final Set<Project> all_repositories = new TreeSet<>();
78+
private final Set<Project> allRepositories = new TreeSet<>();
7979

8080
private ProjectHelper(PageConfig cfg) {
8181
this.cfg = cfg;
8282
groups = new TreeSet<>(cfg.getEnv().getGroups());
83-
projects = new TreeSet<>();
84-
repositories = new TreeSet<>();
83+
ungroupedProjects = new TreeSet<>();
84+
ungroupedRepositories = new TreeSet<>();
8585

8686
populateGroups();
8787
}
@@ -139,17 +139,17 @@ public boolean test(Group g) {
139139
// if no group matches the project, add it to not-grouped projects
140140
if (copy.isEmpty()) {
141141
if (cfg.getEnv().getProjectRepositoriesMap().get(project) == null) {
142-
projects.add(project);
142+
ungroupedProjects.add(project);
143143
} else {
144-
repositories.add(project);
144+
ungroupedRepositories.add(project);
145145
}
146146
}
147147
}
148148

149149
// populate all grouped
150150
for (Group g : getGroups()) {
151-
all_projects.addAll(g.getProjects());
152-
all_repositories.addAll(g.getRepositories());
151+
allProjects.addAll(g.getProjects());
152+
allRepositories.addAll(g.getRepositories());
153153
}
154154
}
155155

@@ -232,14 +232,14 @@ public Set<Group> getGroups() {
232232
* @return filtered ungrouped projects
233233
*/
234234
public Set<Project> getProjects() {
235-
return cacheProjects(PROJECT_HELPER_UNGROUPED_PROJECTS, projects);
235+
return cacheProjects(PROJECT_HELPER_UNGROUPED_PROJECTS, ungroupedProjects);
236236
}
237237

238238
/**
239239
* @return filtered ungrouped repositories
240240
*/
241241
public Set<Project> getRepositories() {
242-
return cacheProjects(PROJECT_HELPER_UNGROUPED_REPOSITORIES, repositories);
242+
return cacheProjects(PROJECT_HELPER_UNGROUPED_REPOSITORIES, ungroupedRepositories);
243243
}
244244

245245
/**
@@ -268,30 +268,30 @@ public Set<Project> getRepositories(Group g) {
268268
* @return filtered grouped projects
269269
*/
270270
public Set<Project> getGroupedProjects() {
271-
return cacheProjects(PROJECT_HELPER_GROUPED_PROJECTS, all_projects);
271+
return cacheProjects(PROJECT_HELPER_GROUPED_PROJECTS, allProjects);
272272
}
273273

274274
/**
275275
* @return filtered grouped repositories
276276
*/
277277
public Set<Project> getGroupedRepositories() {
278-
return cacheProjects(PROJECT_HELPER_GROUPED_REPOSITORIES, all_repositories);
278+
return cacheProjects(PROJECT_HELPER_GROUPED_REPOSITORIES, allRepositories);
279279
}
280280

281281
/**
282282
* @see #getProjects()
283283
* @return filtered ungrouped projects
284284
*/
285285
public Set<Project> getUngroupedProjects() {
286-
return cacheProjects(PROJECT_HELPER_UNGROUPED_PROJECTS, projects);
286+
return cacheProjects(PROJECT_HELPER_UNGROUPED_PROJECTS, ungroupedProjects);
287287
}
288288

289289
/**
290290
* @see #getRepositories()
291291
* @return filtered ungrouped projects
292292
*/
293293
public Set<Project> getUngroupedRepositories() {
294-
return cacheProjects(PROJECT_HELPER_UNGROUPED_REPOSITORIES, repositories);
294+
return cacheProjects(PROJECT_HELPER_UNGROUPED_REPOSITORIES, ungroupedRepositories);
295295
}
296296

297297
/**

0 commit comments

Comments
 (0)