moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

More unit tests for column conversion, and avoid the use of Math.pow based on the suggestion from github-6

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1516983 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2013-08-23 19:00:01 +00:00
parent b79d4fda52
commit 673864cdc5
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/apache/poi/ss/util/CellReference.java
View File

@ -170,22 +170,19 @@ public class CellReference {
* @return zero based column index * @return zero based column index
*/ */
public static int convertColStringToIndex(String ref) { public static int convertColStringToIndex(String ref) {
int pos = 0;
int retval=0; int retval=0;
for (int k = ref.length()-1; k >= 0; k--) { char[] refs = ref.toUpperCase().toCharArray();
char thechar = ref.charAt(k); for (int k=0; k<refs.length; k++) {
char thechar = refs[k];
if (thechar == ABSOLUTE_REFERENCE_MARKER) { if (thechar == ABSOLUTE_REFERENCE_MARKER) {
if (k != 0) { if (k != 0) {
throw new IllegalArgumentException("Bad col ref format '" + ref + "'"); throw new IllegalArgumentException("Bad col ref format '" + ref + "'");
} }
break; continue;
} }
// Character.getNumericValue() returns the values
// 10-35 for the letter A-Z // Character is uppercase letter, find relative value to A
int shift = (int)Math.pow(26, pos); retval = (retval * 26) + (thechar - 'A' + 1);
retval += (Character.getNumericValue(thechar)-9) * shift;
pos++;
} }
return retval-1; return retval-1;
} }

11
src/testcases/org/apache/poi/hssf/util/TestCellReference.java
View File

@ -44,6 +44,17 @@ public final class TestCellReference extends TestCase {
assertEquals("ZZ", CellReference.convertNumToColString(701)); assertEquals("ZZ", CellReference.convertNumToColString(701));
assertEquals("AAA", CellReference.convertNumToColString(702)); assertEquals("AAA", CellReference.convertNumToColString(702));
assertEquals("ZZZ", CellReference.convertNumToColString(18277)); assertEquals("ZZZ", CellReference.convertNumToColString(18277));
// Absolute references are allowed for the string ones
assertEquals(0, CellReference.convertColStringToIndex("$A"));
assertEquals(25, CellReference.convertColStringToIndex("$Z"));
assertEquals(26, CellReference.convertColStringToIndex("$AA"));
// $ sign isn't allowed elsewhere though
try {
CellReference.convertColStringToIndex("A$B$");
fail("Column reference is invalid and shouldn't be accepted");
} catch (IllegalArgumentException e) {}
} }
public void testAbsRef1(){ public void testAbsRef1(){