java: variable cannot be null

remove null check where null-analyis reveals the variable cannot be null

Change-Id: Ied0a24665514bbf68c2ed5f15af9e5c2232a8033

jurt/com/sun/star/uno/AnyConverter.java

@@ -621,7 +621,7 @@ public class AnyConverter
                 break;
             case TypeClass.ENUM_value:
                 if (tc == TypeClass.ENUM_value &&
-                    (null == destTClass || destType.equals( type ) /* optional destType */))
+                    (destType.equals( type ) /* optional destType */))
                 {
                     return object;
                 }

qadevOOo/runner/base/java_fat.java

@@ -181,7 +181,7 @@ public class java_fat implements TestBase
                     aSubEntry.UserDefinedParams = m_aParams;
                     aSubEntry.Logger = ifclog;
 
-                    if ((tEnv == null) || tEnv.isDisposed())
+                    if (tEnv.isDisposed())
                     {
                         closeExistingOffice();
                         tEnv = getEnv(entry, m_aParams);

qadevOOo/runner/stats/SQLExecution.java

@@ -242,8 +242,6 @@ public class SQLExecution {
                 }
             }
         }
-        if (!update && sqlOutput == null)
-            return false;
         return true;
     }
 

qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer.java

@@ -60,13 +60,13 @@ public class _XCellRangeReferrer extends MultiMethodTest {
             ("Relation 'DATAAREA' not found"));
 
         XCellRange cr = oObj.getReferredCells();
-        log.println(cr.toString());
 
         if (cr == null) {
             log.println("getReferredCells returned NULL.");
             tRes.tested("getReferredCells()", false);
             return;
         }
+        log.println(cr.toString());
 
         XCellRangeAddressable xCRA = UnoRuntime.queryInterface(XCellRangeAddressable.class, cr);
 

qadevOOo/tests/java/ifc/util/_XChangesBatch.java

