diff options
| author | Thomas Wolf | 2019-03-24 15:20:51 +0000 |
|---|---|---|
| committer | Thomas Wolf | 2019-03-24 15:20:51 +0000 |
| commit | 3000aee9af8f207e7304259bba4b8ba422aeb981 (patch) | |
| tree | ceb013947119660118ec914d6e838f3117259627 /org.eclipse.egit.ui/src/org/eclipse/egit/ui | |
| parent | 45c1839348e50f1835a3f76e306af8d1a190d617 (diff) | |
| download | egit-3000aee9af8f207e7304259bba4b8ba422aeb981.tar.gz egit-3000aee9af8f207e7304259bba4b8ba422aeb981.tar.xz egit-3000aee9af8f207e7304259bba4b8ba422aeb981.zip | |
Add missing braces in RepositoriesViewPropertyTester
Change-Id: Idaf6cf896fbe2067c6f6cb334450eaa8e43acbcb
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java index ab8352a76e..3a124bbf46 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java @@ -46,11 +46,12 @@ public class RepositoriesViewPropertyTester extends AbstractPropertyTester { } boolean value = internalTest(node, repository, property); boolean trace = GitTraceLocation.PROPERTIESTESTER.isActive(); - if (trace) + if (trace) { GitTraceLocation .getTrace() .trace(GitTraceLocation.PROPERTIESTESTER.getLocation(), "prop " + property + " of " + receiver + " = " + value + ", expected = " + expectedValue); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } return computeResult(expectedValue, value); } @@ -81,14 +82,16 @@ public class RepositoriesViewPropertyTester extends AbstractPropertyTester { return false; } } - if (!(node.getObject() instanceof Ref)) + if (!(node.getObject() instanceof Ref)) { return false; + } Ref ref = (Ref) node.getObject(); return isRefCheckedOut(repository, ref); } if (property.equals("isLocalBranch")) { //$NON-NLS-1$ - if (!(node.getObject() instanceof Ref)) + if (!(node.getObject() instanceof Ref)) { return false; + } Ref ref = (Ref) node.getObject(); return ref.getName().startsWith(Constants.R_HEADS); } @@ -129,12 +132,14 @@ public class RepositoriesViewPropertyTester extends AbstractPropertyTester { return repository.getRepositoryState().canCommit(); } if (property.equals("canMerge")) { //$NON-NLS-1$ - if (repository.getRepositoryState() != RepositoryState.SAFE) + if (repository.getRepositoryState() != RepositoryState.SAFE) { return false; + } try { String branch = repository.getFullBranch(); - if (branch == null) + if (branch == null) { return false; // fail gracefully... + } return branch.startsWith(Constants.R_HEADS); } catch (IOException e) { return false; |