[Libreoffice-commits] core.git: 8 commits - android/experimental bean/com bean/qa codemaker/test comphelper/qa connectivity/qa dbaccess/qa filter/qa forms/qa framework/qa javaunohelper/com javaunohelper/test jvmfwk/plugins odk/examples odk/source qadevOOo/runner qadevOOo/tests reportbuilder/java sc/qa scripting/examples scripting/java scripting/workben sfx2/qa sw/qa toolkit/qa toolkit/test wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Wed Aug 20 01:38:26 PDT 2014
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java | 2
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java | 1
bean/com/sun/star/beans/LocalOfficeConnection.java | 3 -
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 5 -
bean/com/sun/star/comp/beans/OOoBean.java | 4 -
bean/qa/complex/bean/WriterFrame.java | 2
codemaker/test/javamaker/Test.java | 12 ++--
comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java | 2
connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java | 2
dbaccess/qa/complex/dbaccess/RowSet.java | 6 +-
filter/qa/complex/filter/detection/typeDetection/Helper.java | 6 +-
forms/qa/integration/forms/BooleanValidator.java | 4 -
framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java | 8 +-
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java | 4 -
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java | 6 +-
javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 12 +---
javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java | 2
javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java | 4 -
javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java | 6 +-
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java | 14 ++---
javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java | 12 ++--
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 28 +++++-----
javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java | 12 +---
javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java | 8 +-
jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java | 2
odk/examples/DevelopersGuide/Drawing/PresentationDemo.java | 2
odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java | 4 -
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java | 4 -
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java | 4 -
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java | 16 ++---
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java | 16 ++---
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java | 10 +--
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java | 10 +--
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java | 2
odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java | 6 +-
odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java | 2
odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java | 4 -
odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java | 2
odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java | 1
odk/source/com/sun/star/lib/loader/InstallationFinder.java | 2
qadevOOo/runner/convwatch/ConvWatch.java | 6 +-
qadevOOo/runner/convwatch/ConvWatchStarter.java | 2
qadevOOo/runner/convwatch/DirectoryHelper.java | 2
qadevOOo/runner/convwatch/DocumentConverter.java | 2
qadevOOo/runner/convwatch/FileHelper.java | 2
qadevOOo/runner/convwatch/GraphicalTestArguments.java | 2
qadevOOo/runner/convwatch/MSOfficePrint.java | 12 ++--
qadevOOo/runner/convwatch/OfficePrint.java | 12 ++--
qadevOOo/runner/convwatch/PRNCompare.java | 8 +-
qadevOOo/runner/convwatch/ReferenceBuilder.java | 4 -
qadevOOo/runner/graphical/DirectoryHelper.java | 2
qadevOOo/runner/graphical/FileHelper.java | 2
qadevOOo/runner/graphical/IniFile.java | 8 +-
qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 8 +-
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 4 -
qadevOOo/runner/graphical/ParameterHelper.java | 13 +---
qadevOOo/runner/helper/OfficeProvider.java | 2
qadevOOo/runner/helper/ProcessHandler.java | 2
qadevOOo/runner/helper/URLHelper.java | 4 -
qadevOOo/runner/util/RegistryTools.java | 4 -
qadevOOo/runner/util/utils.java | 1
qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java | 4 -
qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java | 1
qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java | 2
qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java | 3 -
qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java | 2
qadevOOo/tests/java/ifc/beans/_XPropertySet.java | 20 -------
qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java | 2
qadevOOo/tests/java/ifc/container/_XEnumeration.java | 4 -
qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java | 1
qadevOOo/tests/java/ifc/container/_XNameAccess.java | 6 --
qadevOOo/tests/java/ifc/container/_XNameContainer.java | 2
qadevOOo/tests/java/ifc/form/_XReset.java | 3 -
qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java | 2
qadevOOo/tests/java/ifc/frame/_XComponentLoader.java | 1
qadevOOo/tests/java/ifc/frame/_XDispatch.java | 2
qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java | 1
qadevOOo/tests/java/ifc/lang/_XComponent.java | 2
qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java | 2
qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java | 2
qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java | 1
qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java | 2
reportbuilder/java/org/libreoffice/report/SOImageService.java | 4 -
sc/qa/complex/cellRanges/CheckXCellRangesQuery.java | 4 -
scripting/examples/java/Highlight/HighlightText.java | 6 --
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java | 2
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 4 -
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java | 2
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java | 2
scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java | 10 +--
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 2
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java | 2
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java | 14 +----
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java | 12 +---
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 2
scripting/java/org/openoffice/idesupport/CommandLineTools.java | 12 ++--
scripting/java/org/openoffice/idesupport/ExtensionFinder.java | 4 -
scripting/java/org/openoffice/idesupport/JavaFinder.java | 6 +-
scripting/java/org/openoffice/idesupport/SVersionRCFile.java | 8 +-
scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java | 5 -
scripting/java/org/openoffice/idesupport/xml/Manifest.java | 2
scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java | 14 +----
scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java | 2
scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java | 10 +--
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java | 2
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java | 15 ++---
scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java | 25 ++++----
scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java | 2
scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java | 4 -
scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java | 2
scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java | 4 -
scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java | 2
scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java | 8 +-
scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java | 4 -
scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java | 7 --
scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java | 5 -
scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java | 2
scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java | 10 +--
scripting/workben/ifc/scripting/ScriptingUtils.java | 10 +--
scripting/workben/ifc/scripting/_XFunctionProvider.java | 5 -
scripting/workben/ifc/scripting/_XScriptInfoAccess.java | 15 +----
scripting/workben/ifc/scripting/_XScriptInvocation.java | 5 -
scripting/workben/ifc/scripting/_XScriptNameResolver.java | 5 -
scripting/workben/ifc/scripting/_XScriptSecurity.java | 9 ---
scripting/workben/installer/IdeUpdater.java | 2
scripting/workben/installer/IdeVersion.java | 10 +--
scripting/workben/installer/InstUtil.java | 2
scripting/workben/installer/Version.java | 10 +--
scripting/workben/installer/ZipData.java | 2
sfx2/qa/complex/sfx2/tools/WriterHelper.java | 6 +-
sw/qa/complex/writer/CheckBookmarks.java | 4 -
toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java | 4 -
toolkit/qa/complex/toolkit/Assert.java | 2
toolkit/test/accessibility/AccessibleTextHandler.java | 6 +-
toolkit/test/accessibility/TextLogger.java | 6 --
wizards/com/sun/star/wizards/report/ReportLayouter.java | 10 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java | 4 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java | 3 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java | 4 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java | 8 +-
144 files changed, 306 insertions(+), 474 deletions(-)
New commits:
commit 3f210b0e75ba338306f3ddb7f237db5ddb2c8f2d
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 13 10:58:21 2014 +0200
java: remove unnecessary return statements
found by PMD
Change-Id: I3d150421948d17eaed34fac2b1a212da34288d1a
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index 6c34eaf..2b64514 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -956,7 +956,6 @@ public class DocumentLoader
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
outToLeft.setDuration(500);
viewFlipper.setOutAnimation(outToLeft);
- return;
}
private void setAnimationInFromLeft(){
@@ -969,7 +968,6 @@ public class DocumentLoader
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
outToRight.setDuration(500);
viewFlipper.setOutAnimation(outToRight);
- return;
}
private PageViewer fetch( int page ){
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index f573eb7..c36c0b6 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -387,7 +387,6 @@ public class LibreOfficeUIActivity extends SherlockActivity implements ActionBar
break;
}
this.onResume();
- return;
}
public void readPreferences(){
diff --git a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
index ab37ad9..9d48f8e 100644
--- a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
+++ b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
@@ -132,7 +132,7 @@ public class SequenceOutputStreamUnitTest /* extends ComplexTestCase*/ {
m_aTestHelper.Error ( "Exception: " + e );
return /* false */;
}
- return /* true */;
+ // return /* true */;
}
private static XMultiServiceFactory getMSF()
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java
index fda7862..89d08bb 100644
--- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java
+++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java
@@ -362,7 +362,6 @@ public final class OwnEmbeddedObject extends WeakBase
public void reload(com.sun.star.beans.PropertyValue[] aMediaArgs, com.sun.star.beans.PropertyValue[] aObjectArgs) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.embed.WrongStateException, com.sun.star.io.IOException, com.sun.star.uno.Exception
{
// not implemented currently
- return;
}
// com.sun.star.embed.XEmbedPersist:
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index e06664a..6ccc181 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -211,7 +211,6 @@ public class utils {
//create the directory
new_dir.mkdirs();
}
- return;
}
diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
index 94ee214..564f5f1 100644
--- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
@@ -150,7 +150,6 @@ public class _XFastPropertySet extends MultiMethodTest {
e.printStackTrace(log);
tRes.tested("getFastPropertyValue()",false);
}
- return;
}
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
index a47758a..1ea2fab 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
@@ -334,8 +334,6 @@ public class _XMultiPropertySet extends MultiMethodTest {
testPropsNames = new String[nr];
for (int i=0; i<nr; i++) testPropsNames[i] = ST.nextToken();
testPropsAmount = nr;
- return;
-
}
/**
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
index bfffa27..9650133 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
@@ -89,7 +89,6 @@ public class _XPropertyAccess extends MultiMethodTest {
}
tRes.tested("getPropertyValues()", ok );
- return;
}
/**
@@ -219,8 +218,6 @@ public class _XPropertyAccess extends MultiMethodTest {
}
tRes.tested("setPropertyValues()", ok);
- return;
-
}
} /// finish class XPropertyAccess
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
index 53274d1..e60b257 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
@@ -211,7 +211,6 @@ public class _XPropertyContainer extends MultiMethodTest {
ok &= test;
tRes.tested("addProperty()", ok );
- return;
}
/**
@@ -294,7 +293,6 @@ public class _XPropertyContainer extends MultiMethodTest {
}
tRes.tested("removeProperty()", ok );
- return;
}
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
index 17ab690..630983c 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
@@ -133,9 +133,6 @@ public class _XPropertySet extends MultiMethodTest {
tRes.tested("getPropertySetInfo()", true );
getPropsToTest(propertySetInfo);
}
-
- return;
-
} // end of getPropertySetInfo()
/**
@@ -194,9 +191,6 @@ public class _XPropertySet extends MultiMethodTest {
}
tRes.tested("addPropertyChangeListener()", !error);
}
-
- return;
-
} // end of addPropertyChangeListener()
/**
@@ -254,9 +248,6 @@ public class _XPropertySet extends MultiMethodTest {
}
tRes.tested("addVetoableChangeListener()",!error);
}
-
- return;
-
} // end of addVetoableChangeListener()
@@ -322,9 +313,6 @@ public class _XPropertySet extends MultiMethodTest {
}
tRes.tested("setPropertyValue()",!error);
} //endif
-
- return;
-
} // end of setPropertyValue()
/**
@@ -390,8 +378,6 @@ public class _XPropertySet extends MultiMethodTest {
}
tRes.tested("getPropertyValue()", !error) ;
}
-
- return;
}
/**
@@ -464,9 +450,6 @@ public class _XPropertySet extends MultiMethodTest {
}
tRes.tested("removePropertyChangeListener()",!error);
}
-
- return;
-
} // end of removePropertyChangeListener()
@@ -539,9 +522,6 @@ public class _XPropertySet extends MultiMethodTest {
}
tRes.tested("removeVetoableChangeListener()",!error);
}
-
- return;
-
} // end of removeVetoableChangeListener()
/**
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java b/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java
index fd47b8b..dc6ad36 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java
@@ -49,7 +49,6 @@ public class _XPropertySetInfo extends MultiMethodTest {
Property[] properties = oObj.getProperties();
IsThere = properties[0];
tRes.tested("getProperties()", ( properties != null ));
- return;
}
/**
@@ -88,7 +87,6 @@ public class _XPropertySetInfo extends MultiMethodTest {
result = true;
}
tRes.tested("getPropertyByName()", result);
- return;
}
/**
diff --git a/qadevOOo/tests/java/ifc/container/_XEnumeration.java b/qadevOOo/tests/java/ifc/container/_XEnumeration.java
index a0b44df..dfa2d52 100644
--- a/qadevOOo/tests/java/ifc/container/_XEnumeration.java
+++ b/qadevOOo/tests/java/ifc/container/_XEnumeration.java
@@ -89,7 +89,6 @@ public class _XEnumeration extends MultiMethodTest {
result &= locResult;
}
tRes.tested("hasMoreElements()", result);
- return;
} // end hasMoreElements
/**
@@ -119,9 +118,6 @@ public class _XEnumeration extends MultiMethodTest {
}
tRes.tested("nextElement()", result);
-
- return;
-
} // end NextElement
} //end XEnumeration
diff --git a/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java b/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java
index a676aca..d5d1573 100644
--- a/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java
+++ b/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java
@@ -40,7 +40,6 @@ public class _XEnumerationAccess extends MultiMethodTest{
log.println( "createing Enumeration" );
XEnumeration oEnum = oObj.createEnumeration();
tRes.tested( "createEnumeration()", oEnum != null );
- return;
} // end createEnumeration()
} // finish class _XEnumerationAccess
diff --git a/qadevOOo/tests/java/ifc/container/_XNameAccess.java b/qadevOOo/tests/java/ifc/container/_XNameAccess.java
index 54cf370..f5489e1 100644
--- a/qadevOOo/tests/java/ifc/container/_XNameAccess.java
+++ b/qadevOOo/tests/java/ifc/container/_XNameAccess.java
@@ -44,7 +44,6 @@ public class _XNameAccess extends MultiMethodTest {
result = (Names != null);
tRes.tested("getElementNames()", result);
- return;
} // end getElementNames()
/**
@@ -86,8 +85,6 @@ public class _XNameAccess extends MultiMethodTest {
result &= loc_result;
tRes.tested("hasByName()", result);
-
- return;
} // end hasByName()
@@ -145,9 +142,6 @@ public class _XNameAccess extends MultiMethodTest {
result &= loc_result;
tRes.tested("getByName()", result);
-
- return;
-
} // end getByName()
} /// finished class _XNameAccess
diff --git a/qadevOOo/tests/java/ifc/container/_XNameContainer.java b/qadevOOo/tests/java/ifc/container/_XNameContainer.java
index 9ab9692..ea2ab3e 100644
--- a/qadevOOo/tests/java/ifc/container/_XNameContainer.java
+++ b/qadevOOo/tests/java/ifc/container/_XNameContainer.java
@@ -241,8 +241,6 @@ public class _XNameContainer extends MultiMethodTest {
}
tRes.tested("removeByName()", result);
-
- return;
} // end removeByName()
} //XNameContainer
diff --git a/qadevOOo/tests/java/ifc/form/_XReset.java b/qadevOOo/tests/java/ifc/form/_XReset.java
index 9df6a70..f61c114 100644
--- a/qadevOOo/tests/java/ifc/form/_XReset.java
+++ b/qadevOOo/tests/java/ifc/form/_XReset.java
@@ -162,9 +162,6 @@ public class _XReset extends MultiMethodTest {
shortWait();
tRes.tested("removeResetListener()", !approveReset[0] && !resetted[0]);
//removing the second listener here may avoid crashing the office
-
- return;
-
} // finished _removeResetListener()
/**
diff --git a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
index d33772b..a3008c2 100644
--- a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
+++ b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
@@ -207,8 +207,6 @@ public class _XValidatableFormComponent extends MultiMethodTest
testPropsNames[i] = ST.nextToken();
testPropsAmount = nr;
-
- return;
}
protected class MyListener implements XFormComponentValidityListener
diff --git a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java
index b5efcab..8422b86 100644
--- a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java
@@ -141,7 +141,6 @@ public class _XComponentLoader extends MultiMethodTest {
}
tRes.tested("loadComponentFromURL()", result);
- return;
}
}
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
index aebc5e4..3cc7c17 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
@@ -149,7 +149,6 @@ public class _XDispatchProvider extends MultiMethodTest {
}
tRes.tested("queryDispatches()", true);
- return;
}
}
diff --git a/qadevOOo/tests/java/ifc/lang/_XComponent.java b/qadevOOo/tests/java/ifc/lang/_XComponent.java
index 657f800..184f6cc 100644
--- a/qadevOOo/tests/java/ifc/lang/_XComponent.java
+++ b/qadevOOo/tests/java/ifc/lang/_XComponent.java
@@ -94,8 +94,6 @@ public class _XComponent extends MultiMethodTest {
oObj.addEventListener( listener1 );
oObj.addEventListener( listener2 );
-
- return;
} // finished _addEventListener()
/**
diff --git a/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java b/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java
index f6dd598..98249a9 100644
--- a/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java
+++ b/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java
@@ -58,7 +58,6 @@ public class _XReplaceDescriptor extends MultiMethodTest {
oObj.setReplaceString("XReplaceDescriptor");
String cmpReplaceStr = oObj.getReplaceString();
tRes.tested("setReplaceString()", !(cmpReplaceStr.equals(oldReplaceStr)));
- return;
}
} // finish class _XReplaceDescriptor
diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java
index 6ed77ae..46c6f73 100644
--- a/scripting/examples/java/Highlight/HighlightText.java
+++ b/scripting/examples/java/Highlight/HighlightText.java
@@ -118,8 +118,6 @@ public class HighlightText implements com.sun.star.awt.XActionListener {
exitButton.addActionListener(this);
findDialog.execute();
-
- return;
}
public void actionPerformed(ActionEvent e) {
commit a753a458e582dc0aa5e94ea350f4db06488f26f2
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 13 10:52:12 2014 +0200
java: avoid if..else when returning boolean values
Change-Id: Iab52762a9abfe8735223372b09638ce9d8d44318
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 2e48cd9..f5b5872 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 042b2ea..ec7c4b3 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 15f4721..a6969cd 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 2cfd316..ab05d89 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 55b855e..c54833b 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 143e33f..7a51288 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 b6107d3..18b8a41 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 e7c4e28..a829fb5 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 77385d2..b2f264d 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 7791aa9..cd3b656 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 b75d5b3..ab50752 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 4d125de..2540f62 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
commit 60f152caeee38579433a31dd3a98e91dc3d23ff6
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 13 10:19:51 2014 +0200
java: avoid unnecessary comparisons in boolean expressions
i.e. stuff like "x == true"
Change-Id: Ib82a4a30e736df392405332fa197b588482cffcf
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 491bd08..bfcbd94 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -234,7 +234,7 @@ public class LocalOfficeConnection
public void dispose()
{
Iterator<XEventListener> itr = mComponents.iterator();
- while (itr.hasNext() == true) {
+ while (itr.hasNext()) {
// ignore runtime exceptions in dispose
try { itr.next().disposing(null); }
catch ( RuntimeException aExc ) {}
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 9bbf6ad0..3c2c17e 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -582,7 +582,7 @@ public class OOoBean
{
if ( aFrame != null && xOldController != null )
- if (xOldController.suspend(true) == false)
+ if (!xOldController.suspend(true))
throw new com.sun.star.util.CloseVetoException(
"Dokument is still being used and cannot be closed.", this);
@@ -1187,7 +1187,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
// continue to trying to connect the OOo instance
long n = 0;
- while ( isInterrupted() == false
+ while ( !isInterrupted()
&& iConnection != null
&& iConnection.getComponentContext() != null )
{
diff --git a/bean/qa/complex/bean/WriterFrame.java b/bean/qa/complex/bean/WriterFrame.java
index e470044..9c0eb7d 100644
--- a/bean/qa/complex/bean/WriterFrame.java
+++ b/bean/qa/complex/bean/WriterFrame.java
@@ -42,7 +42,7 @@ class WriterFrame extends java.awt.Frame
try
{
- if (loadBeforeVisible == false)
+ if (!loadBeforeVisible)
{
m_bean = new com.sun.star.comp.beans.OOoBean(new PrivateLocalOfficeConnection(_xConn));
add(m_bean, BorderLayout.CENTER);
diff --git a/codemaker/test/javamaker/Test.java b/codemaker/test/javamaker/Test.java
index cc95099..2c35e64 100644
--- a/codemaker/test/javamaker/Test.java
+++ b/codemaker/test/javamaker/Test.java
@@ -126,7 +126,7 @@ public final class Test extends ComplexTestCase {
public void testEmptyStruct2() {
Struct2 s = new Struct2();
- assure(s.p1 == false);
+ assure(!s.p1);
assure(s.p2 == 0);
assure(s.p3 == 0);
assure(s.p4 == 0);
@@ -144,7 +144,7 @@ public final class Test extends ComplexTestCase {
assure(s.p16.member1 == 0);
assure(s.p17 == null);
assure(s.p18 == null);
- assure(s.t1 == false);
+ assure(!s.t1);
assure(s.t2 == 0);
assure(s.t3 == 0);
assure(s.t4 == 0);
@@ -242,7 +242,7 @@ public final class Test extends ComplexTestCase {
new char[0][], new String[0][], new Type[0][], new Object[0][],
new Enum2[0][], new Struct1[0][], new Object[0][],
new XNamingService[0][]);
- assure(s.p1 == true);
+ assure(s.p1);
assure(s.p2 == 1);
assure(s.p3 == 2);
assure(s.p4 == 3);
@@ -260,7 +260,7 @@ public final class Test extends ComplexTestCase {
assure(s.p16.member1 == 1);
assure(s.p17 == null);
assure(s.p18 == null);
- assure(s.t1 == false);
+ assure(!s.t1);
assure(s.t2 == 0);
assure(s.t3 == 0);
assure(s.t4 == 0);
@@ -279,8 +279,8 @@ public final class Test extends ComplexTestCase {
assure(s.t17 == null);
assure(s.t18 == null);
assure(s.a1.length == 2);
- assure(s.a1[0] == false);
- assure(s.a1[1] == true);
+ assure(!s.a1[0]);
+ assure(s.a1[1]);
assure(s.a2.length == 2);
assure(s.a2[0] == 1);
assure(s.a2[1] == 2);
diff --git a/forms/qa/integration/forms/BooleanValidator.java b/forms/qa/integration/forms/BooleanValidator.java
index dfd3fca..730c45f 100644
--- a/forms/qa/integration/forms/BooleanValidator.java
+++ b/forms/qa/integration/forms/BooleanValidator.java
@@ -43,7 +43,7 @@ public class BooleanValidator extends integration.forms.ControlValidator
if ( AnyConverter.isVoid( Value ) )
return "'indetermined' is not an allowed state";
boolean value = ((Boolean)Value).booleanValue();
- if ( m_preventChecked && ( value == true ) )
+ if ( m_preventChecked && ( value ) )
return "no no no. Don't check it.";
}
catch( java.lang.Exception e )
@@ -61,7 +61,7 @@ public class BooleanValidator extends integration.forms.ControlValidator
return false;
boolean value = ((Boolean)Value).booleanValue();
- if ( m_preventChecked && ( value == true ) )
+ if ( m_preventChecked && ( value ) )
return false;
return true;
}
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index caf5cdc..650be99 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -314,7 +314,7 @@ public class InterfaceContainer implements Cloneable
while (it.hasNext())
{
Object obj= it.next();
- if (false == contains(obj))
+ if (!contains(obj))
{
retVal= false;
break;
@@ -556,7 +556,7 @@ public class InterfaceContainer implements Cloneable
break;
}
}
- if (bExists == false)
+ if (!bExists)
{
itColl= collection.iterator();
while (itColl.hasNext())
@@ -572,7 +572,7 @@ public class InterfaceContainer implements Cloneable
}
}
}
- if (bExists == true)
+ if (bExists)
arRetained[indexRetained++]= curElem;
}
retVal= size != indexRetained;
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index ca72af9..227dcde 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -264,7 +264,7 @@ XMultiPropertySet
*/
protected void assignPropertyId(Property prop, Object id)
{
- if (id instanceof String && ((String) id).equals("") == false)
+ if (id instanceof String && !((String) id).equals(""))
_propertyToIdMap.put(prop, id);
}
diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
index 0031e1a..fc7640e 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
@@ -109,7 +109,7 @@ public class Bootstrap_Test {
}
}
- System.exit( test(args[0], bootstrap_parameters) == true ? 0: -1 );
+ System.exit( test(args[0], bootstrap_parameters) ? 0: -1 );
}
}
diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
index a0f69d8..3df517e 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
@@ -142,7 +142,7 @@ public class SharedLibraryLoader_Test {
result = SharedLibraryLoader.writeRegistryServiceInfo( null, regKey );
System.out.print("Test - ");
- System.out.println( result==false ? "failed" : "successful");
+ System.out.println( !result ? "failed" : "successful");
System.out.println("*******************************************************************");
System.out.println();
return result;
@@ -163,7 +163,7 @@ public class SharedLibraryLoader_Test {
}
static public void main(String args[]) throws java.lang.Exception {
- System.exit( test() == true ? 0: -1 );
+ System.exit( test() ? 0: -1 );
}
}
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
index 0c517ca..5afc638 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
@@ -80,7 +80,7 @@ public class ComponentBase_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -114,7 +114,7 @@ public class ComponentBase_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -133,7 +133,7 @@ public class ComponentBase_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Errors occurred!");
else
System.out.println("No errors.");
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
index 976968f..e76825e 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
@@ -94,7 +94,7 @@ public class InterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -114,7 +114,7 @@ public class InterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -135,7 +135,7 @@ public class InterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -155,7 +155,7 @@ public class InterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -194,7 +194,7 @@ public class InterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -229,7 +229,7 @@ public class InterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -915,7 +915,7 @@ public class InterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
index 331c376..22e6641 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
@@ -107,7 +107,7 @@ public class MultiTypeInterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -153,7 +153,7 @@ public class MultiTypeInterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -186,7 +186,7 @@ public class MultiTypeInterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -221,7 +221,7 @@ public class MultiTypeInterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -254,7 +254,7 @@ public class MultiTypeInterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -288,7 +288,7 @@ public class MultiTypeInterfaceContainer_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index c3f950b..8653af4 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -57,7 +57,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -79,7 +79,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -581,7 +581,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -776,7 +776,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -828,7 +828,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -859,7 +859,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -885,7 +885,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -920,7 +920,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -949,7 +949,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -991,7 +991,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -1025,7 +1025,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -1065,7 +1065,7 @@ public class PropertySet_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Errors occurred!");
else
System.out.println("No errors.");
@@ -1503,7 +1503,7 @@ class TestClass2 extends PropertySet
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -1566,7 +1566,7 @@ class TestClass2 extends PropertySet
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
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 f540854..2e48cd9 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
@@ -43,7 +43,7 @@ public class ProxyProvider
{
Object retVal= null;
- if (obj == null || iface == null || iface.isInstance(obj) == false )
+ if (obj == null || iface == null || !iface.isInstance(obj) )
return retVal;
Type type= new Type(TypeDescription.getTypeDescription(iface));
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
index 6177a82..81806f6 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
@@ -65,7 +65,7 @@ public class WeakBase_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -99,7 +99,7 @@ public class WeakBase_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -168,7 +168,7 @@ public class WeakBase_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Failed");
else
System.out.println("Ok");
@@ -187,7 +187,7 @@ public class WeakBase_Test
boolean bOk= true;
for (int c= 0; c < i; c++)
bOk= bOk && r[c];
- if (bOk == false)
+ if (!bOk)
System.out.println("Errors occurred!");
else
System.out.println("No errors.");
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
index 6210d72..525fb22 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
+++ b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
@@ -63,7 +63,7 @@ public class JREProperties
//can be done by providing a sunjavaplugin.ini with
//the bootstrap parameter JFW_PLUGIN_NO_NOT_CHECK_ACCESSIBILITY
//set to "1"
- if (bNoAccess == false && ! bW98)
+ if (!bNoAccess && ! bW98)
{
try{
//This line is needed to get the accessibility properties
diff --git a/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java b/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java
index 82f3cf3..edef9c5 100644
--- a/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java
+++ b/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java
@@ -211,7 +211,7 @@ public class PresentationDemo
// if the com.sun.star.presentation.DrawPage service is supported
XServiceInfo xInfo = UnoRuntime.queryInterface(
XServiceInfo.class, xPage );
- if ( xInfo.supportsService( "com.sun.star.presentation.DrawPage" ) == true )
+ if ( xInfo.supportsService( "com.sun.star.presentation.DrawPage" ) )
{
try
{
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java
index d21f8d3..1ef5ef3 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java
@@ -66,10 +66,10 @@ public class Desk
for(int i=0; i<lArguments.length; ++i)
{
lArguments[i] = lArguments[i].toLowerCase();
- if(lArguments[i].startsWith("mode=")==true)
+ if(lArguments[i].startsWith("mode="))
sMode = lArguments[i].substring(5);
else
- if(lArguments[i].startsWith("file=")==true)
+ if(lArguments[i].startsWith("file="))
sFile = lArguments[i].substring(5);
}
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
index 002c644..e8d5221 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
@@ -167,7 +167,7 @@ public class DocumentView extends JFrame
JScrollPane paScroll = new JScrollPane();
paScroll.getViewport().add(paTest,null);
- if(ViewContainer.mbInplace==true)
+ if(ViewContainer.mbInplace)
{
// create view to show opened documents
// This special view is necessary for inplace mode only!
@@ -209,7 +209,7 @@ public class DocumentView extends JFrame
// create view frame (as a XFrame!) here
// Look for right view mode setted by user command line parameter.
// First try to get a new unambigous frame name from our global ViewContainer.
- if(ViewContainer.mbInplace==true)
+ if(ViewContainer.mbInplace)
{
// inplace document view can't be initialized without a visible parent window hierarchy!
// So make sure that we are visible in every case!
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index bffa732..49de614 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -608,7 +608,7 @@ public class FunctionHelper
com.sun.star.util.XModifiable xModified = UnoRuntime.queryInterface(
com.sun.star.util.XModifiable.class,
xModel);
- if(xModified.isModified()==true)
+ if(xModified.isModified())
{
com.sun.star.frame.XStorable xStore = UnoRuntime.queryInterface(
com.sun.star.frame.XStorable.class,
@@ -667,13 +667,13 @@ public class FunctionHelper
{
// Find out possible filter name.
String sFilter = null;
- if(xInfo.supportsService("com.sun.star.text.TextDocument")==true)
+ if(xInfo.supportsService("com.sun.star.text.TextDocument"))
sFilter = "HTML (StarWriter)";
else
- if(xInfo.supportsService("com.sun.star.text.WebDocument")==true)
+ if(xInfo.supportsService("com.sun.star.text.WebDocument"))
sFilter = "HTML";
else
- if(xInfo.supportsService("com.sun.star.sheet.SpreadsheetDocument")==true)
+ if(xInfo.supportsService("com.sun.star.sheet.SpreadsheetDocument"))
sFilter = "HTML (StarCalc)";
// Check for existing state of this filter.
@@ -688,7 +688,7 @@ public class FunctionHelper
xCtx.getServiceManager().createInstanceWithContext(
"com.sun.star.document.FilterFactory", xCtx));
- if(xFilterContainer.hasByName(sFilter)==false)
+ if(!xFilterContainer.hasByName(sFilter))
sFilter=null;
}
@@ -890,7 +890,7 @@ public class FunctionHelper
aChooser = new JFileChooser(maLastDir);
// decide between file open/save dialog
- if( bOpen==true )
+ if( bOpen )
nDecision = aChooser.showOpenDialog(aParent);
else
nDecision = aChooser.showSaveDialog(aParent);
@@ -914,8 +914,8 @@ public class FunctionHelper
// => correct this problem first, otherwise office can't use these URL's
if(
( sFileURL !=null ) &&
- ( sFileURL.startsWith("file:/") ==true ) &&
- ( sFileURL.startsWith("file://")==false )
+ ( sFileURL.startsWith("file:/") ) &&
+ ( !sFileURL.startsWith("file://") )
)
{
StringBuffer sWorkBuffer = new StringBuffer(sFileURL);
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
index 77b48ab..deaccb5 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
@@ -128,7 +128,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
return;
if (m_xFrame==null)
return;
- if (m_bIsActionListener==true)
+ if (m_bIsActionListener)
return;
xFrame = m_xFrame;
}
@@ -423,7 +423,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
// intercept loading empty documents into new created frames
if(
(sTarget.compareTo ("_blank" ) == 0 ) &&
- (aURL.Complete.startsWith("private:factory") == true)
+ (aURL.Complete.startsWith("private:factory"))
)
{
System.out.println("intercept private:factory");
@@ -431,7 +431,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
}
// intercept opening the SaveAs dialog
- if (aURL.Complete.startsWith(".uno:SaveAs") == true)
+ if (aURL.Complete.startsWith(".uno:SaveAs"))
{
System.out.println("intercept SaveAs by returning null!");
return null;
@@ -439,8 +439,8 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
// intercept "File->Exit" inside the menu
if (
- (aURL.Complete.startsWith("slot:5300") == true) ||
- (aURL.Complete.startsWith(".uno:Quit") == true)
+ (aURL.Complete.startsWith("slot:5300")) ||
+ (aURL.Complete.startsWith(".uno:Quit"))
)
{
System.out.println("intercept File->Exit");
@@ -500,14 +500,14 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
}
if (
- (aURL.Complete.startsWith("slot:5300") == true) ||
- (aURL.Complete.startsWith(".uno:Quit") == true)
+ (aURL.Complete.startsWith("slot:5300")) ||
+ (aURL.Complete.startsWith(".uno:Quit"))
)
{
System.exit(0);
}
else
- if (aURL.Complete.startsWith("private:factory") == true)
+ if (aURL.Complete.startsWith("private:factory"))
{
// Create view frame for showing loaded documents on demand.
// The visible state is necessary for JNI functionality to get the HWND and plug office
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
index 317022d..6fbf3c7 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
@@ -135,7 +135,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener,
return;
if (m_xFrame==null)
return;
- if (m_bIsActionListener==true)
+ if (m_bIsActionListener)
return;
xFrame = m_xFrame;
}
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java
index fdc82ea..13fad3c 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java
@@ -92,7 +92,7 @@ public class ViewContainer extends Thread
{
synchronized(mlViews)
{
- if(mlViews.contains(aView)==false)
+ if(!mlViews.contains(aView))
mlViews.add(aView);
}
}
@@ -115,7 +115,7 @@ public class ViewContainer extends Thread
int nViewCount = 0;
synchronized(mlViews)
{
- if(mlViews.contains(aView)==true)
+ if(mlViews.contains(aView))
mlViews.remove(aView);
nViewCount = mlViews.size();
@@ -130,10 +130,10 @@ public class ViewContainer extends Thread
synchronized(mlListener)
{
bShutdownView = mlListener.contains(aView);
- if (bShutdownView==true)
+ if (bShutdownView)
mlListener.remove(aView);
}
- if (bShutdownView==true)
+ if (bShutdownView)
((IShutdownListener)aView).shutdown();
// We use a system.exit() to finish the whole application.
@@ -150,7 +150,7 @@ public class ViewContainer extends Thread
{
bNecessary = ! mbShutdownActive;
}
- if (bNecessary==true)
+ if (bNecessary)
{
System.out.println("call exit(0)!");
System.exit(0);
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index f12b2cf..c4816fa 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -344,7 +344,7 @@ public class AsciiReplaceFilter
measure("options analyzed");
- if (aOptions.isValid()==false)
+ if (!aOptions.isValid())
return false;
// start real filtering
@@ -503,7 +503,7 @@ public class AsciiReplaceFilter
xRefresh.refresh();
// If we created used stream - we must close it too.
- if (aOptions.m_bStreamOwner==true)
+ if (aOptions.m_bStreamOwner)
{
aOptions.m_xInput.closeInput();
measure("stream close");
@@ -577,7 +577,7 @@ public class AsciiReplaceFilter
measure("written to file");
// If we created used stream - we must close it too.
- if (aOptions.m_bStreamOwner==true)
+ if (aOptions.m_bStreamOwner)
{
aOptions.m_xOutput.closeOutput();
measure("stream close");
@@ -617,9 +617,9 @@ public class AsciiReplaceFilter
// convert buffer into return format [string]
// and convert to lower or upper case if required.
String sResult = rBuffer.toString();
- if (aOptions.m_bCaseChange==true)
+ if (aOptions.m_bCaseChange)
{
- if (aOptions.m_bLower==true)
+ if (aOptions.m_bLower)
sResult = sResult.toLowerCase();
else
sResult = sResult.toUpperCase();
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
index ce22111..dbefb71 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
@@ -208,7 +208,7 @@ public class FilterOptions
m_xMCF.createInstanceWithContext("com.sun.star.ucb.SimpleFileAccess", m_Ctx));
if (xHelper!=null)
{
- if (bImport==true)
+ if (bImport)
m_xInput = xHelper.openFileRead(m_sURL);
else
m_xOutput = xHelper.openFileWrite(m_sURL);
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java
index 16d9326..fb1e4a6 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java
@@ -74,17 +74,17 @@ public class PropChgHelper_Spell extends PropChgHelper
}
else if (aEvt.PropertyName.equals( "IsSpellUpperCase" ))
{
- bSCWA = false == bVal; // FALSE->TRUE change?
+ bSCWA = !bVal; // FALSE->TRUE change?
bSWWA = !bSCWA; // TRUE->FALSE change?
}
else if (aEvt.PropertyName.equals( "IsSpellWithDigits" ))
{
- bSCWA = false == bVal; // FALSE->TRUE change?
+ bSCWA = !bVal; // FALSE->TRUE change?
bSWWA = !bSCWA; // TRUE->FALSE change?
}
else if (aEvt.PropertyName.equals( "IsSpellCapitalization" ))
{
- bSCWA = false == bVal; // FALSE->TRUE change?
+ bSCWA = !bVal; // FALSE->TRUE change?
bSWWA = !bSCWA; // TRUE->FALSE change?
}
diff --git a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java
index ceded40..8d8d698 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java
@@ -45,7 +45,7 @@ public class TerminateListener implements XTerminateListener {
throws TerminationVetoException {
// test if we can terminate now
- if (TerminationTest.isAtWork() == true) {
+ if (TerminationTest.isAtWork()) {
System.out.println("Terminate while we are at work? You can't mean it serious ;-)!");
throw new TerminationVetoException();
}
diff --git a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java
index a01fb24..1dc59d3 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java
@@ -67,7 +67,7 @@ public class TerminationTest extends java.lang.Object {
// try to terminate while we are at work
boolean terminated = xDesktop.terminate();
System.out.println("The Office " +
- (terminated == true ?
+ (terminated ?
"has been terminated" :
"is still running, we are at work"));
@@ -76,7 +76,7 @@ public class TerminationTest extends java.lang.Object {
// once more: try to terminate
terminated = xDesktop.terminate();
System.out.println("The Office " +
- (terminated == true ?
+ (terminated ?
"has been terminated" :
"is still running. Someone else prevents termination, " +
"e.g. the quickstarter"));
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
index a289359..9b5962e 100644
--- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
@@ -279,7 +279,7 @@ class ScriptSelectorPanel extends JPanel {
private void initNodes(XBrowseNode parent, DefaultMutableTreeNode top) {
- if ( parent == null || parent.hasChildNodes() == false )
+ if ( parent == null || !parent.hasChildNodes() )
{
return;
}
diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index dcf8030..343ca54 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -391,7 +391,7 @@ final class InstallationFinder {
new FileInputStream( fSVersion ), "UTF-8" ) );
String line = null;
while ( ( line = br.readLine() ) != null &&
- ( line.equals( VERSIONS ) ) != true ) {
+ !line.equals( VERSIONS ) ) {
// read lines until [Versions] is found
}
while ( ( line = br.readLine() ) != null &&
diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java
index 7187ec5..588814e 100644
--- a/qadevOOo/runner/convwatch/ConvWatch.java
+++ b/qadevOOo/runner/convwatch/ConvWatch.java
@@ -149,7 +149,7 @@ public class ConvWatch
throw new ConvWatchCancelException("createPostscriptStartCheck: Printed file " + sAbsolutePrintFile + " does not exist.");
}
- if (bAbsoluteReferenceFile == false)
+ if (!bAbsoluteReferenceFile)
{
// copy AbsolutePrintFile to AbsoluteReferenceFile
String sDestinationFile = sAbsolutePrintFile; // URLHelper.getSystemPathFromFileURL(...)
@@ -170,7 +170,7 @@ public class ConvWatch
a.setOutputPath( _sOutputPath );
a.setReferenceFile( sReferenceFile );
a.setPostScriptFile(sPostScriptFile );
- if (_aGTA.printAllPages() == true)
+ if (_aGTA.printAllPages())
{
a.setMaxPages(9999);
}
@@ -365,7 +365,7 @@ public class ConvWatch
createINIStatus_DiffDiff(aDiffDiffList, "DiffDiff_", _sOutputPath, _sAbsoluteInputFile, _aGTA.getBuildID());
- if (bFoundAOldDiff == false)
+ if (!bFoundAOldDiff)
{
throw new ConvWatchCancelException("No old difference file found." );
}
diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java
index 2adce75..a695315 100644
--- a/qadevOOo/runner/convwatch/ConvWatchStarter.java
+++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java
@@ -109,7 +109,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
m_sOutputPath = sOUT;
}
- if (bQuit == true)
+ if (bQuit)
{
assure("Must quit", false);
}
diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java
index ee338d3..26cd831 100644
--- a/qadevOOo/runner/convwatch/DirectoryHelper.java
+++ b/qadevOOo/runner/convwatch/DirectoryHelper.java
@@ -98,7 +98,7 @@ public class DirectoryHelper
{
if ( aDirEntries[ i ].isDirectory() )
{
- if (m_bRecursiveIsAllowed == true)
+ if (m_bRecursiveIsAllowed)
{
// Recursive call for the new directory
traverse_impl( aDirEntries[ i ].getAbsolutePath(), _aFileFilter );
diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java
index f449b57..5a6f024 100644
--- a/qadevOOo/runner/convwatch/DocumentConverter.java
+++ b/qadevOOo/runner/convwatch/DocumentConverter.java
@@ -110,7 +110,7 @@ public class DocumentConverter extends EnhancedComplexTestCase
m_sReferencePath = sREF;
}
- if (bQuit == true)
+ if (bQuit)
{
assure("Must quit, Parameter problems.", false);
}
diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java
index 9c23baf..7668405 100644
--- a/qadevOOo/runner/convwatch/FileHelper.java
+++ b/qadevOOo/runner/convwatch/FileHelper.java
@@ -252,7 +252,7 @@ public class FileHelper
File aFile = new File(sName);
if (aFile.exists())
{
- if (m_bDebugTextShown == false)
+ if (!m_bDebugTextShown)
{
GlobalLogWriter.get().println("Found file: " + sName);
GlobalLogWriter.get().println("Activate debug mode.");
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index a6f506e..d52add3 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -590,7 +590,7 @@ public class GraphicalTestArguments
public boolean restartOffice()
{
- if (m_bResuseOffice == false)
+ if (!m_bResuseOffice)
{
return true;
}
diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java
index 7ccf7d0..92dc05e 100644
--- a/qadevOOo/runner/convwatch/MSOfficePrint.java
+++ b/qadevOOo/runner/convwatch/MSOfficePrint.java
@@ -197,7 +197,7 @@ public class MSOfficePrint
throw new ConvWatchCancelException/*WrongSuffixException*/("No Mircosoft Office document format found.");
}
- if (aStartCommand.isEmpty() == false)
+ if (!aStartCommand.isEmpty())
{
String sPrinterName = m_sPrinterName;
if (sPrinterName == null)
@@ -278,7 +278,7 @@ public class MSOfficePrint
String sPrintViaWord = "printViaWord.pl";
ArrayList<String> aList = searchLocalFile(sPrintViaWord);
- if (aList.isEmpty() == false)
+ if (!aList.isEmpty())
{
return aList;
}
@@ -410,7 +410,7 @@ public class MSOfficePrint
String sSaveViaWord = "saveViaWord.pl";
ArrayList<String> aList = searchLocalFile(sSaveViaWord);
- if (aList.isEmpty() == false)
+ if (!aList.isEmpty())
{
return aList;
}
@@ -492,7 +492,7 @@ public class MSOfficePrint
String sPrintViaExcel = "printViaExcel.pl";
ArrayList<String> aList = searchLocalFile(sPrintViaExcel);
- if (aList.isEmpty() == false)
+ if (!aList.isEmpty())
{
return aList;
}
@@ -587,7 +587,7 @@ public class MSOfficePrint
String sSaveViaExcel = "saveViaExcel.pl";
ArrayList<String> aList = searchLocalFile(sSaveViaExcel);
- if (aList.isEmpty() == false)
+ if (!aList.isEmpty())
{
return aList;
}
@@ -677,7 +677,7 @@ public class MSOfficePrint
String sPrintViaPowerPoint = "printViaPowerPoint.pl";
ArrayList<String> aList = searchLocalFile(sPrintViaPowerPoint);
- if (aList.isEmpty() == false)
+ if (!aList.isEmpty())
{
return aList;
}
diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java
index 9cbb132..38273ec 100644
--- a/qadevOOo/runner/convwatch/OfficePrint.java
+++ b/qadevOOo/runner/convwatch/OfficePrint.java
@@ -532,7 +532,7 @@ public class OfficePrint {
aPrintProps.add(Arg);
showProperty(Arg);
- if (_aGTA.printAllPages() == false)
+ if (!_aGTA.printAllPages())
{
String sPages = "";
if (_aGTA.getMaxPages() > 0)
@@ -603,7 +603,7 @@ public class OfficePrint {
bBack = false;
}
- if (bFailed == true)
+ if (bFailed)
{
GlobalLogWriter.get().println("convwatch.OfficePrint: FAILED");
}
@@ -645,7 +645,7 @@ public class OfficePrint {
String sPrintFilename = FileHelper.getNameNoSuffix(sInputFileBasename);
String sAbsolutePrintFilename = sOutputPath + fs + sPrintFilename + ".prn";
- if (FileHelper.exists(sAbsolutePrintFilename) && _aGTA.getOverwrite() == false)
+ if (FileHelper.exists(sAbsolutePrintFilename) && !_aGTA.getOverwrite())
{
GlobalLogWriter.get().println("Reference already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite.");
return true;
@@ -693,7 +693,7 @@ public class OfficePrint {
String sPrintFileURL;
String sAbsolutePrintFilename = sOutputPath + fs + sPrintFilename + ".prn";
- if (FileHelper.exists(sAbsolutePrintFilename) && _aGTA.getOverwrite() == false)
+ if (FileHelper.exists(sAbsolutePrintFilename) && !_aGTA.getOverwrite())
{
GlobalLogWriter.get().println("Reference already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite.");
return true;
@@ -1084,7 +1084,7 @@ public class OfficePrint {
GlobalLogWriter.get().println("Service from FilterName '" + sServiceName + "' is not supported by loaded document.");
bServiceFailed = true;
}
- if (bServiceFailed == true)
+ if (bServiceFailed)
{
GlobalLogWriter.get().println("Please check '" + PropertyName.DOC_CONVERTER_EXPORT_FILTER_NAME + "' in the property file.");
return;
@@ -1130,7 +1130,7 @@ public class OfficePrint {
sOutputFile += sInputFileBasename;
}
- if (FileHelper.exists(sOutputFile) && _aGTA.getOverwrite() == false)
+ if (FileHelper.exists(sOutputFile) && !_aGTA.getOverwrite())
{
GlobalLogWriter.get().println("File already exist, don't overwrite. Set " + PropertyName.DOC_COMPARATOR_OVERWRITE_REFERENCE + "=true to force overwrite.");
return;
diff --git a/qadevOOo/runner/convwatch/ReferenceBuilder.java b/qadevOOo/runner/convwatch/ReferenceBuilder.java
index 8b8e31d..0fa57a8f 100644
--- a/qadevOOo/runner/convwatch/ReferenceBuilder.java
+++ b/qadevOOo/runner/convwatch/ReferenceBuilder.java
@@ -109,7 +109,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase
m_sReferencePath = sREF;
}
- if (bQuit == true)
+ if (bQuit)
{
assure("Must quit, Parameter problems.", false);
}
@@ -197,7 +197,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase
// first do a check if the reference not already exist, this is a big speedup, due to the fact,
// we don't need to start a new office.
GraphicalTestArguments aGTA = getGraphicalTestArguments();
- if (GraphicalDifferenceCheck.isReferenceExists(_sInputPath, _sReferencePath, aGTA) == false)
+ if (!GraphicalDifferenceCheck.isReferenceExists(_sInputPath, _sReferencePath, aGTA))
{
// start a fresh Office
OfficeProvider aProvider = null;
diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/runner/graphical/DirectoryHelper.java
index 2acb911..6ba7e6c 100644
--- a/qadevOOo/runner/graphical/DirectoryHelper.java
+++ b/qadevOOo/runner/graphical/DirectoryHelper.java
@@ -99,7 +99,7 @@ public class DirectoryHelper
{
if ( aDirEntries[ i ].isDirectory() )
{
- if (m_bRecursiveIsAllowed == true)
+ if (m_bRecursiveIsAllowed)
{
// Recursive call for the new directory
traverse_impl( aDirEntries[ i ].getAbsolutePath(), _aFileFilter );
diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java
index 78551e6..ac47800 100644
--- a/qadevOOo/runner/graphical/FileHelper.java
+++ b/qadevOOo/runner/graphical/FileHelper.java
@@ -263,7 +263,7 @@ public class FileHelper
File aFile = new File(sName);
if (aFile.exists())
{
- if (m_bDebugTextShown == false)
+ if (!m_bDebugTextShown)
{
GlobalLogWriter.println("Found file: " + sName);
GlobalLogWriter.println("Activate debug mode.");
diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java
index 2e2da21..c94cfb8 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -359,7 +359,7 @@ public class IniFile implements Enumeration<String>
// TODO: make private
private void store()
{
- if (m_bListContainUnsavedChanges == false)
+ if (!m_bListContainUnsavedChanges)
{
// nothing has changed, so no need to store
return;
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
index 1d3081a..aeebf69 100644
--- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
@@ -211,7 +211,7 @@ public class MSOfficePostscriptCreator implements IOffice
throw new WrongSuffixException("No Mircosoft Office document format found.");
}
- if (aStartCommand.isEmpty() == false)
+ if (!aStartCommand.isEmpty())
{
String sPrinterName = m_sPrinterName;
if (sPrinterName == null)
@@ -290,7 +290,7 @@ public class MSOfficePostscriptCreator implements IOffice
String sPrintViaWord = "printViaWord.pl";
ArrayList<String> aList = searchLocalFile(sPrintViaWord);
- if (aList.isEmpty() == false)
+ if (!aList.isEmpty())
{
return aList;
}
@@ -421,7 +421,7 @@ public class MSOfficePostscriptCreator implements IOffice
String sPrintViaExcel = "printViaExcel.pl";
ArrayList<String> aList = searchLocalFile(sPrintViaExcel);
- if (aList.isEmpty() == false)
+ if (!aList.isEmpty())
{
return aList;
}
@@ -519,7 +519,7 @@ public class MSOfficePostscriptCreator implements IOffice
String sPrintViaPowerPoint = "printViaPowerPoint.pl";
ArrayList<String> aList = searchLocalFile(sPrintViaPowerPoint);
- if (aList.isEmpty() == false)
+ if (!aList.isEmpty())
{
return aList;
}
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index bca3b38..7dc60e8 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -490,7 +490,7 @@ public class OpenOfficePostscriptCreator implements IOffice
// generate pages string
- if (_aGTA.printAllPages() == false)
+ if (!_aGTA.printAllPages())
{
String sPages = "";
if (_aGTA.getMaxPages() > 0)
@@ -561,7 +561,7 @@ public class OpenOfficePostscriptCreator implements IOffice
bBack = false;
}
- if (bFailed == true)
+ if (bFailed)
{
GlobalLogWriter.println("convwatch.OfficePrint: FAILED");
}
diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java
index 418c06a..042b2ea 100644
--- a/qadevOOo/runner/graphical/ParameterHelper.java
+++ b/qadevOOo/runner/graphical/ParameterHelper.java
@@ -357,7 +357,7 @@ public class ParameterHelper
{
// boolean bCreateSmallPictures = true;
boolean bNoSmallPictures = m_aCurrentParams.getBool( PropertyName.NO_SMALL_PICTURES);
- if (bNoSmallPictures == true)
+ if (bNoSmallPictures)
{
return false;
}
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 1f0643d..6b21841 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -702,7 +702,7 @@ public class OfficeProvider implements AppProvider
String command = (String) param.get(util.PropertyName.APP_EXECUTION_COMMAND);
String connectionString;
- if (param.getBool(util.PropertyName.USE_PIPE_CONNECTION) == true)
+ if (param.getBool(util.PropertyName.USE_PIPE_CONNECTION))
{
// This is the default behaviour
connectionString = (String) param.get(util.PropertyName.PIPE_CONNECTION_STRING);
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 49e4814..2554d16 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -660,7 +660,7 @@ public class ProcessHandler
}
}
- if (bKillProcessAfterTimeout == true)
+ if (bKillProcessAfterTimeout)
{
if (!isFinished)
{
diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java
index 60bebf8..4ca56057 100644
--- a/qadevOOo/runner/helper/URLHelper.java
+++ b/qadevOOo/runner/helper/URLHelper.java
@@ -64,8 +64,8 @@ public class URLHelper
// => correct this problem first, otherwise office can't use these URL's
if(
(sFileURL != null ) &&
- (sFileURL.startsWith("file:/") == true ) &&
- (sFileURL.startsWith("file://") == false)
+ sFileURL.startsWith("file:/") &&
+ !sFileURL.startsWith("file://")
)
{
StringBuffer sWorkBuffer = new StringBuffer(sFileURL);
diff --git a/qadevOOo/runner/util/RegistryTools.java b/qadevOOo/runner/util/RegistryTools.java
index ff33c8c..c42fb80 100644
--- a/qadevOOo/runner/util/RegistryTools.java
+++ b/qadevOOo/runner/util/RegistryTools.java
@@ -203,8 +203,8 @@ public class RegistryTools {
return false ;
} else {
- if (compareKeyTrees(tree1.openKey(keyName),
- tree2.openKey(keyName), true) == false) return false ;
+ if (!compareKeyTrees(tree1.openKey(keyName),
+ tree2.openKey(keyName), true)) return false ;
}
}
} catch (InvalidRegistryException e) {
diff --git a/qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java b/qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java
index 325f256..c15b5d0 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java
@@ -45,7 +45,7 @@ public class _XTextLayoutConstrains extends MultiMethodTest {
short nLines = 0;
Size mSize = oObj.getMinimumSize(nCols,nLines);
boolean res = ( (mSize.Height != 0) && (mSize.Width != 0) );
- if (res == false) {
+ if (!res) {
log.println("mSize.height: " + mSize.Height);
log.println("mSize.width: " + mSize.Width);
}
@@ -61,7 +61,7 @@ public class _XTextLayoutConstrains extends MultiMethodTest {
short[] nLines = new short[1];
oObj.getColumnsAndLines(nCols,nLines);
boolean res = ( (nCols[0] != 0) && (nLines[0] != 0) );
- if (res == false) {
+ if (!res) {
log.println("nCols: " + nCols[0]);
log.println("nLines: " + nLines[0]);
}
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatch.java b/qadevOOo/tests/java/ifc/frame/_XDispatch.java
index a31f9b9..98ef246 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatch.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatch.java
@@ -183,7 +183,7 @@ public class _XDispatch extends MultiMethodTest {
result = listener.statusChangedCalled;
- if (result == false) {
+ if (!result) {
result = checkXDispatchWithNotification();
}
diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java b/qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java
index ca5ad01..6220540 100644
--- a/qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java
+++ b/qadevOOo/tests/java/ifc/linguistic2/_XDictionaryList.java
@@ -162,7 +162,7 @@ public class _XDictionaryList extends MultiMethodTest {
tRes.tested(
"removeDictionaryListEventListener()",
- listenerCalled == false && res == true );
+ !listenerCalled && res );
}
/**
diff --git a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
index 8aa334a..fb835587 100644
--- a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
+++ b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
@@ -105,7 +105,7 @@ public class _XImplementationLoader extends MultiMethodTest {
throw new StatusException("Can not register implementation", e) ;
}
- if (rc == false)
+ if (!rc)
log.println("Method returned false value") ;
String[] keys ;
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java
index 97dc7c8..0a7159a 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java
@@ -177,7 +177,7 @@ public class XMLSettingsImporter extends TestCase {
xPropSet.getPropertyValue("IsLayerMode");
logF.println("'IsLayerMode' property value is '"
+ value + "'");
- return value.booleanValue() == true;
+ return value.booleanValue();
} catch (com.sun.star.uno.Exception e) {
logF.println("Exception while checking import :") ;
e.printStackTrace(logF) ;
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
index 02dfd15..82e5ef9 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
@@ -191,7 +191,7 @@ public class XMLSettingsImporter extends TestCase {
}
logF.println("Property \"IsLayerMode\" after import is "
+ propValue);
- if ( propValue.booleanValue() == true ) {
+ if ( propValue.booleanValue() ) {
return true;
} else {
return false;
diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java
index 8da5301..6ed77ae 100644
--- a/scripting/examples/java/Highlight/HighlightText.java
+++ b/scripting/examples/java/Highlight/HighlightText.java
@@ -80,8 +80,8 @@ public class HighlightText implements com.sun.star.awt.XActionListener {
}
if (findDialog == null) {
- if (tryLoadingLibrary(xmcf, context, "Dialog") == false ||
- tryLoadingLibrary(xmcf, context, "Script") == false)
+ if (!tryLoadingLibrary(xmcf, context, "Dialog") ||
+ !tryLoadingLibrary(xmcf, context, "Script"))
{
System.err.println("Error loading ScriptBindingLibrary");
return;
diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index b1bdfff..a108826 100644
--- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -345,7 +345,7 @@ XInitialization {
xNameCont.insertByName( _label4Name, label4Model );
xNameCont.insertByName( _checkBoxName, checkBoxModel );
- if ( extraPathLine == true )
+ if ( extraPathLine )
{
// create the label model and set the properties
Object label5Model = xMultiServiceFactory.createInstance(
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index c2f966c..3500ab0 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -184,7 +184,7 @@ public class ParcelBrowseNode extends PropertySet
String newName;
if (aParams == null || aParams.length < 1 ||
- AnyConverter.isString(aParams[0]) == false)
+ !AnyConverter.isString(aParams[0]))
{
String prompt = "Enter name for new Script";
String title = "Create Script";
@@ -269,7 +269,7 @@ public class ParcelBrowseNode extends PropertySet
{
if (aParams == null || aParams.length < 1 ||
- AnyConverter.isString(aParams[0]) == false)
+ !AnyConverter.isString(aParams[0]))
{
String prompt = "Enter new name for Library";
String title = "Rename Library";
diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 5bb65b8..7722ce4 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -183,7 +183,7 @@ public class ProviderBrowseNode extends PropertySet
String name;
if (aParams == null || aParams.length < 1 ||
- AnyConverter.isString(aParams[0]) == false)
+ !AnyConverter.isString(aParams[0]))
{
String prompt = "Enter name for new Parcel";
String title = "Create Parcel";
diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index 1e5df71..5c744b1 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -83,7 +83,7 @@ public class ScriptBrowseNode extends PropertySet
LogUtils.DEBUG("** caught exception getting script data for " + name + " ->" + e.toString() );
}
- if (provider.hasScriptEditor() == true)
+ if (provider.hasScriptEditor())
{
this.editable = true;
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 5b0209a..09535b4 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -193,7 +193,7 @@ public abstract class ScriptProvider
contextUrl = getDocUrlFromModel( m_xModel );
m_container = new ParcelContainer( m_xContext, contextUrl, language );
}
- else if (AnyConverter.isString(aArguments[0]) == true)
+ else if (AnyConverter.isString(aArguments[0]))
{
String originalContextURL = AnyConverter.toString(aArguments[0]);
LogUtils.DEBUG("creating Application, path: " + originalContextURL );
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 7c216e4..bd8f01c 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -55,7 +55,7 @@ public class PlainSourceView extends JScrollPane
so we don't get a storm of DocumentEvents during loading */
ta.getDocument().removeDocumentListener(this);
- if (isModified == false)
+ if (!isModified)
{
int pos = ta.getCaretPosition();
ta.setText(model.getText());
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 34061c4..b66171f 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -314,7 +314,7 @@ public class ScriptEditorForBeanShell
else if (result == JOptionPane.YES_OPTION)
{
boolean saveSuccess = saveTextArea();
- if (saveSuccess == false)
+ if (!saveSuccess)
{
return;
}
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index 208ee47..00d2ab6 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -224,7 +224,7 @@ class ScriptImpl implements XScript
}
- if (editor != null && editor.isModified() == true)
+ if (editor != null && editor.isModified())
{
LogUtils.DEBUG("GOT A MODIFIED SOURCE");
source = editor.getText();
diff --git a/scripting/java/org/openoffice/idesupport/CommandLineTools.java b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
index 5cb8d5f..0b4747d 100644
--- a/scripting/java/org/openoffice/idesupport/CommandLineTools.java
+++ b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
@@ -63,7 +63,7 @@ public class CommandLineTools {
}
File officeDir = new File(officePath);
- if (officeDir.exists() == false || officeDir.isDirectory() == false)
+ if (!officeDir.exists() || !officeDir.isDirectory())
{
driver.fatalUsage(
"Error: Office Installation path not valid: " + officePath);
@@ -249,20 +249,20 @@ public class CommandLineTools {
public void execute() throws Exception {
- if (basedir.isDirectory() != true) {
+ if (!basedir.isDirectory()) {
throw new Exception(basedir.getName() + " is not a directory");
}
- else if (contents.exists() != true) {
+ else if (!contents.exists()) {
throw new Exception(basedir.getName() +
" does not contain a Contents directory");
}
- if (language == null && parcelxml.exists() == false) {
+ if (language == null && !parcelxml.exists()) {
throw new Exception(parcelxml.getName() + " not found and language " +
"not specified");
}
- if (language != null && parcelxml.exists() == true) {
+ if (language != null && parcelxml.exists()) {
ParcelDescriptor desc;
String desclang = "";
@@ -308,7 +308,7 @@ public class CommandLineTools {
desc.write();
}
else {
- if (parcelxml.exists() == false)
+ if (!parcelxml.exists())
throw new Exception("No valid scripts found");
}
diff --git a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java
index bf39f2e..0fa051c 100644
--- a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java
+++ b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java
@@ -39,8 +39,8 @@ public class ExtensionFinder implements MethodFinder {
ArrayList<ScriptEntry> files = new ArrayList<ScriptEntry>(10);
ScriptEntry[] empty = new ScriptEntry[0];
- if (basedir == null || basedir.exists() == false ||
- basedir.isDirectory() == false)
+ if (basedir == null || !basedir.exists() ||
+ !basedir.isDirectory())
return empty;
parcelName = basedir.getName();
diff --git a/scripting/java/org/openoffice/idesupport/JavaFinder.java b/scripting/java/org/openoffice/idesupport/JavaFinder.java
index 1594b9f..f21cf3b 100644
--- a/scripting/java/org/openoffice/idesupport/JavaFinder.java
+++ b/scripting/java/org/openoffice/idesupport/JavaFinder.java
@@ -60,8 +60,8 @@ public class JavaFinder implements MethodFinder {
ArrayList<ScriptEntry> result = new ArrayList<ScriptEntry>(10);
ScriptEntry[] empty = new ScriptEntry[0];
- if (basedir == null || basedir.exists() == false ||
- basedir.isDirectory() == false)
+ if (basedir == null || !basedir.exists() ||
+ !basedir.isDirectory())
return empty;
parcelName = basedir.getName();
@@ -213,7 +213,7 @@ public class JavaFinder implements MethodFinder {
boolean finished = false;
- for (int j = 0; j < javaFiles.size() && finished == false; j++)
+ for (int j = 0; j < javaFiles.size() && !finished; j++)
{
File javaFile = javaFiles.get(j);
String javaName = javaFile.getName();
diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
index 30ad0bb..a6a841f 100644
--- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
+++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
@@ -31,14 +31,14 @@ import java.util.StringTokenizer;
public class SVersionRCFile {
private static final String DEFAULT_NAME =
- System.getProperty("os.name").startsWith("Windows") == true ?
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list