Apache/poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2025-02-07 10:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust toString() of ExternalNameRecord

Browse Source 
Fix some IntelliJ warnings
 Reformat TextPieceTable

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1773776 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2016-12-12 11:41:07 +00:00
parent c6d28db7e8
commit 1ebe4d3c99
4 changed files with 146 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
View File

@ -214,7 +214,7 @@ public final class ExternalNameRecord extends StandardRecord {
@Override @Override
public String toString() { public String toString() {
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
sb.append("[EXTERNALNAME]\n"); sb.append("[EXTERNALNAME]\n");
sb.append(" .options = ").append(field_1_option_flag).append("\n"); sb.append(" .options = ").append(field_1_option_flag).append("\n");
sb.append(" .ix = ").append(field_2_ixals).append("\n"); sb.append(" .ix = ").append(field_2_ixals).append("\n");
@ -222,7 +222,7 @@ public final class ExternalNameRecord extends StandardRecord {
if(field_5_name_definition != null) { if(field_5_name_definition != null) {
Ptg[] ptgs = field_5_name_definition.getTokens(); Ptg[] ptgs = field_5_name_definition.getTokens();
for (Ptg ptg : ptgs) { for (Ptg ptg : ptgs) {
sb.append(ptg.toString()).append(ptg.getRVAType()).append("\n"); sb.append(" .namedef = ").append(ptg.toString()).append(ptg.getRVAType()).append("\n");
} }
} }
sb.append("[/EXTERNALNAME]\n"); sb.append("[/EXTERNALNAME]\n");

7
src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
View File

@ -163,6 +163,7 @@ public class XSSFSheetXMLHandler extends DefaultHandler {
private void init() { private void init() {
if (commentsTable != null) { if (commentsTable != null) {
commentCellRefs = new LinkedList<CellAddress>(); commentCellRefs = new LinkedList<CellAddress>();
//noinspection deprecation
for (CTComment comment : commentsTable.getCTComments().getCommentList().getCommentArray()) { for (CTComment comment : commentsTable.getCTComments().getCommentList().getCommentArray()) {
commentCellRefs.add(new CellAddress(comment.getRef())); commentCellRefs.add(new CellAddress(comment.getRef()));
} }
@ -228,10 +229,10 @@ public class XSSFSheetXMLHandler extends DefaultHandler {
// match the current cell // match the current cell
if(formulasNotResults) { if(formulasNotResults) {
logger.log(POILogger.WARN, "shared formulas not yet supported!"); logger.log(POILogger.WARN, "shared formulas not yet supported!");
} else { } /*else {
// It's a shared formula, so we can't get at the formula string yet // It's a shared formula, so we can't get at the formula string yet
// However, they don't care about the formula string, so that's ok! // However, they don't care about the formula string, so that's ok!
} }*/
} }
} else { } else {
fIsOpen = true; fIsOpen = true;
@ -334,7 +335,7 @@ public class XSSFSheetXMLHandler extends DefaultHandler {
thisStr = fv; thisStr = fv;
} }
} else { } else {
// No formating applied, just do raw value in all cases // No formatting applied, just do raw value in all cases
thisStr = fv; thisStr = fv;
} }
} }

188
src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java
View File

@ -38,8 +38,7 @@ import org.apache.poi.util.POILogger;
* @author Ryan Ackley * @author Ryan Ackley
*/ */
@Internal @Internal
public class TextPieceTable implements CharIndexTranslator public class TextPieceTable implements CharIndexTranslator {
{
private static final POILogger logger = POILogFactory private static final POILogger logger = POILogFactory
.getLogger(TextPieceTable.class); .getLogger(TextPieceTable.class);
@ -48,13 +47,11 @@ public class TextPieceTable implements CharIndexTranslator
protected ArrayList<TextPiece> _textPieces = new ArrayList<TextPiece>(); protected ArrayList<TextPiece> _textPieces = new ArrayList<TextPiece>();
protected ArrayList<TextPiece> _textPiecesFCOrder = new ArrayList<TextPiece>(); protected ArrayList<TextPiece> _textPiecesFCOrder = new ArrayList<TextPiece>();
public TextPieceTable() public TextPieceTable() {
{
} }
public TextPieceTable(byte[] documentStream, byte[] tableStream, public TextPieceTable(byte[] documentStream, byte[] tableStream,
int offset, int size, int fcMin ) int offset, int size, int fcMin) {
{
// get our plex of PieceDescriptors // get our plex of PieceDescriptors
PlexOfCps pieceTable = new PlexOfCps(tableStream, offset, size, PlexOfCps pieceTable = new PlexOfCps(tableStream, offset, size,
PieceDescriptor.getSizeInBytes()); PieceDescriptor.getSizeInBytes());
@ -64,8 +61,7 @@ public class TextPieceTable implements CharIndexTranslator
// iterate through piece descriptors raw bytes and create // iterate through piece descriptors raw bytes and create
// PieceDescriptor objects // PieceDescriptor objects
for ( int x = 0; x < length; x++ ) for (int x = 0; x < length; x++) {
{
GenericPropertyNode node = pieceTable.getProperty(x); GenericPropertyNode node = pieceTable.getProperty(x);
pieces[x] = new PieceDescriptor(node.getBytes(), 0); pieces[x] = new PieceDescriptor(node.getBytes(), 0);
} }
@ -73,18 +69,15 @@ public class TextPieceTable implements CharIndexTranslator
// Figure out the cp of the earliest text piece // Figure out the cp of the earliest text piece
// Note that text pieces don't have to be stored in order! // Note that text pieces don't have to be stored in order!
_cpMin = pieces[0].getFilePosition() - fcMin; _cpMin = pieces[0].getFilePosition() - fcMin;
for ( int x = 0; x < pieces.length; x++ ) for (PieceDescriptor piece : pieces) {
{ int start = piece.getFilePosition() - fcMin;
int start = pieces[x].getFilePosition() - fcMin; if (start < _cpMin) {
if ( start < _cpMin )
{
_cpMin = start; _cpMin = start;
} }
} }
// using the PieceDescriptors, build our list of TextPieces. // using the PieceDescriptors, build our list of TextPieces.
for ( int x = 0; x < pieces.length; x++ ) for (int x = 0; x < pieces.length; x++) {
{
int start = pieces[x].getFilePosition(); int start = pieces[x].getFilePosition();
GenericPropertyNode node = pieceTable.getProperty(x); GenericPropertyNode node = pieceTable.getProperty(x);
@ -95,8 +88,7 @@ public class TextPieceTable implements CharIndexTranslator
// What's the relationship between bytes and characters? // What's the relationship between bytes and characters?
boolean unicode = pieces[x].isUnicode(); boolean unicode = pieces[x].isUnicode();
int multiple = 1; int multiple = 1;
if ( unicode ) if (unicode) {
{
multiple = 2; multiple = 2;
} }
@ -122,8 +114,7 @@ public class TextPieceTable implements CharIndexTranslator
Collections.sort(_textPiecesFCOrder, new FCComparator()); Collections.sort(_textPiecesFCOrder, new FCComparator());
} }
public void add( TextPiece piece ) public void add(TextPiece piece) {
{
_textPieces.add(piece); _textPieces.add(piece);
_textPiecesFCOrder.add(piece); _textPiecesFCOrder.add(piece);
Collections.sort(_textPieces); Collections.sort(_textPieces);
@ -133,13 +124,10 @@ public class TextPieceTable implements CharIndexTranslator
/** /**
* Adjust all the text piece after inserting some text into one of them * Adjust all the text piece after inserting some text into one of them
* *
* @param listIndex * @param listIndex The TextPiece that had characters inserted into
* The TextPiece that had characters inserted into * @param length The number of characters inserted
* @param length
* The number of characters inserted
*/ */
public int adjustForInsert( int listIndex, int length ) public int adjustForInsert(int listIndex, int length) {
{
int size = _textPieces.size(); int size = _textPieces.size();
TextPiece tp = _textPieces.get(listIndex); TextPiece tp = _textPieces.get(listIndex);
@ -148,8 +136,7 @@ public class TextPieceTable implements CharIndexTranslator
tp.setEnd(tp.getEnd() + length); tp.setEnd(tp.getEnd() + length);
// Now change all subsequent ones // Now change all subsequent ones
for ( int x = listIndex + 1; x < size; x++ ) for (int x = listIndex + 1; x < size; x++) {
{
tp = _textPieces.get(x); tp = _textPieces.get(x);
tp.setStart(tp.getStart() + length); tp.setStart(tp.getStart() + length);
tp.setEnd(tp.getEnd() + length); tp.setEnd(tp.getEnd() + length);
@ -159,18 +146,14 @@ public class TextPieceTable implements CharIndexTranslator
return length; return length;
} }
public boolean equals( Object o ) public boolean equals(Object o) {
{
if (!(o instanceof TextPieceTable)) return false; if (!(o instanceof TextPieceTable)) return false;
TextPieceTable tpt = (TextPieceTable) o; TextPieceTable tpt = (TextPieceTable) o;
int size = tpt._textPieces.size(); int size = tpt._textPieces.size();
if ( size == _textPieces.size() ) if (size == _textPieces.size()) {
{ for (int x = 0; x < size; x++) {
for ( int x = 0; x < size; x++ ) if (!tpt._textPieces.get(x).equals(_textPieces.get(x))) {
{
if ( !tpt._textPieces.get( x ).equals( _textPieces.get( x ) ) )
{
return false; return false;
} }
} }
@ -179,13 +162,10 @@ public class TextPieceTable implements CharIndexTranslator
return false; return false;
} }
public int getByteIndex( int charPos ) public int getByteIndex(int charPos) {
{
int byteCount = 0; int byteCount = 0;
for ( TextPiece tp : _textPieces ) for (TextPiece tp : _textPieces) {
{ if (charPos >= tp.getEnd()) {
if ( charPos >= tp.getEnd() )
{
byteCount = tp.getPieceDescriptor().getFilePosition() byteCount = tp.getPieceDescriptor().getFilePosition()
+ (tp.getEnd() - tp.getStart()) + (tp.getEnd() - tp.getStart())
* (tp.isUnicode() ? 2 : 1); * (tp.isUnicode() ? 2 : 1);
@ -195,8 +175,7 @@ public class TextPieceTable implements CharIndexTranslator
continue; continue;
} }
if ( charPos < tp.getEnd() ) if (charPos < tp.getEnd()) {
{
int left = charPos - tp.getStart(); int left = charPos - tp.getStart();
byteCount = tp.getPieceDescriptor().getFilePosition() + left byteCount = tp.getPieceDescriptor().getFilePosition() + left
* (tp.isUnicode() ? 2 : 1); * (tp.isUnicode() ? 2 : 1);
@ -207,20 +186,17 @@ public class TextPieceTable implements CharIndexTranslator
} }
@Deprecated @Deprecated
public int getCharIndex( int bytePos ) public int getCharIndex(int bytePos) {
{
return getCharIndex(bytePos, 0); return getCharIndex(bytePos, 0);
} }
@Deprecated @Deprecated
public int getCharIndex( int startBytePos, int startCP ) public int getCharIndex(int startBytePos, int startCP) {
{
int charCount = 0; int charCount = 0;
int bytePos = lookIndexForward(startBytePos); int bytePos = lookIndexForward(startBytePos);
for ( TextPiece tp : _textPieces ) for (TextPiece tp : _textPieces) {
{
int pieceStart = tp.getPieceDescriptor().getFilePosition(); int pieceStart = tp.getPieceDescriptor().getFilePosition();
int bytesLength = tp.bytesLength(); int bytesLength = tp.bytesLength();
@ -228,31 +204,22 @@ public class TextPieceTable implements CharIndexTranslator
int toAdd; int toAdd;
if ( bytePos < pieceStart || bytePos > pieceEnd ) if (bytePos < pieceStart || bytePos > pieceEnd) {
{
toAdd = bytesLength; toAdd = bytesLength;
} } else if (bytePos > pieceStart && bytePos < pieceEnd) {
else if ( bytePos > pieceStart && bytePos < pieceEnd )
{
toAdd = (bytePos - pieceStart); toAdd = (bytePos - pieceStart);
} } else {
else
{
toAdd = bytesLength - (pieceEnd - bytePos); toAdd = bytesLength - (pieceEnd - bytePos);
} }
if ( tp.isUnicode() ) if (tp.isUnicode()) {
{
charCount += toAdd / 2; charCount += toAdd / 2;
} } else {
else
{
charCount += toAdd; charCount += toAdd;
} }
if (bytePos >= pieceStart && bytePos <= pieceEnd if (bytePos >= pieceStart && bytePos <= pieceEnd
&& charCount >= startCP ) && charCount >= startCP) {
{
break; break;
} }
} }
@ -262,11 +229,9 @@ public class TextPieceTable implements CharIndexTranslator
@Override @Override
public int[][] getCharIndexRanges(int startBytePosInclusive, public int[][] getCharIndexRanges(int startBytePosInclusive,
int endBytePosExclusive ) int endBytePosExclusive) {
{
List<int[]> result = new LinkedList<int[]>(); List<int[]> result = new LinkedList<int[]>();
for ( TextPiece textPiece : _textPiecesFCOrder ) for (TextPiece textPiece : _textPiecesFCOrder) {
{
final int tpStart = textPiece.getPieceDescriptor() final int tpStart = textPiece.getPieceDescriptor()
.getFilePosition(); .getFilePosition();
final int tpEnd = textPiece.getPieceDescriptor().getFilePosition() final int tpEnd = textPiece.getPieceDescriptor().getFilePosition()
@ -297,24 +262,20 @@ public class TextPieceTable implements CharIndexTranslator
return result.toArray(new int[result.size()][]); return result.toArray(new int[result.size()][]);
} }
public int getCpMin() public int getCpMin() {
{
return _cpMin; return _cpMin;
} }
public StringBuilder getText() public StringBuilder getText() {
{
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
// rebuild document paragraphs structure // rebuild document paragraphs structure
StringBuilder docText = new StringBuilder(); StringBuilder docText = new StringBuilder();
for ( TextPiece textPiece : _textPieces ) for (TextPiece textPiece : _textPieces) {
{
String toAppend = textPiece.getStringBuilder().toString(); String toAppend = textPiece.getStringBuilder().toString();
int toAppendLength = toAppend.length(); int toAppendLength = toAppend.length();
if ( toAppendLength != textPiece.getEnd() - textPiece.getStart() ) if (toAppendLength != textPiece.getEnd() - textPiece.getStart()) {
{
logger.log( logger.log(
POILogger.WARN, POILogger.WARN,
"Text piece has boundaries [", "Text piece has boundaries [",
@ -337,30 +298,24 @@ public class TextPieceTable implements CharIndexTranslator
return docText; return docText;
} }
public List<TextPiece> getTextPieces() public List<TextPiece> getTextPieces() {
{
return _textPieces; return _textPieces;
} }
@Override @Override
public int hashCode() public int hashCode() {
{
return _textPieces.size(); return _textPieces.size();
} }
public boolean isIndexInTable( int bytePos ) public boolean isIndexInTable(int bytePos) {
{ for (TextPiece tp : _textPiecesFCOrder) {
for ( TextPiece tp : _textPiecesFCOrder )
{
int pieceStart = tp.getPieceDescriptor().getFilePosition(); int pieceStart = tp.getPieceDescriptor().getFilePosition();
if ( bytePos > pieceStart + tp.bytesLength() ) if (bytePos > pieceStart + tp.bytesLength()) {
{
continue; continue;
} }
if ( pieceStart > bytePos ) if (pieceStart > bytePos) {
{
return false; return false;
} }
@ -370,14 +325,11 @@ public class TextPieceTable implements CharIndexTranslator
return false; return false;
} }
boolean isIndexInTable( int startBytePos, int endBytePos ) boolean isIndexInTable(int startBytePos, int endBytePos) {
{ for (TextPiece tp : _textPiecesFCOrder) {
for ( TextPiece tp : _textPiecesFCOrder )
{
int pieceStart = tp.getPieceDescriptor().getFilePosition(); int pieceStart = tp.getPieceDescriptor().getFilePosition();
if ( startBytePos >= pieceStart + tp.bytesLength() ) if (startBytePos >= pieceStart + tp.bytesLength()) {
{
continue; continue;
} }
@ -393,23 +345,19 @@ public class TextPieceTable implements CharIndexTranslator
return false; return false;
} }
public int lookIndexBackward( final int startBytePos ) public int lookIndexBackward(final int startBytePos) {
{
int bytePos = startBytePos; int bytePos = startBytePos;
int lastEnd = 0; int lastEnd = 0;
for ( TextPiece tp : _textPiecesFCOrder ) for (TextPiece tp : _textPiecesFCOrder) {
{
int pieceStart = tp.getPieceDescriptor().getFilePosition(); int pieceStart = tp.getPieceDescriptor().getFilePosition();
if ( bytePos > pieceStart + tp.bytesLength() ) if (bytePos > pieceStart + tp.bytesLength()) {
{
lastEnd = pieceStart + tp.bytesLength(); lastEnd = pieceStart + tp.bytesLength();
continue; continue;
} }
if ( pieceStart > bytePos ) if (pieceStart > bytePos) {
{
bytePos = lastEnd; bytePos = lastEnd;
} }
@ -419,8 +367,7 @@ public class TextPieceTable implements CharIndexTranslator
return bytePos; return bytePos;
} }
public int lookIndexForward( final int startBytePos ) public int lookIndexForward(final int startBytePos) {
{
if (_textPiecesFCOrder.isEmpty()) if (_textPiecesFCOrder.isEmpty())
throw new IllegalStateException("Text pieces table is empty"); throw new IllegalStateException("Text pieces table is empty");
@ -434,8 +381,7 @@ public class TextPieceTable implements CharIndexTranslator
int low = 0; int low = 0;
int high = _textPiecesFCOrder.size() - 1; int high = _textPiecesFCOrder.size() - 1;
while ( low <= high ) while (low <= high) {
{
int mid = (low + high) >>> 1; int mid = (low + high) >>> 1;
final TextPiece textPiece = _textPiecesFCOrder.get(mid); final TextPiece textPiece = _textPiecesFCOrder.get(mid);
int midVal = textPiece.getPieceDescriptor().getFilePosition(); int midVal = textPiece.getPieceDescriptor().getFilePosition();
@ -459,21 +405,16 @@ public class TextPieceTable implements CharIndexTranslator
return _textPiecesFCOrder.get(low + 1).getPieceDescriptor().getFilePosition(); return _textPiecesFCOrder.get(low + 1).getPieceDescriptor().getFilePosition();
} }
public byte[] writeTo( HWPFOutputStream docStream ) throws IOException public byte[] writeTo(HWPFOutputStream docStream) throws IOException {
{
PlexOfCps textPlex = new PlexOfCps(PieceDescriptor.getSizeInBytes()); PlexOfCps textPlex = new PlexOfCps(PieceDescriptor.getSizeInBytes());
// int fcMin = docStream.getOffset(); // int fcMin = docStream.getOffset();
int size = _textPieces.size(); for (TextPiece next : _textPieces) {
for ( int x = 0; x < size; x++ )
{
TextPiece next = _textPieces.get( x );
PieceDescriptor pd = next.getPieceDescriptor(); PieceDescriptor pd = next.getPieceDescriptor();
int offset = docStream.getOffset(); int offset = docStream.getOffset();
int mod = (offset % POIFSConstants.SMALLER_BIG_BLOCK_SIZE); int mod = (offset % POIFSConstants.SMALLER_BIG_BLOCK_SIZE);
if ( mod != 0 ) if (mod != 0) {
{
mod = POIFSConstants.SMALLER_BIG_BLOCK_SIZE - mod; mod = POIFSConstants.SMALLER_BIG_BLOCK_SIZE - mod;
byte[] buf = new byte[mod]; byte[] buf = new byte[mod];
docStream.write(buf); docStream.write(buf);
@ -498,22 +439,15 @@ public class TextPieceTable implements CharIndexTranslator
return textPlex.toByteArray(); return textPlex.toByteArray();
} }
private static class FCComparator implements Comparator<TextPiece>, Serializable private static class FCComparator implements Comparator<TextPiece>, Serializable {
{ public int compare(TextPiece textPiece, TextPiece textPiece1) {
public int compare( TextPiece textPiece, TextPiece textPiece1 )
{
if (textPiece.getPieceDescriptor().fc > textPiece1 if (textPiece.getPieceDescriptor().fc > textPiece1
.getPieceDescriptor().fc ) .getPieceDescriptor().fc) {
{
return 1; return 1;
} } else if (textPiece.getPieceDescriptor().fc < textPiece1
else if ( textPiece.getPieceDescriptor().fc < textPiece1 .getPieceDescriptor().fc) {
.getPieceDescriptor().fc )
{
return -1; return -1;
} } else {
else
{
return 0; return 0;
} }
} }

1
src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
View File

@ -118,7 +118,6 @@ public final class TestFormulaBugs {
/** /**
* Bug 42448 - Can't parse SUMPRODUCT(A!C7:A!C67, B8:B68) / B69 <p/> * Bug 42448 - Can't parse SUMPRODUCT(A!C7:A!C67, B8:B68) / B69 <p/>
* @throws IOException
*/ */
@Test @Test
public void test42448() throws IOException { public void test42448() throws IOException {