From 4f9b21248ffdf55cef9f3f9d1da76778ee000775 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 2 May 2014 15:42:25 +0200
Subject: simplify ternary conditions "xxx ? yyy : false"

Look for code like:
   xxx ? yyy : false;
Which can be simplified to:
   xxx && yyy

Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
---
 .../netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'scripting')

diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
index 587ade36a4ba..fd3ee589eed5 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
@@ -553,7 +553,7 @@ System.out.println("    exception: " + ioe.getMessage());
         public boolean readOnly(String name) {
             synchronized(cache) {
                 Entry entry = (Entry)cache.get(zipName(name));
-                return (entry != null)? entry.isReadOnly(): false;
+                return entry && entry.isReadOnly();
             }
         }
 
@@ -805,8 +805,7 @@ System.out.println("    exception: " + ioe.getMessage());
         {
             // recognizes all entries in a subtree of the
             // 'scope' as editable entries
-            return (entry != null)?
-                entry.getName().startsWith(scope): false;
+            return entry && entry.getName().startsWith(scope);
         }
     }
 
-- 
cgit