diff options
93 files changed, 225 insertions, 226 deletions
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 491bd0865bbd..bfcbd94b36f0 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 9bbf6ad07e6e..3c2c17e2ac3a 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 e4700445d8bf..9c0eb7d6c98d 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 cc95099ecf21..2c35e647e2b0 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 dfd3fcaa5eb8..730c45f65eb9 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 caf5cdc9b2f3..650be99c87c3 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 ca72af9c81ac..227dcdeff26e 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 0031e1a576b3..fc7640ef23ec 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 a0f69d850923..3df517eec804 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 0c517ca68347..5afc6385ea5d 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 976968f1a6a0..e76825e245d8 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 331c37618b1c..22e664170486 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 c3f950b3031d..8653af4e03be 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 f5408545b6b5..2e48cd99a010 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 6177a82e53db..81806f6b94ac 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 6210d72f3eb3..525fb2263148 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 82f3cf3cd072..edef9c5445a3 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 d21f8d36705b..1ef5ef3c90a6 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 002c6442974f..e8d5221dc74e 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 bffa7321678a..49de6144f4d5 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 77b48abb99e4..deaccb5db44f 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 317022d8190c..6fbf3c7afe72 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 fdc82ea24e6d..13fad3c02d21 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 f12b2cf2d1d8..c4816fa3a9d9 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 ce221117201a..dbefb717b0f4 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 16d93269ad97..fb1e4a6d3782 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 ceded40f2e61..8d8d698a5c89 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 a01fb242c9de..1dc59d318af1 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 a289359e51b6..9b5962ebf65b 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 dcf80302105a..343ca54200f2 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 7187ec5f52a3..588814ea7d90 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 2adce7504d97..a6953157e8c2 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 ee338d3e09d5..26cd831a7042 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 f449b578849f..5a6f02461a4e 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 9c23baf7ad9a..76684052dcf0 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 a6f506e318fb..d52add3fb27c 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 7ccf7d0370f3..92dc05ed82ac 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 9cbb1325a530..38273ecf9c4e 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 8b8e31d063e6..0fa57a8fd015 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 2acb91154ae8..6ba7e6cdfdd6 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 78551e6f446b..ac4780021234 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 2e2da218580e..c94cfb8b4fa4 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 1d3081af6794..aeebf6927588 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 bca3b38efb15..7dc60e8cac71 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 418c06a6b3d1..042b2ea8b137 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 1f0643d2fc9f..6b21841b1802 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 49e4814257a7..2554d16e0704 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 60bebf87ee0e..4ca5605761d8 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 ff33c8c1442e..c42fb807f1fb 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 325f25692bf6..c15b5d093622 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 a31f9b93c5ff..98ef2463ae10 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 ca5ad0110c50..62205401e4cd 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 8aa334a8bb1d..fb835587f34b 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 97dc7c8db94d..0a7159a8426f 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 02dfd150ed1f..82e5ef90fb59 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 8da530161ae7..6ed77aec6821 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 b1bdfff645ad..a1088260f470 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 c2f966cbd23f..3500ab0b1d16 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 5bb65b861f29..7722ce45faad 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 1e5df7130dec..5c744b1bdcd6 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 5b0209a32c4d..09535b48880f 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 7c216e494fbb..bd8f01c9193a 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 34061c473847..b66171fd9a26 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 208ee4766d67..00d2ab679290 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 5cb8d5f51b55..0b4747d1ccf9 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 bf39f2e519d1..0fa051c5af67 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 1594b9fd37c5..f21cf3b52338 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 30ad0bb81aca..a6a841f3b7cb 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 ? + System.getProperty("os.name").startsWith("Windows") ? System.getProperty("user.home") + File.separator + "Application Data" + File.separator + "sversion.ini" : System.getProperty("user.home") + File.separator + ".sversionrc"; public static final String FILE_URL_PREFIX = - System.getProperty("os.name").startsWith("Windows") == true ? + System.getProperty("os.name").startsWith("Windows") ? "file:///" : "file://"; @@ -124,10 +124,10 @@ public class SVersionRCFile { String s; while ((s = br.readLine()) != null && - (s.equals(VERSIONS_LINE)) != true) {} + !(s.equals(VERSIONS_LINE))) {} while ((s = br.readLine()) != null && - (s.equals("")) != true) { + !(s.equals(""))) { StringTokenizer tokens = new StringTokenizer(s, "="); int count = tokens.countTokens(); diff --git a/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/scripting/java/org/openoffice/idesupport/xml/Manifest.java index 581cadae51d6..263de3d97b29 100644 --- a/scripting/java/org/openoffice/idesupport/xml/Manifest.java +++ b/scripting/java/org/openoffice/idesupport/xml/Manifest.java @@ -66,7 +66,7 @@ public class Manifest { } private void ensureBaseElementsExist() { - if (baseElementsExist == false) { + if (!baseElementsExist) { baseElementsExist = true; add("Scripts/", "application/script-parcel"); } diff --git a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java index e1e12fa56d83..9fd7f5da00fd 100644 --- a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java +++ b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java @@ -95,7 +95,7 @@ public class ParcelZipper manifestStream.close(); } } - else if (inEntry.isDirectory() == false) { + else if (!inEntry.isDirectory()) { while ((len = documentStream.read(bytes)) != -1) outStream.write(bytes, 0, len); } @@ -115,7 +115,7 @@ public class ParcelZipper outStream.close(); } - if (document.delete() == false) { + if (!document.delete()) { tmpfile.delete(); throw new IOException("Could not overwrite " + document); } diff --git a/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java b/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java index 1abbafdb6329..b4b2bd8d4fa3 100644 --- a/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java +++ b/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java @@ -151,7 +151,7 @@ public class NetBeansSourceView extends JPanel so we don't get a storm of DocumentEvents during loading */ pane.getDocument().removeDocumentListener(this); - if (isModified == false) + if (!isModified) { pane.setText(model.getText()); } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java index e7da54240c71..015c15cfb54b 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java @@ -85,7 +85,7 @@ public class DeployParcelAction extends CookieAction implements Presenter.Popup if (!langdir.exists()) { boolean response = askIfCreateDirectory(langdir); - if (response == false) { + if (!response) { return; } } @@ -141,7 +141,7 @@ public class DeployParcelAction extends CookieAction implements Presenter.Popup public void run() { boolean result = parcelCookie.deploy(target); - if (result == true && target.isDirectory()) { + if (result && target.isDirectory()) { showNagDialog(); } } @@ -167,7 +167,7 @@ public class DeployParcelAction extends CookieAction implements Presenter.Popup result = false; } - if (result == false) { + if (!result) { String tmp = "Error creating: " + directory.getAbsolutePath(); NotifyDescriptor d2 = new NotifyDescriptor.Message( tmp, NotifyDescriptor.ERROR_MESSAGE); @@ -190,13 +190,13 @@ public class DeployParcelAction extends CookieAction implements Presenter.Popup OfficeSettings settings = OfficeSettings.getDefault(); - if (settings.getWarnAfterDirDeploy() == true) { + if (settings.getWarnAfterDirDeploy()) { NagDialog warning = NagDialog.createInformationDialog( message, "Show this message in future", true); warning.show(); - if (warning.getState() == false) + if (!warning.getState()) settings.setWarnAfterDirDeploy(false); } } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java index b8fe3e6226e4..bf310bc8b2c0 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java @@ -131,7 +131,7 @@ public class ParcelFolderSupport implements ParcelFolderCookie parcelBase.getName() + "." + ParcelZipper.PARCEL_EXTENSION); boolean proceed = configure(); - if (proceed == false) { + if (!proceed) { return; } 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 a019622dbe2c..2cfd316cddde 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java @@ -96,16 +96,16 @@ public class ParcelSupport implements ParcelCookie "Office, please close it before continuing. Click OK to " + "continue deployment."; - if (settings.getWarnBeforeDocDeploy() == true) { + if (settings.getWarnBeforeDocDeploy()) { NagDialog warning = NagDialog.createConfirmationDialog( message, "Show this message in future", true); boolean result = warning.show(); - if (warning.getState() == false) + if (!warning.getState()) settings.setWarnBeforeDocDeploy(false); - if (result == false) + if (!result) return false; } } @@ -114,8 +114,8 @@ public class ParcelSupport implements ParcelCookie getOutputWindowWriter(fo.getName() + " (deploying)"); try { - if (zipper.isOverwriteNeeded(source, target) == true) - if (promptForOverwrite(source, target) == false) + if (!zipper.isOverwriteNeeded(source, target)) + if (!promptForOverwrite(source, target)) return false; } catch (IOException ioe) { diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java index 1a73873cb243..4ec771869fb5 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java @@ -166,7 +166,7 @@ public class OpenOfficeDocFileSystem throws java.beans.PropertyVetoException, java.io.IOException { System.out.println("OpenOfficeDocFileSystem.setDocument: file=\"" + file.toString() + "\""); - if((file.exists() == false) || (file.isFile() == false)) { + if(!file.exists() || !file.isFile()) { IOException ioe = new IOException( file.toString() + " does not exist"); ErrorManager.getDefault().annotate(ioe, NbBundle.getMessage( @@ -372,8 +372,7 @@ System.out.println(" exception: " + ioe.getMessage()); synchronized(cache) { ModifiedStrategy modifiedStrategy = new ModifiedStrategy(); scanDocument(modifiedStrategy); - if((isModified == true) || - (modifiedStrategy.isModified() == true)) + if(isModified || modifiedStrategy.isModified()) { File tmpFile = null; try { @@ -448,7 +447,7 @@ System.out.println(" exception: " + ioe.getMessage()); ZipEntry zEntry = new ZipEntry(name); zEntry.setTime(new Date().getTime()); cEntry = new Entry(zEntry); - if(editableStrategy.evaluate(cEntry) == false) { + if(!editableStrategy.evaluate(cEntry)) { throw new IOException( "cannot create/edit readonly file"); // I18N } @@ -478,7 +477,7 @@ System.out.println(" exception: " + ioe.getMessage()); zEntry.setCrc(crc.getValue()); zEntry.setTime(new Date().getTime()); cEntry = new Entry(zEntry); - if(editableStrategy.evaluate(cEntry) == false) { + if(!editableStrategy.evaluate(cEntry)) { throw new IOException( "cannot create folder"); // I18N } @@ -487,7 +486,7 @@ System.out.println(" exception: " + ioe.getMessage()); cache.put(cEntry.getName(), cEntry); isModified = true; } else { - if(cEntry.isFolder() == false) + if(!cEntry.isFolder()) cEntry = null; } } // synchronized @@ -669,12 +668,12 @@ System.out.println(" exception: " + ioe.getMessage()); throw new IOException( "there is no such a file/folder " + oldName); // I18N } - if(entry.isReadOnly() == true) { + if(entry.isReadOnly()) { throw new IOException( "file/folder " + oldName + " is readonly"); // I18N } entry.rename(nname); - if(editableStrategy.evaluate(entry) == false) { + if(!editableStrategy.evaluate(entry)) { entry.rename(oname); throw new IOException( "cannot create file/folder"); // I18N @@ -833,7 +832,7 @@ System.out.println(" exception: " + ioe.getMessage()); { // do not accept "children" of a file // ignore "read only" part of the filesystem - if(entry.isReadOnly() == false) { + if(!entry.isReadOnly()) { // identify a child if( (entry.getName().length() > 0) && (entry.getName().startsWith(parent))) @@ -972,7 +971,7 @@ System.out.println(" exception: " + ioe.getMessage()); size = entry.getSize(); time = entry.getTime(); // removes tail file separator from a folder name - if((folder == true) && (name.endsWith(SEPARATOR))) { + if(folder && name.endsWith(SEPARATOR)) { name = name.substring( 0, name.length() - SEPARATOR.length()); } @@ -1019,7 +1018,7 @@ System.out.println(" exception: " + ioe.getMessage()); public InputStream getInputStream() throws FileNotFoundException { - return (isFolder() == false)? new FileInputStream(getFile()): null; + return !isFolder() ? new FileInputStream(getFile()) : null; } public OutputStream getOutputStream() @@ -1053,7 +1052,7 @@ System.out.println(" exception: " + ioe.getMessage()); arch.putNextEntry(entry); } else { // file - if(isModified() == false) + if(!isModified()) entry.setTime(getTime()); else entry.setTime(node.lastModified()); @@ -1171,7 +1170,7 @@ System.out.println(" exception: " + ioe.getMessage()); throws IOException { modified = true; - return (isFolder() == false)? new FileOutputStream(getFile()): null; + return !isFolder() ? new FileOutputStream(getFile()) : null; } } } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java index 968173dcefc1..d47481ec39d5 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java @@ -59,7 +59,7 @@ public class OfficeDocumentDataLoader extends UniFileLoader { protected FileObject findPrimaryFile(FileObject fo) { ExtensionList extensions = getExtensions(); - if (extensions.isRegistered(fo) == false) + if (!extensions.isRegistered(fo)) return null; File document = FileUtil.toFile(fo); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java index ced430b451ea..4406f3f903c8 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java @@ -45,8 +45,8 @@ public class ParcelContentsFolderDataLoader extends UniFileLoader { } protected FileObject findPrimaryFile(FileObject fo) { - if (fo.isFolder() == false || - fo.getName().equals(ParcelZipper.CONTENTS_DIRNAME) == false || + if (!fo.isFolder() || + !fo.getName().equals(ParcelZipper.CONTENTS_DIRNAME) || fo.getFileObject(ParcelZipper.PARCEL_DESCRIPTOR_XML) == null) return null; diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java index a6634a28a948..5865f32c2803 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java @@ -66,7 +66,7 @@ public class ParcelDataNode extends DataNode { (ParcelCookie)sourceParcel.getCookie(ParcelCookie.class); parcelCookie.deploy(targetDocument); - if (isCut == true) { + if (isCut) { FileObject fo = sourceParcel.getDataObject().getPrimaryFile(); try { fo.delete(); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java index bf392a4ecd39..c344830b1c27 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java @@ -46,7 +46,7 @@ public class ParcelDescriptorDataObject extends MultiDataObject { CookieSet cookies = getCookieSet(); cookies.add(new ParcelDescriptorEditorSupport(this)); - if (canParse == true) + if (canParse) cookies.add(new ParcelDescriptorParserSupport(getPrimaryFile())); } @@ -55,7 +55,7 @@ public class ParcelDescriptorDataObject extends MultiDataObject { } protected Node createNodeDelegate() { - if (canParse == true) + if (canParse) return new ParcelDescriptorDataNode(this); else return new ParcelDescriptorDataNode(this, Children.LEAF); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java index 3b435fe5b17d..df60b27561c1 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java @@ -52,7 +52,7 @@ public class ParcelFolderDataLoader extends UniFileLoader { } protected FileObject findPrimaryFile(FileObject fo) { - if (fo.isFolder() == false) + if (!fo.isFolder()) return null; FileObject contents = fo.getFileObject(ParcelZipper.CONTENTS_DIRNAME); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java index c65a00f33f5d..e5b0e900162b 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java @@ -48,7 +48,7 @@ public class OfficeDocumentChildren extends Children.Keys } Enumeration parcels = document.getParcels(); - if (parcels.hasMoreElements() != true) { + if (!parcels.hasMoreElements()) { setKeys(Collections.EMPTY_SET); return; } @@ -119,16 +119,16 @@ public class OfficeDocumentChildren extends Children.Keys "Office, please close it before continuing. Click OK to " + "delete this parcel."; - if (settings.getWarnBeforeParcelDelete() == true) { + if (settings.getWarnBeforeParcelDelete()) { NagDialog warning = NagDialog.createConfirmationDialog( message, "Show this message in future", true); boolean result = warning.show(); - if (warning.getState() == false) + if (!warning.getState()) settings.setWarnBeforeParcelDelete(false); - if (result == false) + if (!result) return; } super.destroy(); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java index de74e8b181d3..b26b729455bf 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java @@ -111,7 +111,7 @@ public class FrameworkJarChecker { private static void warnBeforeMount() { OfficeSettings settings = OfficeSettings.getDefault(); - if (settings.getWarnBeforeMount() == false) + if (!settings.getWarnBeforeMount()) return; String message = "The Office Scripting Framework support jar file " + @@ -123,7 +123,7 @@ public class FrameworkJarChecker { NagDialog warning = NagDialog.createInformationDialog( message, prompt, true); - if (warning.getState() == false) { + if (!warning.getState()) { settings.setWarnBeforeMount(false); } } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java index 260b83bac0fb..270b30fde9d9 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java @@ -62,7 +62,7 @@ public class PackageRemover { } } - if (source.delete() == false) { + if (!source.delete()) { tmp.delete(); throw new IOException("Could not overwrite " + source); } diff --git a/scripting/workben/installer/IdeUpdater.java b/scripting/workben/installer/IdeUpdater.java index fe7b700d237d..b35b519abbe3 100644 --- a/scripting/workben/installer/IdeUpdater.java +++ b/scripting/workben/installer/IdeUpdater.java @@ -44,7 +44,7 @@ public class IdeUpdater extends Thread { public IdeUpdater(String installPath, JLabel statusLabel, JProgressBar pBar) { - if (installPath.endsWith(File.separator) == false) + if (!installPath.endsWith(File.separator)) installPath += File.separator; File netbeansLauncher = new File( installPath + "bin" ); diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java index 65b18f61338f..b75d5b38a04e 100644 --- a/scripting/workben/installer/IdeVersion.java +++ b/scripting/workben/installer/IdeVersion.java @@ -155,7 +155,7 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta int len = tableModel.data.size(); for (int i = 0; i < len; i++) { ArrayList<?> list = tableModel.data.get(i); - if (((Boolean)list.get(0)).booleanValue() == true) + if (((Boolean)list.get(0)).booleanValue()) InstallWizard.storeLocation((String)list.get(2)); } } @@ -319,7 +319,7 @@ class MyTableModelIDE extends AbstractTableModel { Iterator iter = data.iterator(); while (iter.hasNext()) { ArrayList<?> row = (ArrayList<?>)iter.next(); - if (((Boolean)row.get(0)).booleanValue() == true) { + if (((Boolean)row.get(0)).booleanValue()) { return true; } } diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java index 703871dd67c7..d9bab179344f 100644 --- a/scripting/workben/installer/InstUtil.java +++ b/scripting/workben/installer/InstUtil.java @@ -67,7 +67,7 @@ public class InstUtil { boolean result = false; result = checkForSupportedVersion( getNetbeansLocation(), versions ); - if (result == false) + if (!result) System.out.println("No supported version of NetBeans found."); return result; } diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java index 37bc7dde043c..4d125dee8fe6 100644 --- a/scripting/workben/installer/Version.java +++ b/scripting/workben/installer/Version.java @@ -215,7 +215,7 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table int len = tableModel.data.size(); for (int i = 0; i < len; i++) { ArrayList<?> list = tableModel.data.get(i); - if (((Boolean)list.get(0)).booleanValue() == true) + if (((Boolean)list.get(0)).booleanValue()) InstallWizard.storeLocation((String)list.get(2)); } } @@ -334,7 +334,7 @@ class MyTableModel extends AbstractTableModel { Iterator iter = data.iterator(); while (iter.hasNext()) { ArrayList<?> row = (ArrayList<?>)iter.next(); - if (((Boolean)row.get(0)).booleanValue() == true) { + if (((Boolean)row.get(0)).booleanValue()) { return true; } } diff --git a/scripting/workben/installer/ZipData.java b/scripting/workben/installer/ZipData.java index abdf8a6641c2..466f87a6e863 100644 --- a/scripting/workben/installer/ZipData.java +++ b/scripting/workben/installer/ZipData.java @@ -56,7 +56,7 @@ public class ZipData { System.out.println("Unzipping " + entry + " to " + destination); - if (entry.startsWith("/") == false) + if (!entry.startsWith("/")) entry = "/" + entry; in = this.getClass().getResourceAsStream(entry); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java index d95e37cdc815..982cb3f5aa80 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java @@ -89,7 +89,7 @@ public class Convert implements Cloneable { Document inputDoc; - if (toOffice == true) { + if (toOffice) { inputDoc = ci.getPluginFactory().createDeviceDocument(name, is); } else { inputDoc = ci.getPluginFactory().createOfficeDocument(name, is); @@ -115,7 +115,7 @@ public class Convert implements Cloneable { Document inputDoc; - if (toOffice == true) { + if (toOffice) { inputDoc = ci.getPluginFactory().createDeviceDocument(name, is); } else { inputDoc = ci.getPluginFactory().createOfficeDocument(name, is, isZip); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java index 42c6df4fd5ee..db6c9e0e9573 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java @@ -221,7 +221,7 @@ public class EmbeddedXMLObject extends EmbeddedObject { */ @Override void write(OfficeZip zip) throws IOException { - if (hasChanged == true) { + if (hasChanged) { if (contentDOM != null) { zip.setNamedBytes((objName + "/content.xml"), OfficeDocument.docToBytes(contentDOM)); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java index c0f486d83476..a17aae751087 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java @@ -72,7 +72,7 @@ public class DocumentMerge implements MergeAlgorithm { if (difference.getOperation() == Difference.DELETE) { haveDeleteOperation = true; } else if (difference.getOperation() == Difference.ADD && - haveDeleteOperation == true) { + haveDeleteOperation) { throw new MergeException( "Differences array is not sorted. Delete before Add"); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java index 116ec08d052a..693b7babdb93 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java @@ -85,7 +85,7 @@ public class ConverterInfo { String xsltDeserial) throws RegistryException { - if (isValidOfficeType(officeMime.trim()) == false) { + if (!isValidOfficeType(officeMime.trim())) { RegistryException re = new RegistryException( "Invalid office type"); throw re; @@ -162,7 +162,7 @@ public class ConverterInfo { String version, String vendor, String impl) throws RegistryException { - if (isValidOfficeType(officeMime.trim()) == false) { + if (!isValidOfficeType(officeMime.trim())) { RegistryException re = new RegistryException( "Invalid office type"); throw re; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java index bfa23666ee82..2087ce80086b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java @@ -180,7 +180,7 @@ public final class ConverterInfoMgr { public static ConverterInfo findConverterInfo(String deviceMime, String officeMime) { if (deviceMime == null || - ConverterInfo.isValidOfficeType(officeMime) == false) { + !ConverterInfo.isValidOfficeType(officeMime)) { return null; } @@ -284,7 +284,7 @@ public final class ConverterInfoMgr { char c = ' '; boolean exitFlag = false; - while (exitFlag == false) { + while (!exitFlag) { System.out.println("\nMenu:"); System.out.println("(L)oad plug-ins from a jar file"); @@ -340,7 +340,7 @@ public final class ConverterInfoMgr { // Unload by Display Name or Jarfile } else if (c == 'T') { - if (validate== true){ + if (validate){ System.out.println("Validation switched off"); validate=false; } else { @@ -366,7 +366,7 @@ public final class ConverterInfoMgr { rc = ConverterInfoMgr.removeByJar(name); } - if (rc == true) { + if (rc) { System.out.println("Remove successful."); } else { System.out.println("Remove failed."); |