Author: nick
Date: Sun Feb 2 16:44:30 2014
New Revision: 1563660
URL: http://svn.apache.org/r1563660
Log:
Fix whitespace
Modified:
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
poi/trunk/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java
Modified:
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java?rev=1563660&r1=1563659&r2=1563660&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
Sun Feb 2 16:44:30 2014
@@ -94,191 +94,191 @@ public class EventBasedExcelExtractor ex
return _dir.getFileSystem();
}
- /**
- * Would return the document information metadata for the document,
- * if we supported it
- */
- public DocumentSummaryInformation getDocSummaryInformation() {
- throw new IllegalStateException("Metadata extraction not
supported in streaming mode, please use ExcelExtractor");
- }
- /**
- * Would return the summary information metadata for the document,
- * if we supported it
- */
- public SummaryInformation getSummaryInformation() {
- throw new IllegalStateException("Metadata extraction not
supported in streaming mode, please use ExcelExtractor");
- }
-
-
- /**
- * Would control the inclusion of cell comments from the document,
- * if we supported it
- */
- public void setIncludeCellComments(boolean includeComments) {
- throw new IllegalStateException("Comment extraction not supported in
streaming mode, please use ExcelExtractor");
- }
-
- /**
- * Would control the inclusion of headers and footers from the document,
- * if we supported it
- */
- public void setIncludeHeadersFooters(boolean includeHeadersFooters) {
- throw new IllegalStateException("Header/Footer extraction not
supported in streaming mode, please use ExcelExtractor");
- }
-
-
- /**
- * Should sheet names be included? Default is true
- */
- public void setIncludeSheetNames(boolean includeSheetNames) {
- _includeSheetNames = includeSheetNames;
- }
- /**
- * Should we return the formula itself, and not
- * the result it produces? Default is false
- */
- public void setFormulasNotResults(boolean formulasNotResults) {
- _formulasNotResults = formulasNotResults;
- }
-
-
- /**
- * Retreives the text contents of the file
- */
- public String getText() {
- String text = null;
- try {
- TextListener tl = triggerExtraction();
-
- text = tl._text.toString();
- if(! text.endsWith("\n")) {
- text = text + "\n";
- }
- } catch(IOException e) {
- throw new RuntimeException(e);
- }
-
- return text;
- }
-
- private TextListener triggerExtraction() throws IOException {
- TextListener tl = new TextListener();
- FormatTrackingHSSFListener ft = new
FormatTrackingHSSFListener(tl);
- tl._ft = ft;
-
- // Register and process
- HSSFEventFactory factory = new HSSFEventFactory();
- HSSFRequest request = new HSSFRequest();
- request.addListenerForAllRecords(ft);
-
- factory.processWorkbookEvents(request, _dir);
-
- return tl;
- }
-
- private class TextListener implements HSSFListener {
- FormatTrackingHSSFListener _ft;
- private SSTRecord sstRecord;
-
- private final List<String> sheetNames;
- final StringBuffer _text = new StringBuffer();
- private int sheetNum = -1;
- private int rowNum;
-
- private boolean outputNextStringValue = false;
- private int nextRow = -1;
-
- public TextListener() {
- sheetNames = new ArrayList<String>();
- }
- public void processRecord(Record record) {
- String thisText = null;
- int thisRow = -1;
-
- switch(record.getSid()) {
- case BoundSheetRecord.sid:
- BoundSheetRecord sr = (BoundSheetRecord)record;
- sheetNames.add(sr.getSheetname());
- break;
- case BOFRecord.sid:
- BOFRecord bof = (BOFRecord)record;
- if(bof.getType() == BOFRecord.TYPE_WORKSHEET) {
- sheetNum++;
- rowNum = -1;
-
- if(_includeSheetNames) {
- if(_text.length() > 0)
_text.append("\n");
-
_text.append(sheetNames.get(sheetNum));
- }
- }
- break;
- case SSTRecord.sid:
- sstRecord = (SSTRecord)record;
- break;
-
- case FormulaRecord.sid:
- FormulaRecord frec = (FormulaRecord) record;
- thisRow = frec.getRow();
-
- if(_formulasNotResults) {
- thisText =
HSSFFormulaParser.toFormulaString((HSSFWorkbook)null,
frec.getParsedExpression());
- } else {
- if(frec.hasCachedResultString()) {
- // Formula result is a string
- // This is stored in the next
record
- outputNextStringValue = true;
- nextRow = frec.getRow();
- } else {
- thisText =
_ft.formatNumberDateCell(frec);
- }
- }
- break;
- case StringRecord.sid:
- if(outputNextStringValue) {
- // String for formula
- StringRecord srec =
(StringRecord)record;
- thisText = srec.getString();
- thisRow = nextRow;
- outputNextStringValue = false;
- }
- break;
- case LabelRecord.sid:
- LabelRecord lrec = (LabelRecord) record;
- thisRow = lrec.getRow();
- thisText = lrec.getValue();
- break;
- case LabelSSTRecord.sid:
- LabelSSTRecord lsrec = (LabelSSTRecord) record;
- thisRow = lsrec.getRow();
- if(sstRecord == null) {
- throw new IllegalStateException("No SST
record found");
- }
- thisText =
sstRecord.getString(lsrec.getSSTIndex()).toString();
- break;
- case NoteRecord.sid:
- NoteRecord nrec = (NoteRecord) record;
- thisRow = nrec.getRow();
- // TODO: Find object to match nrec.getShapeId()
- break;
- case NumberRecord.sid:
- NumberRecord numrec = (NumberRecord) record;
- thisRow = numrec.getRow();
- thisText = _ft.formatNumberDateCell(numrec);
- break;
- default:
- break;
- }
-
- if(thisText != null) {
- if(thisRow != rowNum) {
- rowNum = thisRow;
- if(_text.length() > 0)
- _text.append("\n");
- } else {
- _text.append("\t");
- }
- _text.append(thisText);
- }
- }
- }
+ /**
+ * Would return the document information metadata for the document,
+ * if we supported it
+ */
+ public DocumentSummaryInformation getDocSummaryInformation() {
+ throw new IllegalStateException("Metadata extraction not supported in
streaming mode, please use ExcelExtractor");
+ }
+ /**
+ * Would return the summary information metadata for the document,
+ * if we supported it
+ */
+ public SummaryInformation getSummaryInformation() {
+ throw new IllegalStateException("Metadata extraction not supported in
streaming mode, please use ExcelExtractor");
+ }
+
+
+ /**
+ * Would control the inclusion of cell comments from the document,
+ * if we supported it
+ */
+ public void setIncludeCellComments(boolean includeComments) {
+ throw new IllegalStateException("Comment extraction not supported in
streaming mode, please use ExcelExtractor");
+ }
+
+ /**
+ * Would control the inclusion of headers and footers from the document,
+ * if we supported it
+ */
+ public void setIncludeHeadersFooters(boolean includeHeadersFooters) {
+ throw new IllegalStateException("Header/Footer extraction not supported
in streaming mode, please use ExcelExtractor");
+ }
+
+
+ /**
+ * Should sheet names be included? Default is true
+ */
+ public void setIncludeSheetNames(boolean includeSheetNames) {
+ _includeSheetNames = includeSheetNames;
+ }
+ /**
+ * Should we return the formula itself, and not
+ * the result it produces? Default is false
+ */
+ public void setFormulasNotResults(boolean formulasNotResults) {
+ _formulasNotResults = formulasNotResults;
+ }
+
+
+ /**
+ * Retreives the text contents of the file
+ */
+ public String getText() {
+ String text = null;
+ try {
+ TextListener tl = triggerExtraction();
+
+ text = tl._text.toString();
+ if(! text.endsWith("\n")) {
+ text = text + "\n";
+ }
+ } catch(IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ return text;
+ }
+
+ private TextListener triggerExtraction() throws IOException {
+ TextListener tl = new TextListener();
+ FormatTrackingHSSFListener ft = new FormatTrackingHSSFListener(tl);
+ tl._ft = ft;
+
+ // Register and process
+ HSSFEventFactory factory = new HSSFEventFactory();
+ HSSFRequest request = new HSSFRequest();
+ request.addListenerForAllRecords(ft);
+
+ factory.processWorkbookEvents(request, _dir);
+
+ return tl;
+ }
+
+ private class TextListener implements HSSFListener {
+ FormatTrackingHSSFListener _ft;
+ private SSTRecord sstRecord;
+
+ private final List<String> sheetNames;
+ final StringBuffer _text = new StringBuffer();
+ private int sheetNum = -1;
+ private int rowNum;
+
+ private boolean outputNextStringValue = false;
+ private int nextRow = -1;
+
+ public TextListener() {
+ sheetNames = new ArrayList<String>();
+ }
+ public void processRecord(Record record) {
+ String thisText = null;
+ int thisRow = -1;
+
+ switch(record.getSid()) {
+ case BoundSheetRecord.sid:
+ BoundSheetRecord sr = (BoundSheetRecord)record;
+ sheetNames.add(sr.getSheetname());
+ break;
+ case BOFRecord.sid:
+ BOFRecord bof = (BOFRecord)record;
+ if(bof.getType() == BOFRecord.TYPE_WORKSHEET) {
+ sheetNum++;
+ rowNum = -1;
+
+ if(_includeSheetNames) {
+ if(_text.length() > 0) _text.append("\n");
+ _text.append(sheetNames.get(sheetNum));
+ }
+ }
+ break;
+ case SSTRecord.sid:
+ sstRecord = (SSTRecord)record;
+ break;
+
+ case FormulaRecord.sid:
+ FormulaRecord frec = (FormulaRecord) record;
+ thisRow = frec.getRow();
+
+ if(_formulasNotResults) {
+ thisText =
HSSFFormulaParser.toFormulaString((HSSFWorkbook)null,
frec.getParsedExpression());
+ } else {
+ if(frec.hasCachedResultString()) {
+ // Formula result is a string
+ // This is stored in the next record
+ outputNextStringValue = true;
+ nextRow = frec.getRow();
+ } else {
+ thisText = _ft.formatNumberDateCell(frec);
+ }
+ }
+ break;
+ case StringRecord.sid:
+ if(outputNextStringValue) {
+ // String for formula
+ StringRecord srec = (StringRecord)record;
+ thisText = srec.getString();
+ thisRow = nextRow;
+ outputNextStringValue = false;
+ }
+ break;
+ case LabelRecord.sid:
+ LabelRecord lrec = (LabelRecord) record;
+ thisRow = lrec.getRow();
+ thisText = lrec.getValue();
+ break;
+ case LabelSSTRecord.sid:
+ LabelSSTRecord lsrec = (LabelSSTRecord) record;
+ thisRow = lsrec.getRow();
+ if(sstRecord == null) {
+ throw new IllegalStateException("No SST record found");
+ }
+ thisText = sstRecord.getString(lsrec.getSSTIndex()).toString();
+ break;
+ case NoteRecord.sid:
+ NoteRecord nrec = (NoteRecord) record;
+ thisRow = nrec.getRow();
+ // TODO: Find object to match nrec.getShapeId()
+ break;
+ case NumberRecord.sid:
+ NumberRecord numrec = (NumberRecord) record;
+ thisRow = numrec.getRow();
+ thisText = _ft.formatNumberDateCell(numrec);
+ break;
+ default:
+ break;
+ }
+
+ if(thisText != null) {
+ if(thisRow != rowNum) {
+ rowNum = thisRow;
+ if(_text.length() > 0)
+ _text.append("\n");
+ } else {
+ _text.append("\t");
+ }
+ _text.append(thisText);
+ }
+ }
+ }
}
Modified: poi/trunk/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java?rev=1563660&r1=1563659&r2=1563660&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java Sun Feb
2 16:44:30 2014
@@ -21,30 +21,30 @@ package org.apache.poi.ss.extractor;
* HSSF and XSSF
*/
public interface ExcelExtractor {
- /**
- * Should sheet names be included? Default is true
- */
- public void setIncludeSheetNames(boolean includeSheetNames);
+ /**
+ * Should sheet names be included? Default is true
+ */
+ public void setIncludeSheetNames(boolean includeSheetNames);
- /**
- * Should we return the formula itself, and not
- * the result it produces? Default is false
- */
- public void setFormulasNotResults(boolean formulasNotResults);
+ /**
+ * Should we return the formula itself, and not
+ * the result it produces? Default is false
+ */
+ public void setFormulasNotResults(boolean formulasNotResults);
/**
* Should headers and footers be included in the output?
* Default is true
*/
public void setIncludeHeadersFooters(boolean includeHeadersFooters);
-
- /**
+
+ /**
* Should cell comments be included? Default is false
*/
public void setIncludeCellComments(boolean includeCellComments);
- /**
- * Retreives the text contents of the file
- */
- public String getText();
+ /**
+ * Retreives the text contents of the file
+ */
+ public String getText();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