@@ -66,11 +66,11 @@ public class _XChangesBatch extends MultiMethodTest {
 
         if (changeElement == null || originalElement == null || elementName == null || (xProp == null && xNameReplace == null)) {
             log.println(
-                changeElement == null?"Missing property 'XChangesBatch.ChangeElement'\n":"" +
-                originalElement == null?"Missing property 'XChangesBatch.OriginalElement'\n":"" +
-                elementName == null?"Missing property 'XChangesBatch.PropertyName'\n":"" +
-                xProp == null?"Missing property 'XChangesBatch.PropertySet'":"" +
-                xNameReplace == null?"Missing property 'XChangesBatch.NameReplace'":""
+                (changeElement == null?"Missing property 'XChangesBatch.ChangeElement'\n":"") +
+                (originalElement == null?"Missing property 'XChangesBatch.OriginalElement'\n":"") +
+                (elementName == null?"Missing property 'XChangesBatch.PropertyName'\n":"") +
+                (xProp == null?"Missing property 'XChangesBatch.PropertySet'":"") +
+                (xNameReplace == null?"Missing property 'XChangesBatch.NameReplace'":"")
             );
             throw new StatusException("Some needed object relations are missing.", new Exception());
         }

qadevOOo/tests/java/ifc/util/_XChangesNotifier.java

@@ -112,12 +112,12 @@ public class _XChangesNotifier extends MultiMethodTest {
 
         if (changeElement == null || originalElement == null || elementName == null || (xProp == null && xNameReplace == null) || xBatch == null) {
             log.println(
-                changeElement == null?"Missing property 'XChangesNotifier.ChangeElement'\n":"" +
-                originalElement == null?"Missing property 'XChangesNotifier.OriginalElement'\n":"" +
-                elementName == null?"Missing property 'XChangesNotifier.PropertyName'\n":"" +
-                xProp == null?"Missing property 'XChangesNotifier.PropertySet'":"" +
-                xNameReplace == null?"Missing property 'XChangesNotifier.NameReplace'":"" +
-                xBatch == null?"Missing property 'XChangesNotifier.ChangesBatch'":""
+                (changeElement == null?"Missing property 'XChangesNotifier.ChangeElement'\n":"") +
+                (originalElement == null?"Missing property 'XChangesNotifier.OriginalElement'\n":"") +
+                (elementName == null?"Missing property 'XChangesNotifier.PropertyName'\n":"") +
+                (xProp == null?"Missing property 'XChangesNotifier.PropertySet'":"") +
+                (xNameReplace == null?"Missing property 'XChangesNotifier.NameReplace'":"") +
+                (xBatch == null?"Missing property 'XChangesNotifier.ChangesBatch'":"")
             );
             throw new StatusException("Some needed object relations are missing.", new Exception());
         }

qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java

@@ -155,7 +155,6 @@ public class ScDataPilotTableObj extends TestCase {
             e.printStackTrace(log);
             throw new StatusException( "Couldn't get a spreadsheet", e);
         }
-        log.println("Getting sheet - " + (oSheet == null ? "FAILED" : "OK"));
         try {
             log.println("Filing a table");
             for (int i = 1; i < 6; i++) {

qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java

@@ -166,9 +166,6 @@ public class ScDataPilotTablesObj extends TestCase {
 
         oObj = DPT;
 
-        log.println("Creating object - " +
-                                    ((oObj == null) ? "FAILED" : "OK"));
-
         TestEnvironment tEnv = new TestEnvironment( oObj );
 
         // Other parameters required for interface tests

qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java

@@ -131,9 +131,6 @@ public class ScIndexEnumeration_DataPilotTablesEnumeration extends TestCase {
 
         oObj = DPT;
 
-        log.println("Creating object - " +
-                                    ((oObj == null) ? "FAILED" : "OK"));
-
         XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class,oObj);
 
         oObj = ea.createEnumeration();

sc/qa/complex/calcPreview/ViewForwarder.java

@@ -948,11 +948,6 @@ public class ViewForwarder {
             System.out.println("While waiting :" + e) ;
         }
 
-        if (xComp == null) {
-            fail("loading document failed.");
-            return;
-        }
-
         xSpreadsheetDoc = UnoRuntime.queryInterface(
                                             XSpreadsheetDocument.class, xComp);
         XModel aModel =

ucb/qa/complex/tdoc/_XCommandProcessor.java

@@ -209,26 +209,21 @@ public class _XCommandProcessor {
      * </ul>
      */
     public boolean _abort() {
-        //executeMethod("createCommandIdentifier()");
 
-//        Command command = null;//(Command)tEnv.getObjRelation(
-                //"XCommandProcessor.AbortCommand");
         Command command = new Command("getCommandInfo", -1, null);
 
-        if (command == null) {
-            String commandName = "globalTransfer";
+        String commandName = "globalTransfer";
 
-            String srcURL = util.utils.getFullTestURL("solibrary.jar") ;
-            String tmpURL = util.utils.getOfficeTemp(xMSF) ;
-            log.println("Copying '" + srcURL + "' to '" + tmpURL) ;
+        String srcURL = util.utils.getFullTestURL("solibrary.jar") ;
+        String tmpURL = util.utils.getOfficeTemp(xMSF) ;
+        log.println("Copying '" + srcURL + "' to '" + tmpURL) ;
 
-            GlobalTransferCommandArgument arg = new
-                GlobalTransferCommandArgument(
-                    TransferCommandOperation.COPY, srcURL,
-                        tmpURL, "", NameClash.OVERWRITE);
+        GlobalTransferCommandArgument arg = new
+            GlobalTransferCommandArgument(
+                TransferCommandOperation.COPY, srcURL,
+                    tmpURL, "", NameClash.OVERWRITE);
 
-            command = new Command(commandName, -1, arg);
-        }
+        command = new Command(commandName, -1, arg);
 
         Thread aborter = new Thread() {
             public void run() {