opendev/gerrit
Code Issues Proposed changes

Enable and fix 'Statement unnecessarily nested within else clause' warnings

Browse Source 
Change-Id: Ida6df4593fc2ab3c11581309b2b4a638229ea093
This commit is contained in:
David Pursehouse
2016-06-01 21:20:02 +09:00
parent b88b47d4b1
commit 323247227d
132 changed files with 542 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gerrit-server/src/main/java/com/google/gerrit/server/config/ListTasks.java
View File

@@ -64,25 +64,24 @@ public class ListTasks implements RestReadView<ConfigResource> {
List<TaskInfo> allTasks = getTasks();
if (user.getCapabilities().canViewQueue()) {
return allTasks;
} else {
Map<String, Boolean> visibilityCache = new HashMap<>();
}
Map<String, Boolean> visibilityCache = new HashMap<>();
List<TaskInfo> visibleTasks = new ArrayList<>();
for (TaskInfo task : allTasks) {
if (task.projectName != null) {
Boolean visible = visibilityCache.get(task.projectName);
if (visible == null) {
ProjectState e = projectCache.get(new Project.NameKey(task.projectName));
visible = e != null ? e.controlFor(user).isVisible() : false;
visibilityCache.put(task.projectName, visible);
}
if (visible) {
visibleTasks.add(task);
}
List<TaskInfo> visibleTasks = new ArrayList<>();
for (TaskInfo task : allTasks) {
if (task.projectName != null) {
Boolean visible = visibilityCache.get(task.projectName);
if (visible == null) {
ProjectState e = projectCache.get(new Project.NameKey(task.projectName));
visible = e != null ? e.controlFor(user).isVisible() : false;
visibilityCache.put(task.projectName, visible);
}
if (visible) {
visibleTasks.add(task);
}
}
return visibleTasks;
}
return visibleTasks;
}
private List<TaskInfo> getTasks() {