java: remove some unnecessary intermediary object creation

Change-Id: Id4949fa08546e710fbf9bd0c7e3bf62979f29c83

9 files changed, 22 insertions, 28 deletions

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index 84c2a8a6a429..d481fbf21202 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -264,9 +264,8 @@ public class LocalOfficeWindow
         if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW )
         {
             String vendor = System.getProperty("java.vendor");
-            if ((vendor.equals("Sun Microsystems Inc.")
-		 || vendor.equals("Oracle Corporation"))
-                && Boolean.parseBoolean(System.getProperty("sun.awt.xembedserver")))
+            if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation"))
+                && Boolean.getBoolean("sun.awt.xembedserver"))
             {
                 xembed = new NamedValue(
                     "XEMBED",
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 77b1dc64376b..144aea8b975a 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -279,9 +279,9 @@ public class Protocol extends JComponent
 
             // insert line number
             if (m_nLine % MARK_DIFF == 0)
-                impl_generateColoredHTMLCell(sLine, Long.valueOf(m_nLine).toString(), BGCOLOR_LINECOL, FGCOLOR_LINECOL_MARKED, true);
+                impl_generateColoredHTMLCell(sLine, Long.toString(m_nLine), BGCOLOR_LINECOL, FGCOLOR_LINECOL_MARKED, true);
             else
-                impl_generateColoredHTMLCell(sLine, Long.valueOf(m_nLine).toString(), BGCOLOR_LINECOL, FGCOLOR_LINECOL_NORMAL, false);
+                impl_generateColoredHTMLCell(sLine, Long.toString(m_nLine), BGCOLOR_LINECOL, FGCOLOR_LINECOL_NORMAL, false);
 
             // add time stamp
             impl_generateColoredHTMLCell(sLine, m_aStamp.toString()+" ", BGCOLOR_TIMESTAMP, FGCOLOR_TIMESTAMP, false);
diff --git a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
index d827f963744d..3955cb9c5cbf 100644
--- a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
+++ b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
@@ -72,7 +72,7 @@ public class _XURLTransformer extends MultiMethodTest {
 
         url[0].Protocol = "http://";
         url[0].Server = server;
-        url[0].Port = Integer.valueOf(port).shortValue();
+        url[0].Port = Short.parseShort(port);
         url[0].Path = path;
         url[0].Name = name;
         url[0].Arguments = arguments;
@@ -99,7 +99,7 @@ public class _XURLTransformer extends MultiMethodTest {
         url[0].User = user;
         url[0].Password = password;
         url[0].Server = server;
-        url[0].Port = Integer.valueOf(port).shortValue();
+        url[0].Port = Short.parseShort(port);
         url[0].Path = path;
         url[0].Name = name;
         url[0].Main = "ftp://" + user + ":" + password + "@" + server + ":" +
@@ -164,7 +164,7 @@ public class _XURLTransformer extends MultiMethodTest {
             res = false;
         }
 
-        if (url[0].Port != Integer.valueOf(port).shortValue()) {
+        if (url[0].Port != Short.parseShort(port)) {
             log.println("parseStrict works wrong");
             log.println("port field : " + url[0].Port);
             log.println("expected : " + port);
@@ -235,7 +235,7 @@ public class _XURLTransformer extends MultiMethodTest {
             res = false;
         }
 
-        if (url[0].Port != Integer.valueOf(port).shortValue()) {
+        if (url[0].Port != Short.parseShort(port)) {
             log.println("parseStrict works wrong");
             log.println("port field : " + url[0].Port);
             log.println("expected : " + port);
@@ -304,7 +304,7 @@ public class _XURLTransformer extends MultiMethodTest {
             res = false;
         }
 
-        if (url[0].Port != Integer.valueOf(port).shortValue()) {
+        if (url[0].Port != Short.parseShort(port)) {
             log.println("parseSmart works wrong");
             log.println("port field : " + url[0].Port);
             log.println("expected : " + port);
@@ -377,7 +377,7 @@ public class _XURLTransformer extends MultiMethodTest {
             res = false;
         }
 
-        if (url[0].Port != Integer.valueOf(port).shortValue()) {
+        if (url[0].Port != Short.parseShort(port)) {
             log.println("parseSmart works wrong");
             log.println("port field : " + url[0].Port);
             log.println("expected : " + port);
diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
index 5d778e1da650..a9d8505e2f8c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
@@ -182,7 +182,7 @@ public class ScStyleFamilyObj extends TestCase {
         }
 
         log.println( "adding XNameReplaceINDEX as mod relation to environment" );
-        tEnv.addObjRelation("XNameReplaceINDEX", Integer.valueOf(2*THRCNT).toString());
+        tEnv.addObjRelation("XNameReplaceINDEX", Integer.toString(2*THRCNT));
 
         // INSTANCEn : _XNameContainer; _XNameReplace
         log.println( "adding INSTANCEn as mod relation to environment" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java
index 8d34505ee6db..cf84e00af6b8 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java
@@ -166,7 +166,7 @@ public class SwXStyleFamily extends TestCase {
         if ((String)Param.get("THRCNT") != null) {
             THRCNT = Integer.parseInt((String)Param.get("THRCNT"));
         }
-        String nr = Integer.valueOf(THRCNT+1).toString();
+        String nr = Integer.toString(THRCNT+1);
 
         log.println( "adding NameReplaceIndex as mod relation to environment" );
         tEnv.addObjRelation("XNameReplaceINDEX", nr);
diff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.java
index 5921372e8050..9176d5cda8b6 100644
--- a/sc/qa/complex/sc/CalcRTL.java
+++ b/sc/qa/complex/sc/CalcRTL.java
@@ -163,21 +163,16 @@ public class CalcRTL /* extends ComplexTestCase */
         assertTrue("Anchor has changed",
                (previous[0].equals(RL_TB[0]) && previous[0].equals(LR_TB[0])));
         assertEquals("HoriOrientPosition has changed",
-               2100, (Integer.valueOf(previous[1]).intValue() + Integer.valueOf(
-                                                                  RL_TB[1])
-                                                                 .intValue() +
-                   Integer.valueOf(LR_TB[1]).intValue()));
+               2100, Integer.parseInt(previous[1]) + Integer.parseInt(RL_TB[1]) +
+                   Integer.parseInt(LR_TB[1]));
         assertEquals("VertOrientPosition has changed",
-                3*Integer.valueOf(previous[2]).intValue(),
-               (Integer.valueOf(previous[2]).intValue() + Integer.valueOf(
-                                                                  RL_TB[2])
-                                                                 .intValue() +
-                   Integer.valueOf(LR_TB[2]).intValue()));
+                3*Integer.parseInt(previous[2]),
+               (Integer.parseInt(previous[2]) + Integer.parseInt(RL_TB[2]) +
+                   Integer.parseInt(LR_TB[2])));
         assertTrue("x-position hasn't changed",
                (previous[3].equals(LR_TB[3]) &&
-                   ((Integer.valueOf(previous[3]).intValue() * (-1)) -
-                       oShape.getSize().Width != Integer.valueOf(LR_TB[2])
-                                                        .intValue())));
+                   ((Integer.parseInt(previous[3]) * (-1)) -
+                       oShape.getSize().Width != Integer.parseInt(LR_TB[2]))));
         assertTrue("Couldn't close document", closeSpreadsheetDocument());
     }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
index 8be248c332b2..ce16440024e9 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
@@ -226,4 +226,4 @@ public class IteratorRowCompare implements DiffAlgorithm {
 
         return splitRow;
     }
-}
\ No newline at end of file
+}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java
index 6aa6d25bd089..491f1ac13ac4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java
@@ -239,4 +239,4 @@ public final class PositionBaseRowMerge implements NodeMergeAlgorithm {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
index 980e01e0ffc8..d72c702fccc5 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
@@ -119,4 +119,4 @@ public class OfficeUtil implements OfficeConstants {
         Node nodes[] = nodeVec.toArray(new Node[nodeVec.size()]);
         return nodes;
     }
-}
\ No newline at end of file
+}