opendev/gerrit
Code Issues Proposed changes

Simplify conditions with && and ||

Browse Source 
Change-Id: I77fb945cdf6b18baec064d1ac4b6002ef02e437a
This commit is contained in:
alex.ryazantsev
2013-11-18 00:50:00 +04:00
parent fc798093b8
commit 84001777ed
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java
View File

@@ -312,7 +312,7 @@ public class ProjectAccessScreen extends ProjectScreen {
private void enable(boolean enabled) { private void enable(boolean enabled) {
commitMessage.setEnabled(enabled); commitMessage.setEnabled(enabled);
commit.setEnabled(enabled ? !access.getOwnerOf().isEmpty() : false); commit.setEnabled(enabled && !access.getOwnerOf().isEmpty());
review.setEnabled(enabled ? access.canUpload() : false); review.setEnabled(enabled ? access.canUpload() : false);
cancel1.setEnabled(enabled); cancel1.setEnabled(enabled);
cancel2.setEnabled(enabled); cancel2.setEnabled(enabled);

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java
View File

@@ -190,6 +190,6 @@ public class Section {
if (a == null && b == null) { if (a == null && b == null) {
return true; return true;
} }
return a != null ? a.equals(b) : false; return a != null && a.equals(b);
} }
} }

2
gerrit-server/src/main/java/com/google/gerrit/server/mail/ProjectWatch.java
View File

@@ -210,6 +210,6 @@ public class ProjectWatch {
p = Predicate.and(filterPredicate, p); p = Predicate.and(filterPredicate, p);
} }
} }
return p == null ? true : p.match(changeData); return p == null || p.match(changeData);
} }
} }

2
gerrit-server/src/main/java/com/google/gerrit/server/project/RefPatternMatcher.java
View File

@@ -112,7 +112,7 @@ abstract class RefPatternMatcher {
RefPatternMatcher next = RefPatternMatcher next =
getMatcher(template.replace(Collections.singletonMap("username", u))); getMatcher(template.replace(Collections.singletonMap("username", u)));
return next != null ? next.match(ref, username) : false; return next != null && next.match(ref, username);
} }
boolean matchPrefix(String ref) { boolean matchPrefix(String ref) {