Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2019-12-26 12:35:05 +0000
committerMichael Keppler2019-12-28 08:40:51 +0000
commit32d478d9c89f7ad230dd64ad4c2e594140ca176a (patch)
treebf032cd6dd9b699becca05e0854c8df9faa5aaa6 /org.eclipse.egit.ui.test
parent5faa290913b7fd297f6608e16be9a17c5830aa29 (diff)
downloadegit-32d478d9c89f7ad230dd64ad4c2e594140ca176a.tar.gz
egit-32d478d9c89f7ad230dd64ad4c2e594140ca176a.tar.xz
egit-32d478d9c89f7ad230dd64ad4c2e594140ca176a.zip
Enable and execute cleanup "Push down negations"
Push down negations to make reading of complex expressions with negations easier. Also enable the cleanup as a save action. There is a bug in the cleanup (not adding braces around instanceof expressions), but whenever that occurs, the developer can just add the braces manually, and the bug will not occur again for that location. Therefore that bug should not stop us from using the cleanup. Change-Id: I1a5026304b080b0ccebe06e6829857b784541f99 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui.test')
-rw-r--r--org.eclipse.egit.ui.test/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/decorators/TestDecoratableResource.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui.test/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.egit.ui.test/.settings/org.eclipse.jdt.ui.prefs
index 086d01c0aa..0f1ae3acf4 100644
--- a/org.eclipse.egit.ui.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.egit.ui.test/.settings/org.eclipse.jdt.ui.prefs
@@ -35,7 +35,7 @@ sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
-sp_cleanup.push_down_negation=false
+sp_cleanup.push_down_negation=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/decorators/TestDecoratableResource.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/decorators/TestDecoratableResource.java
index 06a19957fb..b208ec6c9d 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/decorators/TestDecoratableResource.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/decorators/TestDecoratableResource.java
@@ -92,17 +92,17 @@ public class TestDecoratableResource extends DecoratableResource {
return false;
IDecoratableResource decoratableResource = (IDecoratableResource) obj;
- if (!(decoratableResource.getType() == getType()))
+ if (decoratableResource.getType() != getType())
return false;
if (!decoratableResource.getName().equals(getName()))
return false;
- if (!(decoratableResource.isTracked() == isTracked()))
+ if (decoratableResource.isTracked() != isTracked())
return false;
- if (!(decoratableResource.isIgnored() == isIgnored()))
+ if (decoratableResource.isIgnored() != isIgnored())
return false;
- if (!(decoratableResource.isDirty() == isDirty()))
+ if (decoratableResource.isDirty() != isDirty())
return false;
- if (!(decoratableResource.hasConflicts() == hasConflicts()))
+ if (decoratableResource.hasConflicts() != hasConflicts())
return false;
if (!decoratableResource.getStagingState().equals(getStagingState()))
return false;

Back to the top