Browse Source

Simplify some conditionals

Change-Id: I13a00bf966dd5fb333dcdd408602a4b37385f27c
Reviewed-on: http://gerrit.dmdirc.com/3682
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
pull/1/head
Chris Smith 10 years ago
parent
commit
e412e0343a

+ 2
- 6
src/com/dmdirc/actions/wrappers/PerformWrapper.java View File

@@ -388,12 +388,8 @@ public class PerformWrapper extends ActionGroup {
388 388
                 return false;
389 389
             }
390 390
 
391
-            if ((this.profile == null) ? (other.profile != null)
392
-                    : !this.profile.equals(other.profile)) {
393
-                return false;
394
-            }
395
-
396
-            return true;
391
+            return !((this.profile == null) ? (other.profile != null)
392
+                    : !this.profile.equals(other.profile));
397 393
         }
398 394
 
399 395
         @Override

+ 1
- 4
src/com/dmdirc/config/CipherUtils.java View File

@@ -210,10 +210,7 @@ public abstract class CipherUtils {
210 210
                 }
211 211
             }
212 212
         }
213
-        if (tries == AUTH_TRIES) {
214
-            return false;
215
-        }
216
-        return true;
213
+        return tries != AUTH_TRIES;
217 214
     }
218 215
 
219 216
     /**

+ 1
- 5
src/com/dmdirc/logger/ProgramError.java View File

@@ -387,11 +387,7 @@ public final class ProgramError implements Serializable {
387 387
             return false;
388 388
         }
389 389
 
390
-        if (!Objects.equals(this.details, other.details)) {
391
-            return false;
392
-        }
393
-
394
-        return true;
390
+        return Objects.equals(this.details, other.details);
395 391
     }
396 392
 
397 393
     @Override

Loading…
Cancel
Save