avik 2003/10/13 09:45:02
Modified: src/java/org/apache/poi/hssf/usermodel Tag: REL_2_BRANCH
HSSFWorkbook.java
src/testcases/org/apache/poi/hssf/usermodel Tag:
REL_2_BRANCH TestCloneSheet.java
Log:
Sheet naming checks caused a test failure in cloneSheet.
CloneSheet used an invalid character, which we now dont allow! Corrected.
Good thing we have tests!!
Revision Changes Path
No revision
No revision
1.24.2.4 +5 -1
jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
Index: HSSFWorkbook.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -u -r1.24.2.3 -r1.24.2.4
--- HSSFWorkbook.java 9 Oct 2003 19:21:56 -0000 1.24.2.3
+++ HSSFWorkbook.java 13 Oct 2003 16:45:01 -0000 1.24.2.4
@@ -384,7 +384,11 @@
windowTwo.setPaged(sheets.size() == 1);
sheets.add(clonedSheet);
- workbook.setSheetName(sheets.size()-1, srcName+"[1]");
+ if (srcName.length()<28) {
+ workbook.setSheetName(sheets.size()-1, srcName+"(2)");
+ }else {
+ workbook.setSheetName(sheets.size()-1,srcName.substring(0,28)+"(2)");
+ }
return clonedSheet;
}
return null;
No revision
No revision
1.2.2.1 +1 -1
jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java
Index: TestCloneSheet.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TestCloneSheet.java 30 Apr 2003 04:38:58 -0000 1.2
+++ TestCloneSheet.java 13 Oct 2003 16:45:01 -0000 1.2.2.1
@@ -79,7 +79,7 @@
s.addMergedRegion(new
Region((short)0,(short)0,(short)1,(short)1));
b.cloneSheet(0);
}
- catch(Exception e){fail(e.getMessage());}
+ catch(Exception e){e.printStackTrace();fail(e.getMessage());}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
