summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-02 15:42:25 +0200
committerNoel Grandin <noel@peralex.com>2014-05-05 12:47:48 +0200
commit4f9b21248ffdf55cef9f3f9d1da76778ee000775 (patch)
treeb059d288339a68aa4c3901f1100e99b04d05a23d /scripting
parentb4107411900f5bb4c215e2d9db09fc2b2b82939b (diff)
simplify ternary conditions "xxx ? yyy : false"
Look for code like: xxx ? yyy : false; Which can be simplified to: xxx && yyy Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
Diffstat (limited to 'scripting')
-rw-r--r--scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java5
1 files changed, 2 insertions, 3 deletions
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);
}
}