svn commit: r1554533 - /poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
Author: centic
Date: Tue Dec 31 15:11:44 2013
New Revision: 1554533
URL: http://svn.apache.org/r1554533
Log:
Print out which actual value was out of range
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java?rev=1554533r1=1554532r2=1554533view=diff
==
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java Tue
Dec 31 15:11:44 2013
@@ -256,7 +256,7 @@ public final class HSSFClientAnchor exte
private void checkRange(int value, int minRange, int maxRange, String
varName) {
if (value minRange || value maxRange)
-throw new IllegalArgumentException(varName + must be between +
minRange + and + maxRange);
+throw new IllegalArgumentException(varName + must be between +
minRange + and + maxRange + , but was: + value);
}
@Override
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1554534 - /poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
Author: centic
Date: Tue Dec 31 15:11:59 2013
New Revision: 1554534
URL: http://svn.apache.org/r1554534
Log:
Don't unnecessarily convert from ArrayList to array, use the ArrayList directly
instead, this speeds up BiffViewer and related unit tests
Modified:
poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java?rev=1554534r1=1554533r2=1554534view=diff
==
--- poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java Tue Dec 31
15:11:59 2013
@@ -88,9 +88,8 @@ public final class BiffViewer {
temp.add(record);
if (dumpInterpretedRecords) {
- String[] headers =
recListener.getRecentHeaders();
- for (int i = 0; i headers.length;
i++) {
- ps.println(headers[i]);
+ for (String header :
recListener.getRecentHeaders()) {
+ ps.println(header);
}
ps.print(record.toString());
}
@@ -436,7 +435,7 @@ public final class BiffViewer {
private static final class BiffRecordListener implements
IBiffRecordListener {
private final Writer _hexDumpWriter;
- private final ListString _headers;
+ private ListString _headers;
private final boolean _zeroAlignEachRecord;
private final boolean _noHeader;
public BiffRecordListener(Writer hexDumpWriter, boolean
zeroAlignEachRecord, boolean noHeader) {
@@ -462,11 +461,10 @@ public final class BiffViewer {
}
}
}
- public String[] getRecentHeaders() {
- String[] result = new String[_headers.size()];
- _headers.toArray(result);
- _headers.clear();
- return result;
+ public ListString getRecentHeaders() {
+ ListString result = _headers;
+ _headers = new ArrayListString();
+ return result;
}
private static String formatRecordDetails(int globalOffset, int
sid, int size, int recordCounter) {
StringBuffer sb = new StringBuffer(64);
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1554535 - in /poi/trunk/src: java/org/apache/poi/hssf/record/aggregates/ java/org/apache/poi/ss/formula/functions/ ooxml/java/org/apache/poi/openxml4j/opc/internal/signature/ ooxml/java/o
Author: centic
Date: Tue Dec 31 15:12:30 2013
New Revision: 1554535
URL: http://svn.apache.org/r1554535
Log:
remove some unused imports and some useless TODOs, slightly more
coverage, @Overrides, more info on failing test, fix some Eclipse
warnings
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Rept.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalCertificatePart.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/signature/PackageDigitalSignature.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java
poi/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java?rev=1554535r1=1554534r2=1554535view=diff
==
---
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
Tue Dec 31 15:12:30 2013
@@ -25,8 +25,8 @@ import java.util.TreeMap;
import org.apache.poi.hssf.model.RecordStream;
import org.apache.poi.hssf.record.*;
-import org.apache.poi.ss.formula.FormulaShifter;
import org.apache.poi.ss.SpreadsheetVersion;
+import org.apache.poi.ss.formula.FormulaShifter;
/**
*
@@ -237,14 +237,15 @@ public final class RowRecordsAggregate e
rowIterator.next();
int result = 0;
while(rowIterator.hasNext() (i++ endIndex)) {
- Record rec = (Record)rowIterator.next();
+ Record rec = rowIterator.next();
result += rec.getRecordSize();
rv.visitRecord(rec);
}
return result;
}
- public void visitContainedRecords(RecordVisitor rv) {
+@Override
+public void visitContainedRecords(RecordVisitor rv) {
PositionTrackingVisitor stv = new PositionTrackingVisitor(rv,
0);
//DBCells are serialized before row records.
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Rept.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Rept.java?rev=1554535r1=1554534r2=1554535view=diff
==
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Rept.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Rept.java Tue Dec 31
15:12:30 2013
@@ -17,10 +17,11 @@
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-
-import java.math.BigDecimal;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.OperandResolver;
+import org.apache.poi.ss.formula.eval.StringEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
/**
* Implementation for Excel REPT () function.p/
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalCertificatePart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalCertificatePart.java?rev=1554535r1=1554534r2=1554535view=diff
==
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalCertificatePart.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalCertificatePart.java
Tue Dec 31 15:12:30 2013
@@ -41,38 +41,29 @@ public final class DigitalCertificatePar
@Override
public void close() {
- // TODO Auto-generated method stub
-
}
@Override
public void flush() {
- // TODO Auto-generated method stub
-
}
@Override
protected InputStream getInputStreamImpl() throws IOException {
- // TODO Auto-generated method stub
return null;
}
@Override
protected OutputStream getOutputStreamImpl() {
- // TODO Auto-generated method stub
return null;
}
@Override
public boolean load(InputStream ios) throws InvalidFormatException {
- // TODO Auto-generated method stub
