diff options
10 files changed, 15 insertions, 16 deletions
diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index c700000d7d8f..76136e6fb04d 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -331,7 +331,7 @@ public class AccessibilityTools { XAccessibleContext.class, AC); if (xAC != null) { - return "" + xAC.getAccessibleRole() + "," + + return xAC.getAccessibleRole() + "," + xAC.getAccessibleName() + "(" + xAC.getAccessibleDescription() + "):"; } @@ -345,7 +345,7 @@ public class AccessibilityTools { xAC = xA.getAccessibleContext(); - return "" + xAC.getAccessibleRole() + "," + xAC.getAccessibleName() + + return xAC.getAccessibleRole() + "," + xAC.getAccessibleName() + "(" + xAC.getAccessibleDescription() + ")"; } diff --git a/qadevOOo/runner/util/RegistryTools.java b/qadevOOo/runner/util/RegistryTools.java index 65eacf4dad94..72ef5e74370d 100644 --- a/qadevOOo/runner/util/RegistryTools.java +++ b/qadevOOo/runner/util/RegistryTools.java @@ -321,7 +321,7 @@ public class RegistryTools { out.print("[BINARY] = {") ; byte[] bin = key.getBinaryValue() ; for (int i = 0; i < bin.length; i++) - out.print("" + bin[i] + ",") ; + out.print(bin[i] + ",") ; out.println("}") ; } else if (type.equals(RegistryValueType.ASCIILIST)) { @@ -342,7 +342,7 @@ public class RegistryTools { out.print("[LONGLIST] = {") ; int[] list = key.getLongListValue() ; for (int i = 0; i < list.length; i++) - out.print("" + list[i] + ",") ; + out.print(list[i] + ",") ; out.println("}") ; } else { out.println("") ; diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java index 927658b69bbb..cabf818af527 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java @@ -64,7 +64,7 @@ public class _XAccessibleContext extends MultiMethodTest { */ public void _getAccessibleChildCount() { childCount = oObj.getAccessibleChildCount(); - log.println("" + childCount + " children found."); + log.println(childCount + " children found."); tRes.tested("getAccessibleChildCount()", childCount > -1); } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index e4362339f976..63de455e43c6 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -87,7 +87,7 @@ public class _XAccessibleValue extends MultiMethodTest { } if (curVal < minVal || maxVal < curVal) { - log.println("" + (curVal - minVal) + "," + (maxVal - curVal)); + log.println((curVal - minVal) + "," + (maxVal - curVal)); log.println("Current value " + curVal + " is not in range [" + minVal + "," + maxVal + "]"); result = false; diff --git a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java index cd8ef6b894d6..dcdca9f0a684 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java +++ b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java @@ -574,7 +574,7 @@ public class _XBreakIterator extends MultiMethodTest { locale, charType); iPos = endPos; vCharBlockBounds.add(new Boundary(startPos, endPos)); - log.println("" + vCharBlockBounds.size() + "). Bounds: [" + log.println(vCharBlockBounds.size() + "). Bounds: [" + startPos + "," + endPos + "]; Type = " + charType); vCharBlockTypes.add(Short.valueOf(charType)); } diff --git a/qadevOOo/tests/java/ifc/table/_XTableColumns.java b/qadevOOo/tests/java/ifc/table/_XTableColumns.java index dbe675356d71..d0d1b03bf66e 100644 --- a/qadevOOo/tests/java/ifc/table/_XTableColumns.java +++ b/qadevOOo/tests/java/ifc/table/_XTableColumns.java @@ -327,8 +327,8 @@ public class _XTableColumns extends MultiMethodTest { throws com.sun.star.lang.IndexOutOfBoundsException { for (int i = 0; i <= lastColumn && i < 3; i++) { - setCellText(xRange.getCellByPosition(i, 0), "" + i + "a"); - setCellText(xRange.getCellByPosition(i, 1), "" + i + "b"); + setCellText(xRange.getCellByPosition(i, 0), i + "a"); + setCellText(xRange.getCellByPosition(i, 1), i + "b"); } for (int i = 3; i <= lastColumn && i < 10; i++) { @@ -355,7 +355,7 @@ public class _XTableColumns extends MultiMethodTest { String c1 = getCellText(xCellRange.getCellByPosition(col, 0)); String c2 = getCellText(xCellRange.getCellByPosition(col, 1)); - if (!((""+ idx + "a").equals(c1) && (""+ idx + "b").equals(c2))) { + if (!((idx + "a").equals(c1) && (idx + "b").equals(c2))) { log.println("FAILED for column " + col + " and index " + idx + "(" + c1 + "," + c2 + ")"); diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java index 89af4ba101d5..4a5c0763461a 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponent.java +++ b/testtools/com/sun/star/comp/bridge/TestComponent.java @@ -887,7 +887,7 @@ public class TestComponent { checkEqual(33, multi.fn33()); checkEqual(41 * 4, multi.fn41(4)); checkEqual(61 * 6, multi.fn61(6)); - checkEqual("62" + "", multi.fn62("")); + checkEqual("62", multi.fn62("")); checkEqual(71 * 7, multi.fn71(7)); checkEqual("72" + "g", multi.fn72("g")); checkEqual(73, multi.fn73()); diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java index 112f96865e83..e750ab0cb4d6 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java @@ -63,7 +63,7 @@ public class _XAccessibleContext { */ public boolean _getAccessibleChildCount() { childCount = oObj.getAccessibleChildCount(); - System.out.println("" + childCount + " children found."); + System.out.println(childCount + " children found."); return childCount > -1; } diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java index b18a405e3be0..4d54ef1a04f6 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java @@ -959,7 +959,7 @@ public class _XAccessibleText { try { System.out.println("copyText(0,chCount):"); locRes = oObj.copyText(0, chCount); - System.out.println(""+locRes); + System.out.println(locRes); res &= locRes; String cbText = null; @@ -976,7 +976,7 @@ public class _XAccessibleText { if (chCount > 2) { System.out.println("copyText(1,chCount-1):"); locRes = oObj.copyText(1, chCount - 1); - System.out.println(""+locRes); + System.out.println(locRes); res &= locRes; try { diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java index b8bf1a2217b5..21902535a9d6 100644 --- a/toolkit/test/accessibility/AccessibleTextHandler.java +++ b/toolkit/test/accessibility/AccessibleTextHandler.java @@ -166,8 +166,7 @@ class AccessibleTextHandler extends NodeHandler { return "[" + nStart + "," + nEnd + "] " + "\"" + sWord + "\" \t" - + "(" + sBefore + "," - + "" + sBehind + ")"; + + "(" + sBefore + "," + sBehind + ")"; } /** Create a text node that lists all strings of a particular text type |