java: avoid unnecessary comparisons in boolean expressions

i.e. stuff like "x == true"

Change-Id: Ib82a4a30e736df392405332fa197b588482cffcf

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 ) {}

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 )
             {

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);

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);

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;
         }

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;

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);
     }
 

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 );
     }
 }
 

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 );
     }
 }
 

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.");

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");

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");

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");

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));

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.");

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

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
             {

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);
         }
 

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!

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);

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.