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

6
gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityControl.java
View File

@@ -215,18 +215,16 @@ public class CapabilityControl {
if (batch) {
// If any of our groups matched to the BATCH queue, use it.
return QueueProvider.QueueType.BATCH;
} else {
return QueueProvider.QueueType.INTERACTIVE;
}
return QueueProvider.QueueType.INTERACTIVE;
}
/** True if the user has this permission. Works only for non labels. */
public boolean canPerform(String permissionName) {
if (GlobalCapability.ADMINISTRATE_SERVER.equals(permissionName)) {
return canAdministrateServer();
} else {
return !access(permissionName).isEmpty();
}
return !access(permissionName).isEmpty();
}
/** The range of permitted values associated with a label permission. */