From 730deb782ba86d401fd872a5ba8eec5876017c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Walter?= Date: Mon, 31 Mar 2014 16:01:39 +0000 Subject: [PATCH] performance issue: call toString() on a String object. This is entirely redundant. git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1583358 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/hssf/record/WriteAccessRecord.java | 2 +- .../org/apache/poi/hssf/usermodel/TestBugs.java | 2 +- .../apache/poi/hssf/usermodel/TestEscherGraphics.java | 2 +- .../poi/hssf/usermodel/TestEscherGraphics2d.java | 2 +- .../poi/ss/formula/atp/TestNetworkdaysFunction.java | 10 +++++----- .../apache/poi/ss/formula/atp/TestWorkdayFunction.java | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java b/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java index f87373b1a..130f266c3 100644 --- a/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java +++ b/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java @@ -122,7 +122,7 @@ public final class WriteAccessRecord extends StandardRecord { StringBuffer buffer = new StringBuffer(); buffer.append("[WRITEACCESS]\n"); - buffer.append(" .name = ").append(field_1_username.toString()).append("\n"); + buffer.append(" .name = ").append(field_1_username).append("\n"); buffer.append("[/WRITEACCESS]\n"); return buffer.toString(); } diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java index 4e325f510..755adb679 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java @@ -1622,7 +1622,7 @@ public final class TestBugs extends BaseTestBugzillaIssues { HSSFSheet s = wb.getSheetAt(0); HSSFCell cell1 = s.getRow(0).getCell(0); - assertEquals("test ", cell1.getStringCellValue().toString()); + assertEquals("test ", cell1.getStringCellValue()); HSSFCell cell2 = s.getRow(0).getCell(1); assertEquals(1.0, cell2.getNumericCellValue(), 0.0); diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java b/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java index a7ecbe53c..afeee14ed 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java @@ -91,7 +91,7 @@ public final class TestEscherGraphics extends TestCase { public void testDrawString() { graphics.drawString("This is a test", 10, 10); HSSFTextbox t = (HSSFTextbox) escherGroupA.getChildren().get(0); - assertEquals("This is a test", t.getString().getString().toString()); + assertEquals("This is a test", t.getString().getString()); } public void testGetDataBackAgain() throws Exception { diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java b/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java index ea098aff7..a16033efb 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java @@ -44,7 +44,7 @@ public final class TestEscherGraphics2d extends TestCase { public void testDrawString() { graphics.drawString("This is a test", 10, 10); HSSFTextbox t = (HSSFTextbox) escherGroup.getChildren().get(0); - assertEquals("This is a test", t.getString().getString().toString()); + assertEquals("This is a test", t.getString()); // Check that with a valid font, it's still ok Font font = new Font("Forte", Font.PLAIN, 12); diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java b/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java index 8e9e7366c..594926fe2 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java @@ -78,24 +78,24 @@ public class TestNetworkdaysFunction extends TestCase { } public void testFailWhenStartDateAfterEndDate() { - assertEquals(NAME_INVALID, NetworkdaysFunction.instance.evaluate(new ValueEval[]{ new StringEval(END_DATE.toString()), - new StringEval(STARTING_DATE.toString()) }, EC)); + assertEquals(NAME_INVALID, NetworkdaysFunction.instance.evaluate(new ValueEval[]{ new StringEval(END_DATE), + new StringEval(STARTING_DATE) }, EC)); } public void testReturnNetworkdays() { assertEquals(108, (int) ((NumericValueEval) NetworkdaysFunction.instance.evaluate(new ValueEval[]{ - new StringEval(STARTING_DATE.toString()), new StringEval(END_DATE.toString()) }, EC)).getNumberValue()); + new StringEval(STARTING_DATE), new StringEval(END_DATE) }, EC)).getNumberValue()); } public void testReturnNetworkdaysWithAHoliday() { assertEquals(107, (int) ((NumericValueEval) NetworkdaysFunction.instance.evaluate(new ValueEval[]{ - new StringEval(STARTING_DATE.toString()), new StringEval(END_DATE.toString()), new StringEval(FIRST_HOLIDAY.toString()) }, + new StringEval(STARTING_DATE), new StringEval(END_DATE), new StringEval(FIRST_HOLIDAY) }, EC)).getNumberValue()); } public void testReturnNetworkdaysWithManyHolidays() { assertEquals(105, (int) ((NumericValueEval) NetworkdaysFunction.instance.evaluate(new ValueEval[]{ - new StringEval(STARTING_DATE.toString()), new StringEval(END_DATE.toString()), + new StringEval(STARTING_DATE), new StringEval(END_DATE), new MockAreaEval(FIRST_HOLIDAY, SECOND_HOLIDAY, THIRD_HOLIDAY) }, EC)).getNumberValue()); } diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java index b71e0c312..77f2d9ed9 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java @@ -82,7 +82,7 @@ public class TestWorkdayFunction extends TestCase { public void testReturnWorkdays() { assertEquals(new Date(109, APRIL, 30), DateUtil.getJavaDate(((NumberEval) WorkdayFunction.instance.evaluate(new ValueEval[]{ - new StringEval(STARTING_DATE.toString()), new NumberEval(151) }, EC)).getNumberValue())); + new StringEval(STARTING_DATE), new NumberEval(151) }, EC)).getNumberValue())); } public void testReturnWorkdaysSpanningAWeekendSubtractingDays() { @@ -127,18 +127,18 @@ public class TestWorkdayFunction extends TestCase { public void testReturnWorkdaysWithDaysTruncated() { assertEquals(new Date(109, APRIL, 30), DateUtil.getJavaDate(((NumberEval) WorkdayFunction.instance.evaluate(new ValueEval[]{ - new StringEval(STARTING_DATE.toString()), new NumberEval(151.99999) }, EC)).getNumberValue())); + new StringEval(STARTING_DATE), new NumberEval(151.99999) }, EC)).getNumberValue())); } public void testReturnRetroativeWorkday() { assertEquals(new Date(108, SEPTEMBER, 23), DateUtil.getJavaDate(((NumberEval) WorkdayFunction.instance.evaluate(new ValueEval[]{ - new StringEval(STARTING_DATE.toString()), new NumberEval(-5), new StringEval(RETROATIVE_HOLIDAY.toString()) }, EC)) + new StringEval(STARTING_DATE), new NumberEval(-5), new StringEval(RETROATIVE_HOLIDAY) }, EC)) .getNumberValue())); } public void testReturnNetworkdaysWithManyHolidays() { assertEquals(new Date(109, MAY, 5), DateUtil.getJavaDate(((NumberEval) WorkdayFunction.instance.evaluate(new ValueEval[]{ - new StringEval(STARTING_DATE.toString()), new NumberEval(151), + new StringEval(STARTING_DATE), new NumberEval(151), new MockAreaEval(FIRST_HOLIDAY, SECOND_HOLIDAY, THIRD_HOLIDAY) }, EC)).getNumberValue())); }