diff options
| author | Andreas Beeker <kiwiwings@apache.org> | 2020-04-02 23:54:48 +0000 |
|---|---|---|
| committer | Andreas Beeker <kiwiwings@apache.org> | 2020-04-02 23:54:48 +0000 |
| commit | 1dc771394bedaf456b85e9e15d90f7429908919b (patch) | |
| tree | dfc772532f1a6f663c71fc1647acbd73e33fce9c /src/scratchpad | |
| parent | 3f7d718a67d7f2830b186557d200ecba00d8ac34 (diff) | |
| download | poi-1dc771394bedaf456b85e9e15d90f7429908919b.tar.gz poi-1dc771394bedaf456b85e9e15d90f7429908919b.zip | |
Sonar Fixes - "static" base class members should not be accessed via derived types
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1876067 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/scratchpad')
47 files changed, 268 insertions, 293 deletions
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java b/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java index 523aed259f..f5493ac643 100644 --- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java +++ b/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java @@ -17,10 +17,10 @@ package org.apache.poi.hdgf.chunks; -import org.apache.poi.util.LittleEndian; - import java.nio.charset.Charset; +import org.apache.poi.util.LittleEndian; + /** * A chunk header */ @@ -79,13 +79,7 @@ public abstract class ChunkHeader { * @return the header size */ public static int getHeaderSize(int documentVersion) { - if(documentVersion > 6) { - return ChunkHeaderV11.getHeaderSize(); - } else if(documentVersion == 6) { - return ChunkHeaderV6.getHeaderSize(); - } else { - return ChunkHeaderV4V5.getHeaderSize(); - } + return documentVersion >= 6 ? ChunkHeaderV6.getHeaderSize() : ChunkHeaderV4V5.getHeaderSize(); } public abstract int getSizeInBytes(); diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java b/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java index 195182a509..187096a8a6 100644 --- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java +++ b/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java @@ -49,7 +49,6 @@ import org.apache.poi.hwmf.record.HwmfTernaryRasterOp; import org.apache.poi.util.GenericRecordJsonWriter; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.IOUtils; -import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.LittleEndianInputStream; @@ -875,7 +874,7 @@ public final class HemfFill { xform.setToIdentity(); } - return 6 * LittleEndian.INT_SIZE; + return 6 * LittleEndianConsts.INT_SIZE; } static Shape getRgnShape(List<Rectangle2D> rgnRects) { diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java b/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java index 11ab16ea54..fc0afe7ece 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java @@ -33,6 +33,7 @@ import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * Utility class which dumps raw contents of a ppt file into XML format @@ -72,7 +73,7 @@ public final class PPTXMLDump { return bos.toByteArray(); } } - + /** * Dump the structure of the supplied PPT file into XML * @param outWriter <code>Writer</code> to write out @@ -118,11 +119,11 @@ public final class PPTXMLDump { //read record header int info = LittleEndian.getUShort(data, pos); - pos += LittleEndian.SHORT_SIZE; + pos += LittleEndianConsts.SHORT_SIZE; int type = LittleEndian.getUShort(data, pos); - pos += LittleEndian.SHORT_SIZE; + pos += LittleEndianConsts.SHORT_SIZE; int size = (int)LittleEndian.getUInt(data, pos); - pos += LittleEndian.INT_SIZE; + pos += LittleEndianConsts.INT_SIZE; //get name of the record by type String recname = RecordTypes.forTypeID(type).name(); diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java index db041719a8..2e51499c8f 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java @@ -32,7 +32,6 @@ import java.util.function.Supplier; import org.apache.poi.common.Duplicatable; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hslf.exceptions.HSLFException; -import org.apache.poi.hslf.record.StyleTextPropAtom; import org.apache.poi.util.HexDump; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.POILogFactory; @@ -292,12 +291,12 @@ public class TextPropCollection implements GenericRecord, Duplicatable { if (!isMasterStyle) { // First goes the number of characters we affect // MasterStyles don't have this field - StyleTextPropAtom.writeLittleEndian(charactersCovered,o); + org.apache.poi.hslf.record.Record.writeLittleEndian(charactersCovered,o); } // Then we have the indentLevel field if it's a paragraph collection if (textPropType == TextPropType.paragraph && indentLevel > -1) { - StyleTextPropAtom.writeLittleEndian(indentLevel, o); + org.apache.poi.hslf.record.Record.writeLittleEndian(indentLevel, o); } // Then the mask field @@ -305,7 +304,7 @@ public class TextPropCollection implements GenericRecord, Duplicatable { for (TextProp textProp : textProps.values()) { mask |= textProp.getWriteMask(); } - StyleTextPropAtom.writeLittleEndian(mask,o); + org.apache.poi.hslf.record.Record.writeLittleEndian(mask,o); // Then the contents of all the properties for (TextProp textProp : getTextPropList()) { @@ -314,9 +313,9 @@ public class TextPropCollection implements GenericRecord, Duplicatable { // don't add empty properties, as they can't be recognized while reading continue; } else if (textProp.getSize() == 2) { - StyleTextPropAtom.writeLittleEndian((short)val,o); + org.apache.poi.hslf.record.Record.writeLittleEndian((short)val,o); } else if (textProp.getSize() == 4) { - StyleTextPropAtom.writeLittleEndian(val,o); + org.apache.poi.hslf.record.Record.writeLittleEndian(val,o); } else if (textProp instanceof HSLFTabStopPropCollection) { ((HSLFTabStopPropCollection)textProp).writeProperty(o); } diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java index 416022e7a9..36ed8229c2 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java @@ -20,6 +20,7 @@ package org.apache.poi.hslf.record; import java.util.function.Supplier; import org.apache.poi.ddf.DefaultEscherRecordFactory; +import org.apache.poi.ddf.EscherClientDataRecord; import org.apache.poi.ddf.EscherRecord; import org.apache.poi.ddf.EscherRecordFactory; @@ -40,7 +41,7 @@ public class HSLFEscherRecordFactory extends DefaultEscherRecordFactory { protected Supplier<? extends EscherRecord> getConstructor(short options, short recordId) { if (recordId == EscherPlaceholder.RECORD_ID) { return EscherPlaceholder::new; - } else if (recordId == HSLFEscherClientDataRecord.RECORD_ID) { + } else if (recordId == EscherClientDataRecord.RECORD_ID) { return HSLFEscherClientDataRecord::new; } return super.getConstructor(options, recordId); diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java index 3fd987188b..2597ccbe67 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java @@ -32,6 +32,7 @@ import org.apache.poi.sl.usermodel.TextShape.TextPlaceholder; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.LittleEndianOutputStream; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -148,7 +149,7 @@ public final class TxMasterStyleAtom extends RecordAtom { //number of indentation levels short levels = LittleEndian.getShort(_data, 0); - pos += LittleEndian.SHORT_SIZE; + pos += LittleEndianConsts.SHORT_SIZE; paragraphStyles = new ArrayList<>(levels); charStyles = new ArrayList<>(levels); @@ -159,19 +160,19 @@ public final class TxMasterStyleAtom extends RecordAtom { // Fetch the 2 byte value, that is safe to ignore for some types of text short indentLevel = LittleEndian.getShort(_data, pos); prprops.setIndentLevel(indentLevel); - pos += LittleEndian.SHORT_SIZE; + pos += LittleEndianConsts.SHORT_SIZE; } else { prprops.setIndentLevel((short)-1); } head = LittleEndian.getInt(_data, pos); - pos += LittleEndian.INT_SIZE; + pos += LittleEndianConsts.INT_SIZE; pos += prprops.buildTextPropList( head, _data, pos); paragraphStyles.add(prprops); head = LittleEndian.getInt(_data, pos); - pos += LittleEndian.INT_SIZE; + pos += LittleEndianConsts.INT_SIZE; TextPropCollection chprops = new TextPropCollection(0, TextPropType.character); pos += chprops.buildTextPropList( head, _data, pos); charStyles.add(chprops); diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java index 206bb1641b..b10a6a52d5 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java @@ -247,7 +247,7 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape, while (segIter.hasNext()) { byte[] segElem = segIter.next(); - HSLFFreeformShape.PathInfo pi = getPathInfo(segElem); + HSLFAutoShape.PathInfo pi = getPathInfo(segElem); if (pi == null) { continue; } @@ -376,7 +376,7 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape, } private static void handleEscapeInfo(CTPath2D pathCT, Path2D path2D, byte[] segElem, Iterator<byte[]> vertIter) { - HSLFFreeformShape.EscapeInfo ei = getEscapeInfo(segElem); + HSLFAutoShape.EscapeInfo ei = getEscapeInfo(segElem); if (ei == null) { return; } @@ -474,16 +474,16 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape, return new Point2D.Double(xyPoints[0],xyPoints[1]); } - private static HSLFFreeformShape.PathInfo getPathInfo(byte[] elem) { + private static HSLFAutoShape.PathInfo getPathInfo(byte[] elem) { int elemUS = LittleEndian.getUShort(elem, 0); int pathInfo = PATH_INFO.getValue(elemUS); - return HSLFFreeformShape.PathInfo.valueOf(pathInfo); + return HSLFAutoShape.PathInfo.valueOf(pathInfo); } - private static HSLFFreeformShape.EscapeInfo getEscapeInfo(byte[] elem) { + private static HSLFAutoShape.EscapeInfo getEscapeInfo(byte[] elem) { int elemUS = LittleEndian.getUShort(elem, 0); int escInfo = ESCAPE_INFO.getValue(elemUS); - return HSLFFreeformShape.EscapeInfo.valueOf(escInfo); + return HSLFAutoShape.EscapeInfo.valueOf(escInfo); } diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java index df3de7229a..e7f92a4a9f 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java @@ -37,6 +37,7 @@ import org.apache.poi.poifs.crypt.CryptoFunctions; import org.apache.poi.poifs.crypt.HashAlgorithm; import org.apache.poi.sl.usermodel.PictureData; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.Units; /** @@ -64,10 +65,10 @@ public abstract class HSLFPictureData implements PictureData, GenericRecord { private int uidInstanceCount = 1; /** - * The 1-based index within the pictures stream + * The 1-based index within the pictures stream */ private int index = -1; - + /** * Blip signature. */ @@ -84,13 +85,13 @@ public abstract class HSLFPictureData implements PictureData, GenericRecord { /** * The instance type/signatures defines if one or two UID instances will be included - * + * * @param uidInstanceCount the number of uid sequences */ protected void setUIDInstanceCount(int uidInstanceCount) { this.uidInstanceCount = uidInstanceCount; } - + /** * Returns the raw binary data of this Picture excluding the first 8 bytes * which hold image signature and size of the image data. @@ -137,7 +138,7 @@ public abstract class HSLFPictureData implements PictureData, GenericRecord { public byte[] getChecksum() { return getChecksum(getData()); } - + /** * Compute 16-byte checksum of this picture using MD5 algorithm. */ @@ -153,18 +154,18 @@ public abstract class HSLFPictureData implements PictureData, GenericRecord { public void write(OutputStream out) throws IOException { byte[] data; - data = new byte[LittleEndian.SHORT_SIZE]; + data = new byte[LittleEndianConsts.SHORT_SIZE]; LittleEndian.putUShort(data, 0, getSignature()); out.write(data); - data = new byte[LittleEndian.SHORT_SIZE]; + data = new byte[LittleEndianConsts.SHORT_SIZE]; PictureType pt = getType(); LittleEndian.putUShort(data, 0, pt.nativeId + 0xF018); out.write(data); byte[] rd = getRawData(); - data = new byte[LittleEndian.INT_SIZE]; + data = new byte[LittleEndianConsts.INT_SIZE]; LittleEndian.putInt(data, 0, rd.length); out.write(data); @@ -223,7 +224,7 @@ public abstract class HSLFPictureData implements PictureData, GenericRecord { public void setIndex(int index) { this.index = index; } - + @Override public final String getContentType() { return getType().contentType; diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java b/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java index b0d9a51854..6f5ab29bb4 100644 --- a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java +++ b/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java @@ -32,7 +32,7 @@ import org.w3c.dom.Document; /** * Common class for {@link ExcelToFoConverter} and {@link ExcelToHtmlConverter} - * + * * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com) * @see AbstractWordConverter */ @@ -41,13 +41,13 @@ public abstract class AbstractExcelConverter { protected static int getColumnWidth( HSSFSheet sheet, int columnIndex ) { - return ExcelToHtmlUtils.getColumnWidthInPx( sheet + return AbstractExcelUtils.getColumnWidthInPx( sheet .getColumnWidth( columnIndex ) ); } protected static int getDefaultColumnWidth( HSSFSheet sheet ) { - return ExcelToHtmlUtils.getColumnWidthInPx( sheet + return AbstractExcelUtils.getColumnWidthInPx( sheet .getDefaultColumnWidth() ); } @@ -68,7 +68,7 @@ public abstract class AbstractExcelConverter /** * Generates name for output as column header in case * <tt>{@link #isOutputColumnHeaders()} == true</tt> - * + * * @param columnIndex * 0-based column index */ @@ -151,12 +151,12 @@ public abstract class AbstractExcelConverter value = ErrorEval.getText( cell.getErrorCellValue() ); break; default: - value = ExcelToHtmlUtils.EMPTY; + value = AbstractExcelUtils.EMPTY; break; } break; case BLANK: - value = ExcelToHtmlUtils.EMPTY; + value = AbstractExcelUtils.EMPTY; break; case NUMERIC: value = _formatter.formatCellValue( cell ); @@ -171,7 +171,7 @@ public abstract class AbstractExcelConverter return true; } - return ExcelToHtmlUtils.isEmpty( value ); + return AbstractExcelUtils.isEmpty( value ); } public void setFontReplacer( FontReplacer fontReplacer ) diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java index d9c1929e64..1cfb415b66 100644 --- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java +++ b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java @@ -217,7 +217,7 @@ public class ExcelToFoConverter extends AbstractExcelConverter } else { - value = ExcelToHtmlUtils.EMPTY; + value = AbstractExcelUtils.EMPTY; } break; case NUMERIC: @@ -237,12 +237,12 @@ public class ExcelToFoConverter extends AbstractExcelConverter POILogger.WARN, "Unexpected cell cachedFormulaResultType (" + cell.getCachedFormulaResultType() + ")" ); - value = ExcelToHtmlUtils.EMPTY; + value = AbstractExcelUtils.EMPTY; break; } break; case BLANK: - value = ExcelToHtmlUtils.EMPTY; + value = AbstractExcelUtils.EMPTY; break; case NUMERIC: value = _formatter.formatCellValue( cell ); @@ -259,7 +259,7 @@ public class ExcelToFoConverter extends AbstractExcelConverter return true; } - final boolean noText = ExcelToHtmlUtils.isEmpty( value ); + final boolean noText = AbstractExcelUtils.isEmpty( value ); final boolean wrapInDivs = !noText && !cellStyle.getWrapText(); final boolean emptyStyle = isEmptyStyle( cellStyle ); @@ -318,7 +318,7 @@ public class ExcelToFoConverter extends AbstractExcelConverter block.appendChild( text ); tableCellElement.appendChild( block ); - return ExcelToHtmlUtils.isEmpty( value ) && emptyStyle; + return AbstractExcelUtils.isEmpty( value ) && emptyStyle; } protected void processCellStyle( HSSFWorkbook workbook, @@ -349,7 +349,7 @@ public class ExcelToFoConverter extends AbstractExcelConverter .getFillBackgroundColorColor(); if ( backgroundColor != null ) cellTarget.setAttribute( "background-color", - ExcelToHtmlUtils.getColor( backgroundColor ) ); + AbstractExcelUtils.getColor( backgroundColor ) ); } processCellStyleBorder( workbook, cellTarget, "top", @@ -373,17 +373,17 @@ public class ExcelToFoConverter extends AbstractExcelConverter return; StringBuilder borderStyle = new StringBuilder(); - borderStyle.append( ExcelToHtmlUtils.getBorderWidth( xlsBorder ) ); + borderStyle.append( AbstractExcelUtils.getBorderWidth( xlsBorder ) ); final HSSFColor color = workbook.getCustomPalette().getColor( borderColor ); if ( color != null ) { borderStyle.append( ' ' ); - borderStyle.append( ExcelToHtmlUtils.getColor( color ) ); + borderStyle.append( AbstractExcelUtils.getColor( color ) ); borderStyle.append( ' ' ); - borderStyle.append( ExcelToHtmlUtils.getBorderStyle( xlsBorder ) ); + borderStyle.append( AbstractExcelUtils.getBorderStyle( xlsBorder ) ); } cellTarget.setAttribute( "border-" + type, borderStyle.toString() ); @@ -404,7 +404,7 @@ public class ExcelToFoConverter extends AbstractExcelConverter font.getColor() ); if ( fontColor != null ) blockTarget.setAttribute( "color", - ExcelToHtmlUtils.getColor( fontColor ) ); + AbstractExcelUtils.getColor( fontColor ) ); if ( font.getFontHeightInPoints() != 0 ) blockTarget.setAttribute( "font-size", font.getFontHeightInPoints() @@ -532,7 +532,7 @@ public class ExcelToFoConverter extends AbstractExcelConverter if ( !isOutputHiddenColumns() && sheet.isColumnHidden( colIx ) ) continue; - CellRangeAddress range = ExcelToHtmlUtils.getMergedRange( + CellRangeAddress range = AbstractExcelUtils.getMergedRange( mergedRanges, row.getRowNum(), colIx ); if ( range != null diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java index e3f5e9aaff..1384cc67f0 100644 --- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java +++ b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java @@ -53,7 +53,7 @@ import org.w3c.dom.Text; /** * Converts xls files (97-2007) to HTML file. - * + * * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com) */ @Beta @@ -63,7 +63,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { /** * Java main() interface to interact with {@link ExcelToHtmlConverter} - * + * * <p> * Usage: ExcelToHtmlConverter infile outfile * </p> @@ -92,7 +92,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { /** * Converts Excel file (97-2007) into HTML file. - * + * * @param xlsFile * workbook file to process * @return DOM representation of result HTML @@ -100,14 +100,14 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { * @throws ParserConfigurationException If configuration is incorrect */ public static Document process( File xlsFile ) throws IOException, ParserConfigurationException { - try (HSSFWorkbook workbook = ExcelToHtmlUtils.loadXls(xlsFile)) { + try (HSSFWorkbook workbook = AbstractExcelUtils.loadXls(xlsFile)) { return ExcelToHtmlConverter.process(workbook); } } /** * Converts Excel file (97-2007) into HTML file. - * + * * @param xlsStream workbook stream to process * @return DOM representation of result HTML * @throws IOException If an error occurs reading or writing files @@ -121,7 +121,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { /** * Converts Excel file (97-2007) into HTML file. - * + * * @param workbook workbook instance to process * @return DOM representation of result HTML * @throws IOException If an error occurs reading or writing files @@ -173,13 +173,13 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { case SOLID_FOREGROUND: final HSSFColor foregroundColor = cellStyle.getFillForegroundColorColor(); if ( foregroundColor == null ) break; - String fgCol = ExcelToHtmlUtils.getColor( foregroundColor ); + String fgCol = AbstractExcelUtils.getColor( foregroundColor ); style.append("background-color:").append(fgCol).append(";"); break; default: final HSSFColor backgroundColor = cellStyle.getFillBackgroundColorColor(); if ( backgroundColor == null ) break; - String bgCol = ExcelToHtmlUtils.getColor( backgroundColor ); + String bgCol = AbstractExcelUtils.getColor( backgroundColor ); style.append("background-color:").append(bgCol).append(";"); break; } @@ -206,16 +206,16 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { } StringBuilder borderStyle = new StringBuilder(); - borderStyle.append( ExcelToHtmlUtils.getBorderWidth( xlsBorder ) ); + borderStyle.append( AbstractExcelUtils.getBorderWidth( xlsBorder ) ); borderStyle.append( ' ' ); - borderStyle.append( ExcelToHtmlUtils.getBorderStyle( xlsBorder ) ); + borderStyle.append( AbstractExcelUtils.getBorderStyle( xlsBorder ) ); final HSSFColor color = workbook.getCustomPalette().getColor( borderColor ); if ( color != null ) { borderStyle.append( ' ' ); - borderStyle.append( ExcelToHtmlUtils.getColor( color ) ); + borderStyle.append( AbstractExcelUtils.getColor( color ) ); } style.append("border-").append(type).append(":").append(borderStyle).append(";"); @@ -231,7 +231,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { final HSSFColor fontColor = workbook.getCustomPalette().getColor( font.getColor() ); if ( fontColor != null ) - style.append("color: ").append(ExcelToHtmlUtils.getColor(fontColor)).append("; "); + style.append("color: ").append(AbstractExcelUtils.getColor(fontColor)).append("; "); if ( font.getFontHeightInPoints() != 0 ) style.append("font-size:").append(font.getFontHeightInPoints()).append("pt;"); @@ -307,7 +307,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { } else { - value = ExcelToHtmlUtils.EMPTY; + value = AbstractExcelUtils.EMPTY; } break; case NUMERIC: @@ -327,12 +327,12 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { POILogger.WARN, "Unexpected cell cachedFormulaResultType (" + cell.getCachedFormulaResultType() + ")" ); - value = ExcelToHtmlUtils.EMPTY; + value = AbstractExcelUtils.EMPTY; break; } break; case BLANK: - value = ExcelToHtmlUtils.EMPTY; + value = AbstractExcelUtils.EMPTY; break; case NUMERIC: value = _formatter.formatCellValue( cell ); @@ -349,14 +349,14 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { return true; } - final boolean noText = ExcelToHtmlUtils.isEmpty( value ); + final boolean noText = AbstractExcelUtils.isEmpty( value ); final boolean wrapInDivs = !noText && isUseDivsToSpan() && !cellStyle.getWrapText(); if ( cellStyle.getIndex() != 0 ) { @SuppressWarnings("resource") HSSFWorkbook workbook = cell.getRow().getSheet().getWorkbook(); String mainCssClass = getStyleClassName( workbook, cellStyle ); - + if ( wrapInDivs ) { tableCellElement.setAttribute( "class", mainCssClass + " " + cssClassContainerCell ); @@ -419,7 +419,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { tableCellElement.appendChild( text ); } - return ExcelToHtmlUtils.isEmpty( value ) && (cellStyle.getIndex() == 0); + return AbstractExcelUtils.isEmpty( value ) && (cellStyle.getIndex() == 0); } protected void processColumnHeaders( HSSFSheet sheet, int maxSheetColumns, @@ -472,16 +472,16 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { } protected void processDocumentInformation(SummaryInformation summaryInformation ) { - if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getTitle() ) ) + if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getTitle() ) ) htmlDocumentFacade.setTitle( summaryInformation.getTitle() ); - if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getAuthor() ) ) + if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getAuthor() ) ) htmlDocumentFacade.addAuthor( summaryInformation.getAuthor() ); - if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getKeywords() ) ) + if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getKeywords() ) ) htmlDocumentFacade.addKeywords( summaryInformation.getKeywords() ); - if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getComments() ) ) + if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getComments() ) ) htmlDocumentFacade .addDescription( summaryInformation.getComments() ); } @@ -512,7 +512,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter { if ( !isOutputHiddenColumns() && sheet.isColumnHidden( colIx ) ) continue; - CellRangeAddress range = ExcelToHtmlUtils.getMergedRange( + CellRangeAddress range = AbstractExcelUtils.getMergedRange( mergedRanges, row.getRowNum(), colIx ); if ( range != null diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java index e59b559f9f..ba759fdff4 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java @@ -923,7 +923,7 @@ public abstract class AbstractWordConverter imageWidth *= aspectRatioX / 1000f; } imageWidth /= AbstractWordUtils.TWIPS_PER_INCH; - + float imageHeight = picture.getDyaGoal(); if (aspectRatioY > 0) { imageHeight *= aspectRatioY / 1000f; @@ -934,7 +934,7 @@ public abstract class AbstractWordConverter picture.suggestPictureType(), picture.suggestFullFileName(), imageWidth, imageHeight ); - if ( WordToFoUtils.isNotEmpty( url ) ) + if ( AbstractWordUtils.isNotEmpty( url ) ) { processImage( currentBlock, inlined, picture, url ); return; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java index b1b227c2d3..90da79a9ee 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java @@ -61,7 +61,7 @@ public class AbstractWordUtils * Creates array of all possible cell edges. In HTML (and FO) cells from * different rows and same column should have same width, otherwise spanning * shall be used. - * + * * @param table * table to build cell edges array from * @return array of cell edges (including leftest one) in twips @@ -137,7 +137,7 @@ public class AbstractWordUtils { Node child1 = childNodes.item( i ); Node child2 = childNodes.item( i + 1 ); - if ( !WordToFoUtils.canBeMerged( child1, child2, childTagName ) ) + if ( !AbstractWordUtils.canBeMerged( child1, child2, childTagName ) ) continue; // merge @@ -266,7 +266,7 @@ public class AbstractWordUtils numberingState.levels.remove( childKey ); } } - + bulletBuffer.append( NumberFormatter.getNumber( num, list.getNumberFormat( level ) ) ); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java index 12b15e2dc6..b9c449be63 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java @@ -309,9 +309,8 @@ public class FoDocumentFacade if ( child.getNodeType() == Node.ELEMENT_NODE ) { Element childElement = (Element) child; - if ( WordToFoUtils.isNotEmpty( childElement.getNamespaceURI() ) - && WordToFoUtils.isNotEmpty( childElement - .getLocalName() ) + if ( AbstractWordUtils.isNotEmpty( childElement.getNamespaceURI() ) + && AbstractWordUtils.isNotEmpty( childElement.getLocalName() ) && namespace.equals( childElement.getNamespaceURI() ) && name.equals( childElement.getLocalName() ) ) { @@ -321,7 +320,7 @@ public class FoDocumentFacade } } - if ( WordToFoUtils.isNotEmpty( value ) ) + if ( AbstractWordUtils.isNotEmpty( value ) ) { Element property = document.createElementNS( namespace, prefix + ":" + name ); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java index adf2c75e5d..9d6b631e4c 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java @@ -27,6 +27,7 @@ import org.apache.poi.hwpf.model.io.HWPFFileSystem; import org.apache.poi.hwpf.sprm.SprmBuffer; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.StringUtil; @Internal @@ -54,7 +55,7 @@ public class ComplexFileTable { while (tableStream[offset] == GRPPRL_TYPE) { offset++; int size = LittleEndian.getShort(tableStream, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; byte[] bs = LittleEndian.getByteArray(tableStream, offset, size, MAX_RECORD_LENGTH); offset += size; @@ -68,7 +69,7 @@ public class ComplexFileTable { " but had " + tableStream[offset]); } int pieceTableSize = LittleEndian.getInt(tableStream, ++offset); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; _tpt = newTextPieceTable(documentStream, tableStream, offset, pieceTableSize, fcMin, charset); } @@ -99,7 +100,7 @@ public class ComplexFileTable { byte[] table = _tpt.writeTo(wordDocumentStream); - byte[] numHolder = new byte[LittleEndian.INT_SIZE]; + byte[] numHolder = new byte[LittleEndianConsts.INT_SIZE]; LittleEndian.putInt(numHolder, 0, table.length); tableStream.write(numHolder); tableStream.write(table); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java index 325fd5b974..81c99985dd 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java @@ -18,6 +18,7 @@ package org.apache.poi.hwpf.model; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * The FFData structure specifies form field data for a text box, check box, or @@ -29,7 +30,7 @@ import org.apache.poi.util.LittleEndian; * <p> * This class is internal. It content or properties may change without notice * due to changes in our knowledge of internal Microsoft Word binary structures. - * + * * @author Sergey Vladimirov; according to [MS-DOC] -- v20121003 Word (.doc) * Binary File Format; Copyright (c) 2012 Microsoft Corporation; * Release: October 8, 2012 @@ -114,7 +115,7 @@ public class FFData { this._wDef = Integer .valueOf( LittleEndian.getUShort( std, offset ) ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; } else { @@ -170,7 +171,7 @@ public class FFData if ( _base.getIType() == FFDataBase.ITYPE_CHCK || _base.getIType() == FFDataBase.ITYPE_DROP ) { - size += LittleEndian.SHORT_SIZE; + size += LittleEndianConsts.SHORT_SIZE; } size += _xstzTextFormat.getSize(); @@ -211,7 +212,7 @@ public class FFData || _base.getIType() == FFDataBase.ITYPE_DROP ) { LittleEndian.putUShort( buffer, offset, _wDef ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; } offset += _xstzTextFormat.serialize( buffer, offset ); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java index ab477332cc..3d162f3391 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java @@ -26,6 +26,7 @@ import java.util.Map; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -146,7 +147,7 @@ public final class FIBFieldHandler private final static POILogger log = POILogFactory.getLogger(FIBFieldHandler.class); - private static final int FIELD_SIZE = LittleEndian.INT_SIZE * 2; + private static final int FIELD_SIZE = LittleEndianConsts.INT_SIZE * 2; private Map<Integer, UnhandledDataStructure> _unknownMap = new HashMap<>(); private int[] _fields; @@ -161,7 +162,7 @@ public final class FIBFieldHandler { int fieldOffset = (x * FIELD_SIZE) + offset; int dsOffset = LittleEndian.getInt(mainStream, fieldOffset); - fieldOffset += LittleEndian.INT_SIZE; + fieldOffset += LittleEndianConsts.INT_SIZE; int dsSize = LittleEndian.getInt(mainStream, fieldOffset); if (offsetList.contains(Integer.valueOf(x)) ^ areKnown) @@ -216,13 +217,13 @@ public final class FIBFieldHandler public int sizeInBytes() { - return (_fields.length * LittleEndian.INT_SIZE); + return (_fields.length * LittleEndianConsts.INT_SIZE); } public int getFieldsCount() { return _fields.length / 2; } - + void writeTo(byte[] mainStream, int offset, ByteArrayOutputStream tableStream) throws IOException { @@ -233,21 +234,21 @@ public final class FIBFieldHandler { _fields[x * 2] = tableStream.size(); LittleEndian.putInt(mainStream, offset, tableStream.size()); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; byte[] buf = ds.getBuf(); tableStream.write(buf); _fields[(x * 2) + 1] = buf.length; LittleEndian.putInt(mainStream, offset, buf.length); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; } else { LittleEndian.putInt(mainStream, offset, _fields[x * 2]); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; LittleEndian.putInt(mainStream, offset, _fields[(x * 2) + 1]); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; } } } @@ -283,9 +284,9 @@ public final class FIBFieldHandler { result.append( '\t' ); result.append( leftPad( Integer.toString( x ), 8, ' ' ) ); - result.append( leftPad( Integer.toString( 154 + x * LittleEndian.INT_SIZE * 2 ), 6, ' ' ) ); + result.append( leftPad( Integer.toString( 154 + x * LittleEndianConsts.INT_SIZE * 2 ), 6, ' ' ) ); result.append( " 0x" ); - result.append( leftPad( Integer.toHexString( 154 + x * LittleEndian.INT_SIZE * 2 ), 4, '0' ) ); + result.append( leftPad( Integer.toHexString( 154 + x * LittleEndianConsts.INT_SIZE * 2 ), 4, '0' ) ); result.append( leftPad( Integer.toString( getFieldOffset( x ) ), 8, ' ' ) ); result.append( leftPad( Integer.toString( getFieldSize( x ) ), 8, ' ' ) ); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java b/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java index 87182333cc..532318d739 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java @@ -24,6 +24,7 @@ import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * FFN - Font Family Name. FFN is a data structure that stores the names of the Main @@ -63,15 +64,15 @@ public final class Ffn int offsetTmp = offset; _cbFfnM1 = LittleEndian.getUByte(buf,offset); - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; _info = buf[offset]; - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; _wWeight = LittleEndian.getShort(buf, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; _chs = buf[offset]; - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; _ixchSzAlt = buf[offset]; - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; // read panose and fs so we can write them back out. System.arraycopy(buf, offset, _panose, 0, _panose.length); @@ -86,7 +87,7 @@ public final class Ffn for(int i = 0; i < _xszFfnLength; i++) { _xszFfn[i] = (char)LittleEndian.getShort(buf, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; } @@ -161,15 +162,15 @@ public final class Ffn byte[] buf = IOUtils.safelyAllocate(this.getSize(), MAX_RECORD_LENGTH); buf[offset] = (byte)_cbFfnM1; - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; buf[offset] = _info; - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; LittleEndian.putShort(buf, offset, _wWeight); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; buf[offset] = _chs; - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; buf[offset] = _ixchSzAlt; - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; System.arraycopy(_panose,0,buf, offset,_panose.length); offset += _panose.length; @@ -179,7 +180,7 @@ public final class Ffn for(int i = 0; i < _xszFfn.length; i++) { LittleEndian.putShort(buf, offset, (short)_xszFfn[i]); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; } return buf; @@ -190,7 +191,7 @@ public final class Ffn public boolean equals(Object other) { if (!(other instanceof Ffn)) return false; Ffn o = (Ffn)other; - + return ( o._cbFfnM1 == this._cbFfnM1 && o._info == this._info diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java index a8503e70ca..d1a9389dcd 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java @@ -27,6 +27,7 @@ import java.util.Locale; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -72,7 +73,7 @@ public final class FileInformationBlock assert offset == 32; _csw = LittleEndian.getUShort( mainDocument, offset ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; assert offset == 34; _fibRgW = new FibRgW97( mainDocument, offset ); @@ -80,7 +81,7 @@ public final class FileInformationBlock assert offset == 62; _cslw = LittleEndian.getUShort( mainDocument, offset ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; assert offset == 64; if ( _fibBase.getNFib() < 105 ) @@ -92,10 +93,10 @@ public final class FileInformationBlock _cbRgFcLcb = 74; // skip fibRgFcLcbBlob (read later at fillVariableFields) - offset += _cbRgFcLcb * LittleEndian.INT_SIZE * 2; + offset += _cbRgFcLcb * LittleEndianConsts.INT_SIZE * 2; _cswNew = LittleEndian.getUShort( mainDocument, offset ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; _cswNew = 0; _nFibNew = -1; @@ -109,23 +110,23 @@ public final class FileInformationBlock assert offset == 152; _cbRgFcLcb = LittleEndian.getUShort( mainDocument, offset ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; assert offset == 154; // skip fibRgFcLcbBlob (read later at fillVariableFields) - offset += _cbRgFcLcb * LittleEndian.INT_SIZE * 2; + offset += _cbRgFcLcb * LittleEndianConsts.INT_SIZE * 2; _cswNew = LittleEndian.getUShort( mainDocument, offset ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; if ( _cswNew != 0 ) { _nFibNew = LittleEndian.getUShort( mainDocument, offset ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; // first short is already read as _nFibNew final int fibRgCswNewLength = ( _cswNew - 1 ) - * LittleEndian.SHORT_SIZE; + * LittleEndianConsts.SHORT_SIZE; _fibRgCswNew = IOUtils.safelyAllocate(fibRgCswNewLength, MAX_RECORD_LENGTH); LittleEndian.getByteArray( mainDocument, offset, fibRgCswNewLength, MAX_RECORD_LENGTH ); offset += fibRgCswNewLength; @@ -144,7 +145,7 @@ public final class FileInformationBlock { int nfib = getNFib(); String nfibHex = String.format(Locale.ROOT, "%04X", nfib); - + // Note - CommonCrawl shows there's more variation in these than // the documentation suggests, so accept common clusters around // the "correct" value as well @@ -665,7 +666,7 @@ public final class FileInformationBlock { _fieldHandler.setFieldSize(FIBFieldHandler.STTBFFFN, lcbSttbFffn); } - + public int getFcSttbfRMark() { return _fieldHandler.getFieldOffset(FIBFieldHandler.STTBFRMARK); @@ -675,7 +676,7 @@ public final class FileInformationBlock { return _fieldHandler.getFieldSize(FIBFieldHandler.STTBFRMARK); } - + public void setFcSttbfRMark(int fcSttbfRMark) { _fieldHandler.setFieldOffset(FIBFieldHandler.STTBFRMARK, fcSttbfRMark); @@ -746,7 +747,7 @@ public final class FileInformationBlock { _fieldHandler.setFieldSize(FIBFieldHandler.PLFLFO, modifiedHigh); } - + /** * How many bytes of the main stream contain real data. */ @@ -1081,29 +1082,29 @@ public final class FileInformationBlock int offset = FibBase.getSize(); LittleEndian.putUShort( mainStream, offset, _csw ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; _fibRgW.serialize( mainStream, offset ); offset += FibRgW97.getSize(); LittleEndian.putUShort( mainStream, offset, _cslw ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; ( (FibRgLw97) _fibRgLw ).serialize( mainStream, offset ); offset += FibRgLw97.getSize(); LittleEndian.putUShort( mainStream, offset, _cbRgFcLcb ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; _fieldHandler.writeTo( mainStream, offset, tableStream ); - offset += _cbRgFcLcb * LittleEndian.INT_SIZE * 2; + offset += _cbRgFcLcb * LittleEndianConsts.INT_SIZE * 2; LittleEndian.putUShort( mainStream, offset, _cswNew ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; if ( _cswNew != 0 ) { LittleEndian.putUShort( mainStream, offset, _nFibNew ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; System.arraycopy( _fibRgCswNew, 0, mainStream, offset, _fibRgCswNew.length ); @@ -1113,9 +1114,9 @@ public final class FileInformationBlock public int getSize() { - return FibBase.getSize() + LittleEndian.SHORT_SIZE + FibRgW97.getSize() - + LittleEndian.SHORT_SIZE + FibRgLw97.getSize() - + LittleEndian.SHORT_SIZE + _fieldHandler.sizeInBytes(); + return FibBase.getSize() + LittleEndianConsts.SHORT_SIZE + FibRgW97.getSize() + + LittleEndianConsts.SHORT_SIZE + FibRgLw97.getSize() + + LittleEndianConsts.SHORT_SIZE + _fieldHandler.sizeInBytes(); } public FibBase getFibBase() diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java index 32105686e9..767520c96b 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java @@ -23,6 +23,7 @@ import java.io.IOException; import org.apache.poi.hwpf.model.io.HWPFFileSystem; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -55,9 +56,9 @@ public final class FontTable this.fcSttbfffn = offset; _stringCount = LittleEndian.getShort(buf, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; _extraDataSz = LittleEndian.getShort(buf, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; _fontNames = new Ffn[_stringCount]; //Ffn corresponds to a Pascal style String in STTBF. @@ -124,7 +125,7 @@ public final class FontTable public void writeTo( ByteArrayOutputStream tableStream ) throws IOException { - byte[] buf = new byte[LittleEndian.SHORT_SIZE]; + byte[] buf = new byte[LittleEndianConsts.SHORT_SIZE]; LittleEndian.putShort(buf, 0, _stringCount); tableStream.write(buf); LittleEndian.putShort(buf, 0, _extraDataSz); @@ -146,11 +147,11 @@ public final class FontTable || o._extraDataSz != this._extraDataSz || o._fontNames.length != this._fontNames.length ) return false; - + for (int i=0; i<o._fontNames.length; i++) { if (!o._fontNames[i].equals(this._fontNames[i])) return false; } - + return true; } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java b/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java index 78d2bc40f8..2f22afdd51 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java @@ -24,6 +24,7 @@ import java.util.Arrays; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * The LFOData structure contains the Main Document CP of the corresponding LFO, @@ -49,7 +50,7 @@ public class LFOData int offset = startOffset; _cp = LittleEndian.getInt( buf, offset ); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; _rgLfoLvl = new ListFormatOverrideLevel[cLfolvl]; for ( int x = 0; x < cLfolvl; x++ ) @@ -72,7 +73,7 @@ public class LFOData public int getSizeInBytes() { int result = 0; - result += LittleEndian.INT_SIZE; + result += LittleEndianConsts.INT_SIZE; for ( ListFormatOverrideLevel lfolvl : _rgLfoLvl ) result += lfolvl.getSizeInBytes(); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java index c46981e4fe..2b54097606 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java @@ -25,6 +25,7 @@ import java.util.Objects; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -56,7 +57,7 @@ public final class ListTables int offset = lstOffset; int cLst = LittleEndian.getShort( tableStream, offset ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; int levelOffset = offset + ( cLst * LSTF.getSize() ); for ( int x = 0; x < cLst; x++ ) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java b/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java index c2f1ab387a..fd1ec55676 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java @@ -16,12 +16,13 @@ ==================================================================== */ package org.apache.poi.hwpf.model; +import java.util.Arrays; + import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import java.util.Arrays; - public class NilPICFAndBinData { @@ -39,7 +40,7 @@ public class NilPICFAndBinData { int lcb = LittleEndian.getInt( data, offset ); int cbHeader = LittleEndian.getUShort( data, offset - + LittleEndian.INT_SIZE ); + + LittleEndianConsts.INT_SIZE ); if ( cbHeader != 0x44 ) { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java index ebbc17e383..8bf4cb6d79 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java @@ -21,7 +21,7 @@ import java.nio.charset.Charset; import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.util.Internal; -import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; import org.apache.poi.util.StringUtil; @@ -74,12 +74,12 @@ public final class OldFfn { charset = wmfCharset.getCharset(); } charset = charset == null ? StringUtil.WIN_1252 : charset; - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; //if this byte here == 7, it _may_ signify existence of //an altername font name //not sure what the byte after the _chs does - offset += LittleEndian.BYTE_SIZE; + offset += LittleEndianConsts.BYTE_SIZE; int fontNameLength = -1; for (int i = offset; i < fontTableEnd; i++) { if (buf[i] == 0) { @@ -109,7 +109,7 @@ public final class OldFfn { //reset to 0 for length calculation altFontNameLength = (altFontNameLength < 0) ? 0 : altFontNameLength + 1;//add one for zero byte - int len = LittleEndian.INT_SIZE + LittleEndian.BYTE_SIZE + LittleEndian.BYTE_SIZE +//6 starting bytes + int len = LittleEndianConsts.INT_SIZE + LittleEndianConsts.BYTE_SIZE + LittleEndianConsts.BYTE_SIZE +//6 starting bytes fontNameLength + altFontNameLength + 1;//+1 is for the zero byte //this len should == fontDescriptionLength diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java index 814f0e39f6..0bc44f3943 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -46,7 +47,7 @@ public final class OldFontTable { int fontTableLength = LittleEndian.getShort(buf, offset); int endOfTableOffset = offset + length; - int startOffset = offset + LittleEndian.SHORT_SIZE;//first short should == length! + int startOffset = offset + LittleEndianConsts.SHORT_SIZE;//first short should == length! while (true) { OldFfn oldFfn = OldFfn.build(buf, startOffset, endOfTableOffset); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java index 277440f24c..f93604fffd 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java @@ -20,6 +20,7 @@ package org.apache.poi.hwpf.model; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * This class holds all of the section formatting @@ -72,7 +73,7 @@ public final class OldSectionTable extends SectionTable // were the new ones, we sometimes "need" more data than we have. // As a workaround, have a few extra 0 bytes on the end! byte[] buf = IOUtils.safelyAllocate(sepxSize+2, Short.MAX_VALUE+2); - fileOffset += LittleEndian.SHORT_SIZE; + fileOffset += LittleEndianConsts.SHORT_SIZE; System.arraycopy(documentStream, fileOffset, buf, 0, buf.length); sepx = new SEPX(sed, startAt, endAt, buf); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java index 83c2ccb221..4f966badd7 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java @@ -25,6 +25,7 @@ import org.apache.poi.util.BitField; import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; @Internal public final class ParagraphHeight implements Duplicatable { @@ -50,11 +51,11 @@ public final class ParagraphHeight implements Duplicatable { public ParagraphHeight(byte[] buf, int offset) { infoField = LittleEndian.getShort(buf, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; reserved = LittleEndian.getShort(buf, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; dxaCol = LittleEndian.getInt(buf, offset); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; dymLineOrHeight = LittleEndian.getInt(buf, offset); } @@ -69,11 +70,11 @@ public final class ParagraphHeight implements Duplicatable { byte[] buf = new byte[12]; int offset = 0; LittleEndian.putShort(buf, offset, infoField); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; LittleEndian.putShort(buf, offset, reserved); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; LittleEndian.putInt(buf, offset, dxaCol); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; LittleEndian.putInt(buf, offset, dymLineOrHeight); return buf; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java index b34e2d1fbf..4d4d3ade78 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java @@ -23,6 +23,7 @@ import java.util.Objects; import org.apache.poi.common.Duplicatable; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.StringUtil; @Internal @@ -54,9 +55,9 @@ public final class PieceDescriptor implements Duplicatable { */ public PieceDescriptor(byte[] buf, int offset, Charset charset) { descriptor = LittleEndian.getShort(buf, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; fc = LittleEndian.getInt(buf, offset); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; prm = new PropertyModifier(LittleEndian.getShort(buf, offset)); if (charset == null) { // see if this piece uses unicode. @@ -125,9 +126,9 @@ public final class PieceDescriptor implements Duplicatable { int offset = 0; byte[] buf = new byte[8]; LittleEndian.putShort(buf, offset, descriptor); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; LittleEndian.putInt(buf, offset, tempFc); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; LittleEndian.putShort(buf, offset, prm.getValue()); return buf; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java index 54dc1afe52..579ec187c7 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * Plex of CPs stored in File (PLCF) @@ -100,7 +101,7 @@ public final class PlexOfCps { public byte[] toByteArray() { int size = _props.size(); - int cpBufSize = ((size + 1) * LittleEndian.INT_SIZE); + int cpBufSize = ((size + 1) * LittleEndianConsts.INT_SIZE); int structBufSize = +(_cbStruct * size); int bufSize = cpBufSize + structBufSize; @@ -110,15 +111,15 @@ public final class PlexOfCps { for (int x = 0; x < size; x++) { GenericPropertyNode node = _props.get(x); nodeEnd = node.getEnd(); - + // put the starting offset of the property into the plcf. - LittleEndian.putInt(buf, (LittleEndian.INT_SIZE * x), node.getStart()); + LittleEndian.putInt(buf, (LittleEndianConsts.INT_SIZE * x), node.getStart()); // put the struct into the plcf System.arraycopy(node.getBytes(), 0, buf, cpBufSize + (x * _cbStruct), _cbStruct); } // put the ending offset of the last property into the plcf. - LittleEndian.putInt(buf, LittleEndian.INT_SIZE * size, nodeEnd); + LittleEndian.putInt(buf, LittleEndianConsts.INT_SIZE * size, nodeEnd); return buf; } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java index 41917d83db..e2a1739891 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.NoSuchElementException; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -65,7 +66,7 @@ public class PlfLfo * [MS-DOC] -- v20110315 Word (.doc) Binary File Format */ long lfoMacLong = LittleEndian.getUInt( tableStream, offset ); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; if ( lfoMacLong > Integer.MAX_VALUE ) { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java index b5551d07ba..36832e6c45 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java @@ -20,6 +20,7 @@ package org.apache.poi.hwpf.model; import org.apache.poi.common.Duplicatable; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * Section Descriptor (SED) @@ -64,11 +65,11 @@ public final class SectionDescriptor implements Duplicatable { public SectionDescriptor(byte[] buf, int offset) { fn = LittleEndian.getShort(buf, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; fcSepx = LittleEndian.getInt(buf, offset); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; fnMpr = LittleEndian.getShort(buf, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; fcMpr = LittleEndian.getInt(buf, offset); } @@ -102,11 +103,11 @@ public final class SectionDescriptor implements Duplicatable { byte[] buf = new byte[12]; LittleEndian.putShort(buf, offset, fn); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; LittleEndian.putInt(buf, offset, fcSepx); - offset += LittleEndian.INT_SIZE; + offset += LittleEndianConsts.INT_SIZE; LittleEndian.putShort(buf, offset, fnMpr); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; LittleEndian.putInt(buf, offset, fcMpr); return buf; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java index 23df32a6dc..5e7186b920 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java @@ -26,6 +26,7 @@ import org.apache.poi.hwpf.model.io.HWPFFileSystem; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -81,7 +82,7 @@ public class SectionTable // The first short at the offset is the size of the grpprl. int sepxSize = LittleEndian.getShort(documentStream, fileOffset); byte[] buf = IOUtils.safelyAllocate(sepxSize, MAX_RECORD_LENGTH); - fileOffset += LittleEndian.SHORT_SIZE; + fileOffset += LittleEndianConsts.SHORT_SIZE; System.arraycopy(documentStream, fileOffset, buf, 0, buf.length); _sections.add(new SEPX(sed, startAt, endAt, buf)); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java b/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java index f36519c9f3..92378e8fed 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java @@ -19,6 +19,7 @@ package org.apache.poi.hwpf.model; import java.util.Arrays; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; import org.apache.poi.util.StringUtil; @@ -34,7 +35,7 @@ import org.apache.poi.util.StringUtil; * <p> * This class is internal. It content or properties may change without notice * due to changes in our knowledge of internal Microsoft Word binary structures. - * + * * @author Sergey Vladimirov; according to [MS-DOC] -- v20121003 Word (.doc) * Binary File Format; Copyright (c) 2012 Microsoft Corporation; * Release: October 8, 2012 @@ -76,7 +77,7 @@ public class Sttb public void fillFields( byte[] buffer, int startOffset ) { short ffff = LittleEndian.getShort( buffer, startOffset ); - int offset = startOffset + LittleEndian.SHORT_SIZE; + int offset = startOffset + LittleEndianConsts.SHORT_SIZE; if ( ffff != (short) 0xffff ) { @@ -137,20 +138,20 @@ public class Sttb public int getSize() { // ffff - int size = LittleEndian.SHORT_SIZE; + int size = LittleEndianConsts.SHORT_SIZE; // cData size += _cDataLength; // cbExtra - size += LittleEndian.SHORT_SIZE; + size += LittleEndianConsts.SHORT_SIZE; if ( this._fExtend ) { for ( String data : _data ) { // cchData - size += LittleEndian.SHORT_SIZE; + size += LittleEndianConsts.SHORT_SIZE; // data size += 2 * data.length(); } @@ -160,9 +161,9 @@ public class Sttb for ( String data : _data ) { // cchData - size += LittleEndian.BYTE_SIZE; + size += LittleEndianConsts.BYTE_SIZE; // data - size += 1 * data.length(); + size += data.length(); } } @@ -200,13 +201,13 @@ public class Sttb { LittleEndian.putInt( buffer, 2, _data.length ); LittleEndian.putUShort( buffer, 6, _cbExtra ); - offset = 2 + LittleEndian.INT_SIZE + LittleEndian.SHORT_SIZE; + offset = 2 + LittleEndianConsts.INT_SIZE + LittleEndianConsts.SHORT_SIZE; } else { LittleEndian.putUShort( buffer, 2, _data.length ); LittleEndian.putUShort( buffer, 4, _cbExtra ); - offset = 2 + LittleEndian.SHORT_SIZE + LittleEndian.SHORT_SIZE; + offset = 2 + LittleEndianConsts.SHORT_SIZE + LittleEndianConsts.SHORT_SIZE; } for ( int i = 0; i < _data.length; i++ ) @@ -224,7 +225,7 @@ public class Sttb if ( _fExtend ) { LittleEndian.putUShort( buffer, offset, entry.length() ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; StringUtil.putUnicodeLE( entry, buffer, offset ); offset += 2 * entry.length(); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java index a1f9d9623d..c45a6b1798 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java @@ -24,6 +24,7 @@ import org.apache.poi.hwpf.usermodel.ParagraphProperties; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; import org.apache.poi.util.StringUtil; @@ -91,7 +92,7 @@ public final class StyleDescription { if (word9) { nameLength = LittleEndian.getShort(std, nameStart); multiplier = 2; - nameStart += LittleEndian.SHORT_SIZE; + nameStart += LittleEndianConsts.SHORT_SIZE; } else { nameLength = std[nameStart]; } @@ -107,7 +108,7 @@ public final class StyleDescription { _upxs = new UPX[countOfUPX]; for (int x = 0; x < countOfUPX; x++) { int upxSize = LittleEndian.getShort(std, varOffset); - varOffset += LittleEndian.SHORT_SIZE; + varOffset += LittleEndianConsts.SHORT_SIZE; byte[] upx = IOUtils.safelyAllocate(upxSize, Short.MAX_VALUE); System.arraycopy(std, varOffset, upx, 0, upxSize); @@ -199,18 +200,18 @@ public final class StyleDescription { char[] letters = _name.toCharArray(); LittleEndian.putShort(buf, _baseLength, (short) letters.length); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; for (int x = 0; x < letters.length; x++) { LittleEndian.putShort(buf, offset, (short) letters[x]); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; } // get past the null delimiter for the name. - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; for (int x = 0; x < _upxs.length; x++) { short upxSize = (short) _upxs[x].size(); LittleEndian.putShort(buf, offset, upxSize); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; System.arraycopy(_upxs[x].getUPX(), 0, buf, offset, upxSize); offset += upxSize + (upxSize % 2); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java index 8811bfb1f0..3a53a8b662 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java @@ -26,6 +26,7 @@ import org.apache.poi.hwpf.usermodel.CharacterProperties; import org.apache.poi.hwpf.usermodel.ParagraphProperties; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * Represents a document's stylesheet. A word documents formatting is stored as @@ -77,11 +78,11 @@ public final class StyleSheet { public StyleSheet(byte[] tableStream, int offset) { int startOffset = offset; _cbStshi = LittleEndian.getShort(tableStream, offset); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; /* * Count of styles in stylesheet - * + * * The number of styles in this style sheet. There will be stshi.cstd * (cbSTD, STD) pairs in the file following the STSHI. Note: styles can * be empty, i.e. cbSTD==0. @@ -92,7 +93,7 @@ public final class StyleSheet { // shall we discard cbLSD and mpstilsd? - offset = startOffset + LittleEndian.SHORT_SIZE + _cbStshi; + offset = startOffset + LittleEndianConsts.SHORT_SIZE + _cbStshi; _styleDescriptions = new StyleDescription[_stshif.getCstd()]; for (int x = 0; x < _stshif.getCstd(); x++) { int stdSize = LittleEndian.getShort(tableStream, offset); @@ -134,7 +135,7 @@ public final class StyleSheet { byte[] buf = new byte[_cbStshi + 2]; LittleEndian.putUShort(buf, offset, (short) _cbStshi); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; _stshif.setCstd(_styleDescriptions.length); _stshif.serialize(buf, offset); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java b/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java index 3aef1dd90e..769786afb8 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java @@ -21,6 +21,7 @@ package org.apache.poi.hwpf.model; import java.util.Arrays; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * The Xst structure is a string. The string is prepended by its length and is @@ -56,13 +57,13 @@ public class Xst int offset = startOffset; _cch = LittleEndian.getUShort( data, offset ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; _rgtchar = new char[_cch]; for ( int x = 0; x < _cch; x++ ) { _rgtchar[x] = (char) LittleEndian.getShort( data, offset ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; } } @@ -114,7 +115,7 @@ public class Xst public int getSize() { - return LittleEndian.SHORT_SIZE + _rgtchar.length * 2; + return LittleEndianConsts.SHORT_SIZE + _rgtchar.length * 2; } @Override @@ -127,12 +128,12 @@ public class Xst int offset = startOffset; LittleEndian.putUShort( data, offset, _cch ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; for ( char c : _rgtchar ) { LittleEndian.putShort( data, offset, (short) c ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; } } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java b/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java index f7aeb10dd1..242fb6755c 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java @@ -18,6 +18,7 @@ package org.apache.poi.hwpf.model; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -63,7 +64,7 @@ public class Xstz public int getSize() { - return _xst.getSize() + LittleEndian.SHORT_SIZE; + return _xst.getSize() + LittleEndianConsts.SHORT_SIZE; } public int serialize( byte[] data, int startOffset ) @@ -74,7 +75,7 @@ public class Xstz offset += _xst.getSize(); LittleEndian.putUShort( data, offset, _chTerm ); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; return offset - startOffset; } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java index 3fec02b9b5..64b83b7f8f 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java @@ -33,6 +33,7 @@ import org.apache.poi.hwpf.usermodel.ShadingDescriptor; import org.apache.poi.hwpf.usermodel.ShadingDescriptor80; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -435,7 +436,7 @@ public final class ParagraphSprmUncompressor for (int x = 0; x < delSize; x++) { tabMap.remove(Integer.valueOf(LittleEndian.getShort(grpprl, offset))); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; } int addSize = grpprl[offset++]; @@ -445,7 +446,7 @@ public final class ParagraphSprmUncompressor Integer key = Integer.valueOf(LittleEndian.getShort(grpprl, offset)); TabDescriptor val = new TabDescriptor( grpprl, start + ((TabDescriptor.getSize() * addSize) + x) ); tabMap.put(key, val); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; } tabPositions = new int[tabMap.size()]; @@ -467,56 +468,4 @@ public final class ParagraphSprmUncompressor pap.setRgdxaTab(tabPositions); pap.setRgtbd(tabDescriptors); } - -// private static void handleTabsAgain(ParagraphProperties pap, SprmOperation sprm) -// { -// byte[] grpprl = sprm.getGrpprl(); -// int offset = sprm.getGrpprlOffset(); -// int delSize = grpprl[offset++]; -// int[] tabPositions = pap.getRgdxaTab(); -// byte[] tabDescriptors = pap.getRgtbd(); -// -// HashMap tabMap = new HashMap(); -// for (int x = 0; x < tabPositions.length; x++) -// { -// tabMap.put(Integer.valueOf(tabPositions[x]), Byte.valueOf(tabDescriptors[x])); -// } -// -// for (int x = 0; x < delSize; x++) -// { -// tabMap.remove(Integer.valueOf(LittleEndian.getInt(grpprl, offset))); -// offset += LittleEndian.INT_SIZE;; -// } -// -// int addSize = grpprl[offset++]; -// for (int x = 0; x < addSize; x++) -// { -// Integer key = Integer.valueOf(LittleEndian.getInt(grpprl, offset)); -// Byte val = Byte.valueOf(grpprl[(LittleEndian.INT_SIZE * (addSize - x)) + x]); -// tabMap.put(key, val); -// offset += LittleEndian.INT_SIZE; -// } -// -// tabPositions = new int[tabMap.size()]; -// tabDescriptors = new byte[tabPositions.length]; -// ArrayList list = new ArrayList(); -// -// Iterator keyIT = tabMap.keySet().iterator(); -// while (keyIT.hasNext()) -// { -// list.add(keyIT.next()); -// } -// Collections.sort(list); -// -// for (int x = 0; x < tabPositions.length; x++) -// { -// Integer key = ((Integer)list.get(x)); -// tabPositions[x] = key.intValue(); -// tabDescriptors[x] = ((Byte)tabMap.get(key)).byteValue(); -// } -// -// pap.setRgdxaTab(tabPositions); -// pap.setRgtbd(tabDescriptors); -// } - } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java index 14798c3590..98c8886f94 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.poi.hwpf.usermodel.SectionProperties; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; @Internal public final class SectionSprmCompressor @@ -187,9 +188,9 @@ public final class SectionSprmCompressor { byte[] buf = new byte[7]; buf[0] = (byte)(newSEP.getFPropMark() ? 1 : 0); - int offset = LittleEndian.BYTE_SIZE; + int offset = LittleEndianConsts.BYTE_SIZE; LittleEndian.putShort(buf, 0, (short)newSEP.getIbstPropRMark()); - offset += LittleEndian.SHORT_SIZE; + offset += LittleEndianConsts.SHORT_SIZE; newSEP.getDttmPropRMark().serialize(buf, offset); size += SprmUtils.addSprm((short)0xD227, -1, buf, sprmList); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java index be028da98e..1bcee335e8 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java @@ -23,6 +23,7 @@ import org.apache.poi.common.Duplicatable; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.Removal; @Internal @@ -62,38 +63,38 @@ public final class SprmBuffer implements Duplicatable { } public void addSprm(short opcode, byte operand) { - int addition = LittleEndian.SHORT_SIZE + LittleEndian.BYTE_SIZE; + int addition = LittleEndianConsts.SHORT_SIZE + LittleEndianConsts.BYTE_SIZE; ensureCapacity(addition); LittleEndian.putShort(_buf, _offset, opcode); - _offset += LittleEndian.SHORT_SIZE; + _offset += LittleEndianConsts.SHORT_SIZE; _buf[_offset++] = operand; } public void addSprm(short opcode, byte[] operand) { - int addition = LittleEndian.SHORT_SIZE + LittleEndian.BYTE_SIZE + operand.length; + int addition = LittleEndianConsts.SHORT_SIZE + LittleEndianConsts.BYTE_SIZE + operand.length; ensureCapacity(addition); LittleEndian.putShort(_buf, _offset, opcode); - _offset += LittleEndian.SHORT_SIZE; + _offset += LittleEndianConsts.SHORT_SIZE; _buf[_offset++] = (byte) operand.length; System.arraycopy(operand, 0, _buf, _offset, operand.length); } public void addSprm(short opcode, int operand) { - int addition = LittleEndian.SHORT_SIZE + LittleEndian.INT_SIZE; + int addition = LittleEndianConsts.SHORT_SIZE + LittleEndianConsts.INT_SIZE; ensureCapacity(addition); LittleEndian.putShort(_buf, _offset, opcode); - _offset += LittleEndian.SHORT_SIZE; + _offset += LittleEndianConsts.SHORT_SIZE; LittleEndian.putInt(_buf, _offset, operand); - _offset += LittleEndian.INT_SIZE; + _offset += LittleEndianConsts.INT_SIZE; } public void addSprm(short opcode, short operand) { - int addition = LittleEndian.SHORT_SIZE + LittleEndian.SHORT_SIZE; + int addition = LittleEndianConsts.SHORT_SIZE + LittleEndianConsts.SHORT_SIZE; ensureCapacity(addition); LittleEndian.putShort(_buf, _offset, opcode); - _offset += LittleEndian.SHORT_SIZE; + _offset += LittleEndianConsts.SHORT_SIZE; LittleEndian.putShort(_buf, _offset, operand); - _offset += LittleEndian.SHORT_SIZE; + _offset += LittleEndianConsts.SHORT_SIZE; } public void append(byte[] grpprl) { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java index 990e1b22b8..287063c22d 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java @@ -21,6 +21,7 @@ import org.apache.poi.util.BitField; import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; /** * This class is used to represent a sprm operation from a Word 97/2000/XP @@ -88,7 +89,7 @@ public final class SprmOperation { return _gOffset; } - + public int getOperand() { switch ( getSizeCode() ) @@ -107,7 +108,7 @@ public final class SprmOperation byte operandLength = _grpprl[_gOffset + 1]; // initialized to zeros by JVM - byte[] codeBytes = new byte[LittleEndian.INT_SIZE]; + byte[] codeBytes = new byte[LittleEndianConsts.INT_SIZE]; for ( int i = 0; i < operandLength; i++ ) if ( _gOffset + i < _grpprl.length ) codeBytes[i] = _grpprl[_gOffset + 1 + i]; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java index e47f956512..e6facf2e86 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; @Internal @@ -37,11 +38,11 @@ public final class SprmUtils public static byte[] shortArrayToByteArray(short[] convert) { - byte[] buf = IOUtils.safelyAllocate(convert.length * (long)LittleEndian.SHORT_SIZE, MAX_RECORD_LENGTH); + byte[] buf = IOUtils.safelyAllocate(convert.length * (long)LittleEndianConsts.SHORT_SIZE, MAX_RECORD_LENGTH); for (int x = 0; x < convert.length; x++) { - LittleEndian.putShort(buf, x * LittleEndian.SHORT_SIZE, convert[x]); + LittleEndian.putShort(buf, x * LittleEndianConsts.SHORT_SIZE, convert[x]); } return buf; @@ -130,7 +131,7 @@ public final class SprmUtils { byte[] buf = new byte[4]; LittleEndian.putShort(buf, 0, brc[0]); - LittleEndian.putShort(buf, LittleEndian.SHORT_SIZE, brc[1]); + LittleEndian.putShort(buf, LittleEndianConsts.SHORT_SIZE, brc[1]); return LittleEndian.getInt(buf); } } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java index cbef3587ce..9c76e2ec13 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java @@ -28,6 +28,7 @@ import org.apache.poi.hwpf.usermodel.TableProperties; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; @Internal public final class TableSprmCompressor @@ -82,7 +83,7 @@ public final class TableSprmCompressor int itcMac = newTAP.getItcMac(); byte[] buf = IOUtils.safelyAllocate( 1 - + (LittleEndian.SHORT_SIZE*((long)itcMac + 1)) + + (LittleEndianConsts.SHORT_SIZE*((long)itcMac + 1)) + (TableCellDescriptor.SIZE*(long)itcMac), MAX_RECORD_LENGTH); buf[0] = (byte)itcMac; @@ -90,7 +91,7 @@ public final class TableSprmCompressor short[] dxaCenters = newTAP.getRgdxaCenter(); for (int x = 0; x < dxaCenters.length; x++) { - LittleEndian.putShort(buf, 1 + (x * LittleEndian.SHORT_SIZE), + LittleEndian.putShort(buf, 1 + (x * LittleEndianConsts.SHORT_SIZE), dxaCenters[x]); } @@ -98,7 +99,7 @@ public final class TableSprmCompressor for (int x = 0; x < cellDescriptors.length; x++) { cellDescriptors[x].serialize(buf, - 1+((itcMac+1)*LittleEndian.SHORT_SIZE)+(x*TableCellDescriptor.SIZE)); + 1+((itcMac+1)* LittleEndianConsts.SHORT_SIZE)+(x*TableCellDescriptor.SIZE)); } size += SprmUtils.addSpecialSprm((short)0xD608, buf, sprmList); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java index 4895196f42..cb7ffc95ac 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java @@ -21,6 +21,7 @@ import org.apache.poi.common.Duplicatable; import org.apache.poi.util.BitField; import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.Removal; /** @@ -52,13 +53,13 @@ public final class BorderCode implements Duplicatable { public BorderCode(byte[] buf, int offset) { _info = LittleEndian.getShort(buf, offset); - _info2 = LittleEndian.getShort(buf, offset + LittleEndian.SHORT_SIZE); + _info2 = LittleEndian.getShort(buf, offset + LittleEndianConsts.SHORT_SIZE); } public void serialize(byte[] buf, int offset) { LittleEndian.putShort(buf, offset, _info); - LittleEndian.putShort(buf, offset + LittleEndian.SHORT_SIZE, _info2); + LittleEndian.putShort(buf, offset + LittleEndianConsts.SHORT_SIZE, _info2); } public int toInt() diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java index 871ffa3cd2..be677fba87 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java @@ -23,6 +23,7 @@ import org.apache.poi.common.Duplicatable; import org.apache.poi.util.BitField; import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.LocaleUtil; import org.apache.poi.util.Removal; @@ -50,7 +51,7 @@ public final class DateAndTime implements Duplicatable { public DateAndTime(byte[] buf, int offset) { _info = LittleEndian.getShort(buf, offset); - _info2 = LittleEndian.getShort(buf, offset + LittleEndian.SHORT_SIZE); + _info2 = LittleEndian.getShort(buf, offset + LittleEndianConsts.SHORT_SIZE); } public Calendar getDate() { @@ -68,7 +69,7 @@ public final class DateAndTime implements Duplicatable { public void serialize(byte[] buf, int offset) { LittleEndian.putShort(buf, offset, _info); - LittleEndian.putShort(buf, offset + LittleEndian.SHORT_SIZE, _info2); + LittleEndian.putShort(buf, offset + LittleEndianConsts.SHORT_SIZE, _info2); } @Override diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java index 09a8590658..181dc6f75d 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java @@ -19,6 +19,7 @@ package org.apache.poi.hwpf.usermodel; import org.apache.poi.common.Duplicatable; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.Removal; /** @@ -41,7 +42,7 @@ public final class LineSpacingDescriptor implements Duplicatable { public LineSpacingDescriptor(byte[] buf, int offset) { _dyaLine = LittleEndian.getShort(buf, offset); - _fMultiLinespace = LittleEndian.getShort(buf, offset + LittleEndian.SHORT_SIZE); + _fMultiLinespace = LittleEndian.getShort(buf, offset + LittleEndianConsts.SHORT_SIZE); } @Override @@ -72,7 +73,7 @@ public final class LineSpacingDescriptor implements Duplicatable { public void serialize(byte[] buf, int offset) { LittleEndian.putShort(buf, offset, _dyaLine); - LittleEndian.putShort(buf, offset + LittleEndian.SHORT_SIZE, _fMultiLinespace); + LittleEndian.putShort(buf, offset + LittleEndianConsts.SHORT_SIZE, _fMultiLinespace); } public void setDyaLine(short dyaLine) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java index d2e0c2fc7f..8304161c24 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java @@ -36,6 +36,7 @@ import org.apache.poi.hwpf.sprm.SprmBuffer; import org.apache.poi.util.DocumentFormatException; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -471,9 +472,9 @@ public class Range { CharacterProperties baseChp = ss.getCharacterStyle(styleIndex); byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty(props, baseStyle); - byte[] withIndex = new byte[grpprl.length + LittleEndian.SHORT_SIZE]; + byte[] withIndex = new byte[grpprl.length + LittleEndianConsts.SHORT_SIZE]; LittleEndian.putShort(withIndex, 0, (short) styleIndex); - System.arraycopy(grpprl, 0, withIndex, LittleEndian.SHORT_SIZE, grpprl.length); + System.arraycopy(grpprl, 0, withIndex, LittleEndianConsts.SHORT_SIZE, grpprl.length); SprmBuffer buf = new SprmBuffer(withIndex, 2); _doc.getParagraphTable().insert(_parStart, _start, buf); @@ -522,9 +523,9 @@ public class Range { CharacterProperties baseChp = ss.getCharacterStyle(styleIndex); byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty(props, baseStyle); - byte[] withIndex = new byte[grpprl.length + LittleEndian.SHORT_SIZE]; + byte[] withIndex = new byte[grpprl.length + LittleEndianConsts.SHORT_SIZE]; LittleEndian.putShort(withIndex, 0, (short) styleIndex); - System.arraycopy(grpprl, 0, withIndex, LittleEndian.SHORT_SIZE, grpprl.length); + System.arraycopy(grpprl, 0, withIndex, LittleEndianConsts.SHORT_SIZE, grpprl.length); SprmBuffer buf = new SprmBuffer(withIndex, 2); _doc.getParagraphTable().insert(_parEnd, _end, buf); |