summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java10
-rw-r--r--qadevOOo/runner/graphical/ParameterHelper.java11
-rw-r--r--scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java5
-rw-r--r--scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java5
-rw-r--r--scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java5
-rw-r--r--scripting/workben/ifc/scripting/_XFunctionProvider.java5
-rw-r--r--scripting/workben/ifc/scripting/_XScriptInfoAccess.java15
-rw-r--r--scripting/workben/ifc/scripting/_XScriptInvocation.java5
-rw-r--r--scripting/workben/ifc/scripting/_XScriptNameResolver.java5
-rw-r--r--scripting/workben/ifc/scripting/_XScriptSecurity.java9
-rw-r--r--scripting/workben/installer/IdeVersion.java6
-rw-r--r--scripting/workben/installer/Version.java6
12 files changed, 16 insertions, 71 deletions
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
index 2e48cd99a010..f5b5872d0c65 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
@@ -80,17 +80,11 @@ class Proxy implements IQueryInterface, XEventListener
if (object instanceof IQueryInterface)
{
IQueryInterface iquery = (IQueryInterface) object;
- if (iquery.getOid().equals(oid))
- return true;
- else
- return false;
+ return (iquery.getOid().equals(oid));
}
String oidObj = UnoRuntime.generateOid(object);
- if (oidObj.equals(oid))
- return true;
- else
- return false;
+ return (oidObj.equals(oid));
}
public Object queryInterface(Type type) {
diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java
index 042b2ea8b137..ec7c4b3ed96e 100644
--- a/qadevOOo/runner/graphical/ParameterHelper.java
+++ b/qadevOOo/runner/graphical/ParameterHelper.java
@@ -244,15 +244,8 @@ public class ParameterHelper
String sOfficeViewable = (String)m_aCurrentParams.get(PropertyName.OFFICE_VIEWABLE);
if (sOfficeViewable != null)
{
- if (sOfficeViewable.toLowerCase().equals("yes") ||
- sOfficeViewable.toLowerCase().equals("true"))
- {
- return false; // setViewable();
- }
- else
- {
- return true; // setHidden();
- }
+ return !(sOfficeViewable.toLowerCase().equals("yes") ||
+ sOfficeViewable.toLowerCase().equals("true"));
}
return true; /* default: hidden */
}
diff --git a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
index 15f472188b80..a6969cdd89ef 100644
--- a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
@@ -182,10 +182,7 @@ public class ScriptPanel extends JPanel {
@Override
public boolean isCellEditable(int row, int col) {
- if (col == 0)
- return false;
- else
- return true;
+ return (col != 0);
}
@Override
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
index 2cfd316cddde..ab05d89d687d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
@@ -174,9 +174,6 @@ public class ParcelSupport implements ParcelCookie
message, NotifyDescriptor.OK_CANCEL_OPTION);
TopManager.getDefault().notify(d);
- if (d.getValue() == NotifyDescriptor.CANCEL_OPTION)
- return false;
- else
- return true;
+ return (d.getValue() != NotifyDescriptor.CANCEL_OPTION);
}
}
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
index 55b855ea77c0..c54833ba02bb 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
@@ -66,10 +66,7 @@ public class NagDialog {
public boolean show() {
TopManager.getDefault().notify(descriptor);
- if (descriptor.getValue() == NotifyDescriptor.OK_OPTION)
- return true;
- else
- return false;
+ return (descriptor.getValue() == NotifyDescriptor.OK_OPTION);
}
public boolean getState() {
diff --git a/scripting/workben/ifc/scripting/_XFunctionProvider.java b/scripting/workben/ifc/scripting/_XFunctionProvider.java
index 143e33febbd7..7a51288885e8 100644
--- a/scripting/workben/ifc/scripting/_XFunctionProvider.java
+++ b/scripting/workben/ifc/scripting/_XFunctionProvider.java
@@ -77,9 +77,6 @@ public class _XFunctionProvider extends MultiMethodTest {
output = "XFunction.class";
log.println("expected: " + expected + ", output: " + output);
- if (output.equals(expected))
- return true;
- else
- return false;
+ return (output.equals(expected));
}
}
diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
index b6107d3da7ef..18b8a41d4d0e 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
@@ -86,10 +86,7 @@ public class _XScriptInfoAccess extends MultiMethodTest {
}
log.println("expected: " + expected + ", output: " + output);
- if (output.equals(expected))
- return true;
- else
- return false;
+ return (output.equals(expected));
}
public void _getImplementations() {
@@ -143,10 +140,7 @@ public class _XScriptInfoAccess extends MultiMethodTest {
}
log.println("expected: " + expected + ", output: " + output);
- if (output.equals(expected))
- return true;
- else
- return false;
+ return (output.equals(expected));
}
public void _getAllImplementations() {
@@ -196,9 +190,6 @@ public class _XScriptInfoAccess extends MultiMethodTest {
}
log.println("expected: " + expected + ", output: " + output);
- if (output.equals(expected))
- return true;
- else
- return false;
+ return (output.equals(expected));
}
}
diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java
index e7c4e28acf46..a829fb553c67 100644
--- a/scripting/workben/ifc/scripting/_XScriptInvocation.java
+++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java
@@ -133,10 +133,7 @@ public class _XScriptInvocation extends MultiMethodTest {
ctx.dispose();
log.println("expected: " + expected + ", output: " + output);
- if (output.equals(expected))
- return true;
- else
- return false;
+ return (output.equals(expected));
}
private int getStorageId(String location) {
diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
index 77385d28a3be..b2f264d1e4b1 100644
--- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java
+++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
@@ -112,10 +112,7 @@ public class _XScriptNameResolver extends MultiMethodTest {
}
log.println("expected: " + expected + ", output: " + output);
- if (output.equals(expected))
- return true;
- else
- return false;
+ return (output.equals(expected));
}
private int getStorageId(String location) {
diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java
index 7791aa92a13e..cd3b65668f7f 100644
--- a/scripting/workben/ifc/scripting/_XScriptSecurity.java
+++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java
@@ -181,14 +181,7 @@ public class _XScriptSecurity extends MultiMethodTest {
expectedPath = uri.substring(0, uri.lastIndexOf('/'));
}
log.println("pathlist: expected: " + expectedPath + ", output: " + setPath);
- if( setPath.equals( expectedPath ) )
- {
- return true;
- }
- else
- {
- return false;
- }
+ return setPath.equals( expectedPath );
}
return true;
}
diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java
index b75d5b38a04e..ab50752e2cd4 100644
--- a/scripting/workben/installer/IdeVersion.java
+++ b/scripting/workben/installer/IdeVersion.java
@@ -299,11 +299,7 @@ class MyTableModelIDE extends AbstractTableModel {
@Override
public boolean isCellEditable(int row, int col) {
- if (col == 0) {
- return true;
- } else {
- return false;
- }
+ return (col == 0);
}
@Override
diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java
index 4d125dee8fe6..2540f62f3dd6 100644
--- a/scripting/workben/installer/Version.java
+++ b/scripting/workben/installer/Version.java
@@ -314,11 +314,7 @@ class MyTableModel extends AbstractTableModel {
@Override
public boolean isCellEditable(int row, int col) {
- if (col == 0) {
- return true;
- } else {
- return false;
- }
+ return (col == 0);
}
@Override