Simplify a few boolean expressions

concrain · Jul 7, 2015 · 6a361ee · 6a361ee
1 parent bd0e9a5
commit 6a361ee
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/...ain/groovy/org/jd/gui/service/preferencespanel/UISingleInstancePreferencesProvider.groovy b/...ain/groovy/org/jd/gui/service/preferencespanel/UISingleInstancePreferencesProvider.groovy
@@ -35,7 +35,7 @@ class UISingleInstancePreferencesProvider extends JPanel implements PreferencesP
     public void init(Color errorBackgroundColor) {}
 
     public boolean isActivated() {
-        System.getProperty('os.name').toLowerCase().contains('mac os') == false
+        !System.getProperty('os.name').toLowerCase().contains('mac os')
     }
 
     void loadPreferences(Map<String, String> preferences) {

diff --git a/app/src/main/groovy/org/jd/gui/service/preferencespanel/UITabsPreferencesProvider.groovy b/app/src/main/groovy/org/jd/gui/service/preferencespanel/UITabsPreferencesProvider.groovy
@@ -37,7 +37,7 @@ class UITabsPreferencesProvider extends JPanel implements PreferencesPanel {
     public void init(Color errorBackgroundColor) {}
 
     public boolean isActivated() {
-        System.getProperty('os.name').toLowerCase().contains('mac os') == false
+        !System.getProperty('os.name').toLowerCase().contains('mac os')
     }
 
     void loadPreferences(Map<String, String> preferences) {

diff --git a/services/src/main/groovy/org/jd/gui/service/treenode/DirectoryTreeNodeFactoryProvider.groovy b/services/src/main/groovy/org/jd/gui/service/treenode/DirectoryTreeNodeFactoryProvider.groovy
@@ -33,7 +33,7 @@ class DirectoryTreeNodeFactoryProvider extends AbstractTreeNodeFactoryProvider {
         // Aggregate directory names
         while (entries.size() == 1) {
             Entry child = entries[0]
-            if ((child.isDirectory() == false) || (api.getTreeNodeFactory(child) != this) || (entry.container != child.container)) break
+            if (!child.isDirectory() || api.getTreeNodeFactory(child) != this || entry.container != child.container) break
             entry = child
             entries = entry.children
         }
@@ -77,7 +77,9 @@ class DirectoryTreeNodeFactoryProvider extends AbstractTreeNodeFactoryProvider {
 
                 while (entries.size() == 1) {
                     Entry child = entries[0]
-                    if ((child.isDirectory() == false) || (api.getTreeNodeFactory(child) != this)) break
+                    if (!child.isDirectory() || api.getTreeNodeFactory(child) != this) {
+                        break
+                    }
                     entries = child.children
                 }
 

diff --git a/services/src/main/groovy/org/jd/gui/service/treenode/PackageTreeNodeFactoryProvider.groovy b/services/src/main/groovy/org/jd/gui/service/treenode/PackageTreeNodeFactoryProvider.groovy
@@ -30,7 +30,7 @@ class PackageTreeNodeFactoryProvider extends DirectoryTreeNodeFactoryProvider {
         // Aggregate directory names
         while (entries.size() == 1) {
             Container.Entry child = entries[0]
-            if ((child.isDirectory() == false) || (api.getTreeNodeFactory(child) != this) || (entry.container != child.container)) break
+            if (!child.isDirectory() || api.getTreeNodeFactory(child) != this || entry.container != child.container) break
             entry = child
             entries = entry.children
         }

diff --git a/services/src/main/groovy/org/jd/gui/view/component/AbstractTextPage.groovy b/services/src/main/groovy/org/jd/gui/view/component/AbstractTextPage.groovy
@@ -165,7 +165,7 @@ class AbstractTextPage extends JPanel implements LineNumberNavigable, ContentSea
             foldsExpanded |= fm.ensureOffsetNotInClosedFold(end)
         }
 
-        if (foldsExpanded == false) {
+        if (!foldsExpanded) {
             try {
                 Rectangle r = textArea.modelToView(start)
 

diff --git a/services/src/main/java/org/jd/gui/util/decompiler/ClassFileSourcePrinter.java b/services/src/main/java/org/jd/gui/util/decompiler/ClassFileSourcePrinter.java
@@ -154,7 +154,7 @@ public void startOfAnnotationName() {}
     public void endOfAnnotationName() {}
 
     public void startOfOptionalPrefix() {
-        if (isShowPrefixThis() == false)
+        if (!isShowPrefixThis())
             this.display = false;
     }
 

diff --git a/services/src/main/java/org/jd/gui/util/decompiler/PlainTextPrinter.java b/services/src/main/java/org/jd/gui/util/decompiler/PlainTextPrinter.java
@@ -223,7 +223,7 @@ public void startOfAnnotationName() {}
 	public void endOfAnnotationName() {}
 
 	public void startOfOptionalPrefix() {
-		if (this.preferences.isShowPrefixThis() == false)
+		if (!this.preferences.isShowPrefixThis())
 			this.display = false;
 	}
 

diff --git a/services/src/main/java/org/jd/gui/util/matcher/DescriptorMatcher.java b/services/src/main/java/org/jd/gui/util/matcher/DescriptorMatcher.java
@@ -53,7 +53,7 @@ public static boolean matchMethodDescriptors(String d1, String d2) {
 
         // Check parameter descriptors
         while (cb2.get() != ')') {
-            if (matchDescriptors(cb1, cb2) == false)
+            if (!matchDescriptors(cb1, cb2))
                 return false;
         }
 
@@ -138,7 +138,7 @@ public boolean compareTypeWith(CharBuffer other) {
                     int otherStart = other.offset;
 
                     // Search ';'
-                    if ((searchEndOfType() == false) || (other.searchEndOfType() == false))
+                    if (!searchEndOfType() || !other.searchEndOfType())
                         return false;
 
                     int current = offset - 1;