git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1808510 13f79535-47bb-0310-9956-ffa450edef68pull/71/head
@@ -794,9 +794,9 @@ public class AddDimensionedImage { | |||
*/ | |||
public class ClientAnchorDetail { | |||
public int fromIndex = 0; | |||
public int toIndex = 0; | |||
public int inset = 0; | |||
public int fromIndex; | |||
public int toIndex; | |||
public int inset; | |||
/** | |||
* Create a new instance of the ClientAnchorDetail class using the |
@@ -512,8 +512,8 @@ public class InCellLists { | |||
*/ | |||
public final class MultiLevelListItem { | |||
private String itemText = null; | |||
private ArrayList<String> lowerLevelItems = null; | |||
private String itemText; | |||
private ArrayList<String> lowerLevelItems; | |||
/** | |||
* Create a new instance of the MultiLevelListItem class using the |
@@ -33,19 +33,19 @@ import org.apache.poi.ss.usermodel.BorderStyle; | |||
* @author Jason Height | |||
*/ | |||
public class SVBorder extends AbstractBorder { | |||
private Color northColor = null; | |||
private Color eastColor = null; | |||
private Color southColor = null; | |||
private Color westColor = null; | |||
private Color northColor; | |||
private Color eastColor; | |||
private Color southColor; | |||
private Color westColor; | |||
private BorderStyle northBorderType = BorderStyle.NONE; | |||
private BorderStyle eastBorderType = BorderStyle.NONE; | |||
private BorderStyle southBorderType = BorderStyle.NONE; | |||
private BorderStyle westBorderType = BorderStyle.NONE; | |||
private boolean northBorder=false; | |||
private boolean eastBorder=false; | |||
private boolean southBorder=false; | |||
private boolean westBorder=false; | |||
private boolean selected = false; | |||
private boolean northBorder; | |||
private boolean eastBorder; | |||
private boolean southBorder; | |||
private boolean westBorder; | |||
private boolean selected; | |||
public void setBorder(Color northColor, Color eastColor, | |||
Color southColor, Color westColor, |
@@ -56,7 +56,7 @@ public class SVTableCellRenderer extends JLabel | |||
protected SVBorder cellBorder = new SVBorder(); | |||
private HSSFWorkbook wb = null; | |||
private HSSFWorkbook wb; | |||
/** This class holds the references to the predefined cell formats. | |||
*/ |
@@ -34,8 +34,8 @@ import org.apache.poi.hssf.usermodel.HSSFCell; | |||
*/ | |||
public class SVTableModel extends AbstractTableModel { | |||
private HSSFSheet st = null; | |||
int maxcol = 0; | |||
private HSSFSheet st; | |||
int maxcol; | |||
public SVTableModel(HSSFSheet st, int maxcol) { | |||
this.st = st; |
@@ -40,8 +40,8 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook; | |||
*/ | |||
public class SViewer extends JApplet { | |||
private SViewerPanel panel; | |||
boolean isStandalone = false; | |||
String filename = null; | |||
boolean isStandalone; | |||
String filename; | |||
/**Get a parameter value*/ | |||
public String getParameter(String key, String def) { |
@@ -864,9 +864,9 @@ public class AddDimensionedImage { | |||
*/ | |||
public class ClientAnchorDetail { | |||
public int fromIndex = 0; | |||
public int toIndex = 0; | |||
public int inset = 0; | |||
public int fromIndex; | |||
public int toIndex; | |||
public int inset; | |||
/** | |||
* Create a new instance of the ClientAnchorDetail class using the |
@@ -132,13 +132,13 @@ import org.apache.poi.ss.usermodel.WorkbookFactory; | |||
*/ | |||
public class ToCSV { | |||
private Workbook workbook = null; | |||
private ArrayList<ArrayList<String>> csvData = null; | |||
private int maxRowWidth = 0; | |||
private int formattingConvention = 0; | |||
private DataFormatter formatter = null; | |||
private FormulaEvaluator evaluator = null; | |||
private String separator = null; | |||
private Workbook workbook; | |||
private ArrayList<ArrayList<String>> csvData; | |||
private int maxRowWidth; | |||
private int formattingConvention; | |||
private DataFormatter formatter; | |||
private FormulaEvaluator evaluator; | |||
private String separator; | |||
private static final String CSV_FILE_EXTENSION = ".csv"; | |||
private static final String DEFAULT_SEPARATOR = ","; |
@@ -70,7 +70,7 @@ public class XLSX2CSV { | |||
* as a (basic) CSV. | |||
*/ | |||
private class SheetToCSV implements SheetContentsHandler { | |||
private boolean firstCellOfRow = false; | |||
private boolean firstCellOfRow; | |||
private int currentRow = -1; | |||
private int currentCol = -1; | |||
@@ -49,8 +49,8 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument; | |||
*/ | |||
public class UpdateEmbeddedDoc { | |||
private XWPFDocument doc = null; | |||
private File docFile = null; | |||
private XWPFDocument doc; | |||
private File docFile; | |||
private static final int SHEET_NUM = 0; | |||
private static final int ROW_NUM = 0; |
@@ -42,14 +42,14 @@ public class ExcelAntEvaluateCell extends Task { | |||
private double precision ; | |||
private double precisionToUse ; | |||
private double globalPrecision ; | |||
private boolean requiredToPass = false ; | |||
private boolean requiredToPass; | |||
private ExcelAntEvaluationResult result ; | |||
private ExcelAntWorkbookUtil wbUtil ; | |||
private boolean showDelta = false ; | |||
private boolean showDelta; | |||
public ExcelAntEvaluateCell() {} |
@@ -37,7 +37,7 @@ public class ExcelAntTask extends Task { | |||
private String excelFileName ; | |||
private boolean failOnError = false ; | |||
private boolean failOnError; | |||
private ExcelAntWorkbookUtil workbookUtil ; | |||
@@ -44,9 +44,9 @@ public class ExcelAntTest extends Task{ | |||
private double globalPrecision; | |||
private boolean showSuccessDetails = false; | |||
private boolean showSuccessDetails; | |||
private boolean showFailureDetail = false; | |||
private boolean showFailureDetail; | |||
LinkedList<String> failureMessages; | |||
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertNotNull; | |||
import org.apache.poi.ss.usermodel.Workbook; | |||
public class MockExcelAntWorkbookHandler implements IExcelAntWorkbookHandler { | |||
public static boolean executed = false; | |||
public static Workbook workbook = null; | |||
public static boolean executed; | |||
public static Workbook workbook; | |||
@Override |
@@ -26,8 +26,8 @@ import org.junit.Test; | |||
public class TestExcelAntEvaluationResult { | |||
private ExcelAntEvaluationResult fixture; | |||
private boolean completedWithError = false; | |||
private boolean passed = false; | |||
private boolean completedWithError; | |||
private boolean passed; | |||
private double retValue = 1.1; | |||
private String errMessage = "error message"; | |||
private double delta = 2.2; |
@@ -46,7 +46,7 @@ import org.junit.Test; | |||
public class HPSFFileHandler extends POIFSFileHandler { | |||
private static final String NL = System.getProperty("line.separator"); | |||
private static File copyOutput = null; | |||
private static File copyOutput; | |||
static final Set<String> EXCLUDES_HANDLE_ADD = unmodifiableHashSet( | |||
"spreadsheet/45290.xls", | |||
@@ -92,8 +92,8 @@ public class HPSFFileHandler extends POIFSFileHandler { | |||
try { | |||
return PropertySet.isPropertySetStream(dis); | |||
} finally { | |||
dis.close();; | |||
} | |||
dis.close(); | |||
} | |||
} | |||
@Override |
@@ -32,7 +32,7 @@ import java.io.IOException; | |||
* @see org.apache.poi.hwpf.extractor.WordExtractor | |||
*/ | |||
public abstract class POITextExtractor implements Closeable { | |||
private Closeable fsToClose = null; | |||
private Closeable fsToClose; | |||
/** | |||
* Retrieves all the text from the document. |
@@ -51,7 +51,7 @@ public class EscherClientAnchorRecord | |||
private short field_8_row2; | |||
private short field_9_dy2; | |||
private byte[] remainingData = new byte[0]; | |||
private boolean shortRecord = false; | |||
private boolean shortRecord; | |||
@Override | |||
public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) { |
@@ -26,7 +26,7 @@ import org.apache.poi.util.LittleEndian; | |||
public class EscherColorRef { | |||
@SuppressWarnings("unused") | |||
private int opid = -1; | |||
private int colorRef = 0; | |||
private int colorRef; | |||
public enum SysIndexSource { | |||
/** Use the fill color of the shape. */ |
@@ -28,7 +28,7 @@ import org.apache.poi.util.POILogger; | |||
class ClipboardData { | |||
private static final POILogger LOG = POILogFactory.getLogger( ClipboardData.class ); | |||
private int _format = 0; | |||
private int _format; | |||
private byte[] _value; | |||
ClipboardData() {} |
@@ -123,7 +123,7 @@ public final class Thumbnail { | |||
* <p>A <code>byte[]</code> to hold a thumbnail image in ({@link | |||
* Variant#VT_CF VT_CF}) format.</p> | |||
*/ | |||
private byte[] _thumbnailData = null; | |||
private byte[] _thumbnailData; | |||
@@ -42,7 +42,7 @@ import org.apache.poi.ss.formula.ptg.Ptg; | |||
public class FormulaViewer | |||
{ | |||
private String file; | |||
private boolean list=false; | |||
private boolean list; | |||
/** Creates new FormulaViewer */ | |||
@@ -116,7 +116,7 @@ public class EventWorkbookBuilder { | |||
private final HSSFListener childListener; | |||
private final List<BoundSheetRecord> boundSheetRecords = new ArrayList<BoundSheetRecord>(); | |||
private final List<ExternSheetRecord> externSheetRecords = new ArrayList<ExternSheetRecord>(); | |||
private SSTRecord sstRecord = null; | |||
private SSTRecord sstRecord; | |||
public SheetRecordCollectingListener(HSSFListener childListener) { | |||
this.childListener = childListener; |
@@ -63,7 +63,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem; | |||
public class EventBasedExcelExtractor extends POIOLE2TextExtractor implements org.apache.poi.ss.extractor.ExcelExtractor { | |||
private DirectoryNode _dir; | |||
boolean _includeSheetNames = true; | |||
boolean _formulasNotResults = false; | |||
boolean _formulasNotResults; | |||
public EventBasedExcelExtractor( DirectoryNode dir ) | |||
{ | |||
@@ -167,7 +167,7 @@ public class EventBasedExcelExtractor extends POIOLE2TextExtractor implements or | |||
private int sheetNum = -1; | |||
private int rowNum; | |||
private boolean outputNextStringValue = false; | |||
private boolean outputNextStringValue; | |||
private int nextRow = -1; | |||
public TextListener() { |
@@ -58,8 +58,8 @@ public class ExcelExtractor extends POIOLE2TextExtractor implements org.apache.p | |||
private final HSSFDataFormatter _formatter; | |||
private boolean _includeSheetNames = true; | |||
private boolean _shouldEvaluateFormulas = true; | |||
private boolean _includeCellComments = false; | |||
private boolean _includeBlankCells = false; | |||
private boolean _includeCellComments; | |||
private boolean _includeBlankCells; | |||
private boolean _includeHeadersFooters = true; | |||
public ExcelExtractor(HSSFWorkbook wb) { |
@@ -66,9 +66,9 @@ public final class InternalSheet { | |||
private static POILogger log = POILogFactory.getLogger(InternalSheet.class); | |||
private List<RecordBase> _records; | |||
protected PrintGridlinesRecord printGridlines = null; | |||
protected PrintHeadersRecord printHeaders = null; | |||
protected GridsetRecord gridset = null; | |||
protected PrintGridlinesRecord printGridlines; | |||
protected PrintHeadersRecord printHeaders; | |||
protected GridsetRecord gridset; | |||
private GutsRecord _gutsRecord; | |||
protected DefaultColWidthRecord defaultcolwidth = new DefaultColWidthRecord(); | |||
protected DefaultRowHeightRecord defaultrowheight = new DefaultRowHeightRecord(); | |||
@@ -80,8 +80,8 @@ public final class InternalSheet { | |||
*/ | |||
private final WorksheetProtectionBlock _protectionBlock = new WorksheetProtectionBlock(); | |||
protected WindowTwoRecord windowTwo = null; | |||
protected SelectionRecord _selection = null; | |||
protected WindowTwoRecord windowTwo; | |||
protected SelectionRecord _selection; | |||
/** java object always present, but if empty no BIFF records are written */ | |||
private final MergedCellsTable _mergedCellsTable; | |||
/** always present in this POI object, not always written to Excel file */ | |||
@@ -90,13 +90,13 @@ public final class InternalSheet { | |||
private DimensionsRecord _dimensions; | |||
/** always present */ | |||
protected final RowRecordsAggregate _rowsAggregate; | |||
private DataValidityTable _dataValidityTable= null; | |||
private DataValidityTable _dataValidityTable; | |||
private ConditionalFormattingTable condFormatting; | |||
private Iterator<RowRecord> rowRecIterator = null; | |||
private Iterator<RowRecord> rowRecIterator; | |||
/** Add an UncalcedRecord if not true indicating formulas have not been calculated */ | |||
protected boolean _isUncalced = false; | |||
protected boolean _isUncalced; | |||
public static final byte PANE_LOWER_RIGHT = (byte)0; | |||
public static final byte PANE_UPPER_RIGHT = (byte)1; |
@@ -26,23 +26,23 @@ public final class WorkbookRecordList { | |||
private List<Record> records = new ArrayList<Record>(); | |||
/** holds the position of the protect record */ | |||
private int protpos = 0; | |||
private int protpos; | |||
/** holds the position of the last bound sheet */ | |||
private int bspos = 0; | |||
private int bspos; | |||
/** holds the position of the tabid record */ | |||
private int tabpos = 0; | |||
private int tabpos; | |||
/** hold the position of the last font record */ | |||
private int fontpos = 0; | |||
private int fontpos; | |||
/** hold the position of the last extended font record */ | |||
private int xfpos = 0; | |||
private int xfpos; | |||
/** holds the position of the backup record */ | |||
private int backuppos = 0; | |||
private int backuppos; | |||
/** holds the position of last name record */ | |||
private int namepos = 0; | |||
private int namepos; | |||
/** holds the position of sup book */ | |||
private int supbookpos = 0; | |||
private int supbookpos; | |||
/** holds the position of the extern sheet */ | |||
private int externsheetPos = 0; | |||
private int externsheetPos; | |||
/** hold the position of the palette, if applicable */ | |||
private int palettepos = -1; | |||
@@ -58,7 +58,7 @@ public final class FontRecord extends StandardRecord { | |||
private byte field_6_underline; // 00none/01single/02double/21singleaccounting/22doubleaccounting | |||
private byte field_7_family; // ?? defined by windows api logfont structure? | |||
private byte field_8_charset; // ?? defined by windows api logfont structure? | |||
private byte field_9_zero = 0; // must be 0 | |||
private byte field_9_zero; // must be 0 | |||
/** possibly empty string never <code>null</code> */ | |||
private String field_11_font_name; | |||
@@ -46,7 +46,7 @@ public final class FtCfSubRecord extends SubRecord implements Cloneable { | |||
*/ | |||
public static final short UNSPECIFIED_BIT = (short)0xFFFF; | |||
private short flags = 0; | |||
private short flags; | |||
/** | |||
* Construct a new <code>FtPioGrbitSubRecord</code> and |
@@ -83,7 +83,7 @@ public final class FtPioGrbitSubRecord extends SubRecord implements Cloneable { | |||
public static final int AUTO_LOAD_BIT = 1 << 9; | |||
private short flags = 0; | |||
private short flags; | |||
/** | |||
* Construct a new <code>FtPioGrbitSubRecord</code> and |
@@ -163,7 +163,7 @@ public final class RecordFactoryInputStream { | |||
/** | |||
* The most recent record that we gave to the user | |||
*/ | |||
private Record _lastRecord = null; | |||
private Record _lastRecord; | |||
/** | |||
* The most recent DrawingRecord seen | |||
*/ |
@@ -43,7 +43,7 @@ public final class RowRecordsAggregate extends RecordAggregate { | |||
// Cache values to speed up performance of | |||
// getStartRowNumberForBlock / getEndRowNumberForBlock, see Bugzilla 47405 | |||
private RowRecord[] _rowRecordValues = null; | |||
private RowRecord[] _rowRecordValues; | |||
/** Creates a new instance of ValueRecordsAggregate */ | |||
public RowRecordsAggregate() { |
@@ -307,8 +307,8 @@ public final class ValueRecordsAggregate implements Iterable<CellValueRecordInte | |||
*/ | |||
class ValueIterator implements Iterator<CellValueRecordInterface> { | |||
int curRowIndex = 0, curColIndex = -1; | |||
int nextRowIndex = 0, nextColIndex = -1; | |||
int curRowIndex, curColIndex = -1; | |||
int nextRowIndex, nextColIndex = -1; | |||
public ValueIterator() { | |||
getNextPos(); |
@@ -33,7 +33,7 @@ import org.apache.poi.util.POILogger; | |||
public final class ColorGradientFormatting implements Cloneable { | |||
private static POILogger log = POILogFactory.getLogger(ColorGradientFormatting.class); | |||
private byte options = 0; | |||
private byte options; | |||
private ColorGradientThreshold[] thresholds; | |||
private ExtendedColor[] colors; | |||
@@ -31,9 +31,9 @@ import org.apache.poi.util.POILogger; | |||
public final class DataBarFormatting implements Cloneable { | |||
private static POILogger log = POILogFactory.getLogger(DataBarFormatting.class); | |||
private byte options = 0; | |||
private byte percentMin = 0; | |||
private byte percentMax = 0; | |||
private byte options; | |||
private byte percentMin; | |||
private byte percentMax; | |||
private ExtendedColor color; | |||
private DataBarThreshold thresholdMin; | |||
private DataBarThreshold thresholdMax; |
@@ -39,7 +39,7 @@ public final class Biff8DecryptingStream implements BiffHeaderInput, LittleEndia | |||
private final EncryptionInfo info; | |||
private ChunkedCipherInputStream ccis; | |||
private final byte buffer[] = new byte[LittleEndianConsts.LONG_SIZE]; | |||
private boolean shouldSkipEncryptionOnCurrentRecord = false; | |||
private boolean shouldSkipEncryptionOnCurrentRecord; | |||
public Biff8DecryptingStream(InputStream in, int initialOffset, EncryptionInfo info) throws RecordFormatException { | |||
try { |
@@ -30,8 +30,8 @@ import org.apache.poi.ss.usermodel.ChildAnchor; | |||
*/ | |||
public abstract class HSSFAnchor implements ChildAnchor { | |||
protected boolean _isHorizontallyFlipped = false; | |||
protected boolean _isVerticallyFlipped = false; | |||
protected boolean _isHorizontallyFlipped; | |||
protected boolean _isVerticallyFlipped; | |||
public HSSFAnchor() { | |||
createEscherAnchor(); | |||
@@ -47,10 +47,10 @@ public abstract class HSSFAnchor implements ChildAnchor { | |||
public static HSSFAnchor createAnchorFromEscher(EscherContainerRecord container){ | |||
if (null != container.getChildById(EscherChildAnchorRecord.RECORD_ID)){ | |||
return new HSSFChildAnchor((EscherChildAnchorRecord) container.getChildById(EscherChildAnchorRecord.RECORD_ID)); | |||
return new HSSFChildAnchor(container.getChildById(EscherChildAnchorRecord.RECORD_ID)); | |||
} else { | |||
if (null != container.getChildById(EscherClientAnchorRecord.RECORD_ID)){ | |||
return new HSSFClientAnchor((EscherClientAnchorRecord) container.getChildById(EscherClientAnchorRecord.RECORD_ID)); | |||
return new HSSFClientAnchor(container.getChildById(EscherClientAnchorRecord.RECORD_ID)); | |||
} | |||
return null; | |||
} |
@@ -44,7 +44,7 @@ public final class HSSFDataFormat implements DataFormat { | |||
private final Vector<String> _formats = new Vector<String>(); | |||
private final InternalWorkbook _workbook; | |||
private boolean _movedBuiltins = false; // Flag to see if need to | |||
private boolean _movedBuiltins; // Flag to see if need to | |||
// check the built in list | |||
// or if the regular list | |||
// has all entries. |
@@ -35,7 +35,7 @@ public final class HSSFDataValidation implements DataValidation { | |||
private int _errorStyle = ErrorStyle.STOP; | |||
private boolean _emptyCellAllowed = true; | |||
private boolean _suppress_dropdown_arrow = false; | |||
private boolean _suppress_dropdown_arrow; | |||
private boolean _showPromptBox = true; | |||
private boolean _showErrorBox = true; | |||
private CellRangeAddressList _regions; |
@@ -960,7 +960,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss | |||
private final class SheetIterator<T extends Sheet> implements Iterator<T> { | |||
final private Iterator<T> it; | |||
private T cursor = null; | |||
private T cursor; | |||
@SuppressWarnings("unchecked") | |||
public SheetIterator() { | |||
it = (Iterator<T>) _sheets.iterator(); |
@@ -41,7 +41,7 @@ public abstract class ChunkedCipherInputStream extends LittleEndianInputStream { | |||
private int lastIndex; | |||
private long pos; | |||
private boolean chunkIsValid = false; | |||
private boolean chunkIsValid; | |||
public ChunkedCipherInputStream(InputStream stream, long size, int chunkSize) | |||
throws GeneralSecurityException { |
@@ -64,7 +64,7 @@ public abstract class ChunkedCipherOutputStream extends FilterOutputStream { | |||
// the cipher can't be final, because for the last chunk we change the padding | |||
// and therefore need to change the cipher too | |||
private Cipher cipher; | |||
private boolean isClosed = false; | |||
private boolean isClosed; | |||
public ChunkedCipherOutputStream(DirectoryNode dir, int chunkSize) throws IOException, GeneralSecurityException { | |||
super(null); |
@@ -203,9 +203,9 @@ public class DataSpaceMapUtils { | |||
int transformType; | |||
String transformerId; | |||
String transformerName; | |||
int readerVersionMajor = 1, readerVersionMinor = 0; | |||
int updaterVersionMajor = 1, updaterVersionMinor = 0; | |||
int writerVersionMajor = 1, writerVersionMinor = 0; | |||
int readerVersionMajor = 1, readerVersionMinor; | |||
int updaterVersionMajor = 1, updaterVersionMinor; | |||
int writerVersionMajor = 1, writerVersionMinor; | |||
public TransformInfoHeader( | |||
int transformType, | |||
@@ -257,9 +257,9 @@ public class DataSpaceMapUtils { | |||
public static class DataSpaceVersionInfo implements EncryptionRecord { | |||
String featureIdentifier; | |||
int readerVersionMajor = 1, readerVersionMinor = 0; | |||
int updaterVersionMajor = 1, updaterVersionMinor = 0; | |||
int writerVersionMajor = 1, writerVersionMinor = 0; | |||
int readerVersionMajor = 1, readerVersionMinor; | |||
int updaterVersionMajor = 1, updaterVersionMinor; | |||
int writerVersionMajor = 1, writerVersionMinor; | |||
public DataSpaceVersionInfo(LittleEndianInput is) { | |||
featureIdentifier = readUnicodeLPP4(is); |
@@ -101,8 +101,8 @@ public class XORDecryptor extends Decryptor implements Cloneable { | |||
private class XORCipherInputStream extends ChunkedCipherInputStream { | |||
private final int initialOffset; | |||
private int recordStart = 0; | |||
private int recordEnd = 0; | |||
private int recordStart; | |||
private int recordEnd; | |||
public XORCipherInputStream(InputStream stream, int initialPos) | |||
throws GeneralSecurityException { |
@@ -88,8 +88,8 @@ public class XOREncryptor extends Encryptor implements Cloneable { | |||
} | |||
private class XORCipherOutputStream extends ChunkedCipherOutputStream { | |||
private int recordStart = 0; | |||
private int recordEnd = 0; | |||
private int recordStart; | |||
private int recordEnd; | |||
public XORCipherOutputStream(OutputStream stream, int initialPos) throws IOException, GeneralSecurityException { | |||
super(stream, -1); |
@@ -51,7 +51,7 @@ public class POIFSReader | |||
{ | |||
private final POIFSReaderRegistry registry; | |||
private boolean registryClosed; | |||
private boolean notifyEmptyDirectories = false; | |||
private boolean notifyEmptyDirectories; | |||
/** | |||
* Create a POIFSReader |
@@ -30,7 +30,7 @@ public class DocumentDescriptor | |||
{ | |||
private POIFSDocumentPath path; | |||
private String name; | |||
private int hashcode = 0; | |||
private int hashcode; | |||
/** | |||
* Trivial constructor |
@@ -42,11 +42,11 @@ public class Ole10Native { | |||
private short flags1 = 2; // 2 bytes, unknown, mostly [02 00] | |||
private String label; // ASCIIZ, stored in this field without the terminating zero | |||
private String fileName; // ASCIIZ, stored in this field without the terminating zero | |||
private short flags2 = 0; // 2 bytes, unknown, mostly [00 00] | |||
private short flags2; // 2 bytes, unknown, mostly [00 00] | |||
private short unknown1 = 3; // see below | |||
private String command; // ASCIIZ, stored in this field without the terminating zero | |||
private byte[] dataBuffer; // varying size, the actual native data | |||
private short flags3 = 0; // some final flags? or zero terminators?, sometimes not there | |||
private short flags3; // some final flags? or zero terminators?, sometimes not there | |||
/** | |||
* the field encoding mode - merely a try-and-error guess ... |
@@ -36,7 +36,7 @@ public class POIFSDocumentPath | |||
private static final POILogger log = POILogFactory.getLogger(POIFSDocumentPath.class); | |||
private final String[] components; | |||
private int hashcode = 0; //lazy-compute hashCode | |||
private int hashcode; //lazy-compute hashCode | |||
/** | |||
* constructor for the path of a document that is not in the root |
@@ -41,7 +41,7 @@ public class CellDateFormatter extends CellFormatter { | |||
private final Calendar EXCEL_EPOCH_CAL = | |||
LocaleUtil.getLocaleCalendar(1904, 0, 1); | |||
private static /* final */ CellDateFormatter SIMPLE_DATE = null; | |||
private static /* final */ CellDateFormatter SIMPLE_DATE; | |||
private class DatePartHandler implements CellFormatPart.PartHandler { | |||
private int mStart = -1; |
@@ -35,8 +35,8 @@ public class SheetBuilder { | |||
private final Workbook workbook; | |||
private final Object[][] cells; | |||
private boolean shouldCreateEmptyCells = false; | |||
private String sheetName = null; | |||
private boolean shouldCreateEmptyCells; | |||
private String sheetName; | |||
public SheetBuilder(Workbook workbook, Object[][] cells) { | |||
this.workbook = workbook; |
@@ -110,9 +110,9 @@ public class CellWalk { | |||
* @author Roman Kashitsyn | |||
*/ | |||
private static class SimpleCellWalkContext implements CellWalkContext { | |||
public long ordinalNumber = 0; | |||
public int rowNumber = 0; | |||
public int colNumber = 0; | |||
public long ordinalNumber; | |||
public int rowNumber; | |||
public int colNumber; | |||
public long getOrdinalNumber() { | |||
return ordinalNumber; |
@@ -42,7 +42,7 @@ public class BoundedInputStream extends InputStream { | |||
private final long max; | |||
/** the number of bytes already returned */ | |||
private long pos = 0; | |||
private long pos; | |||
/** the marked position */ | |||
private long mark = -1; |
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; | |||
public class CommonsLogger extends POILogger | |||
{ | |||
private static final LogFactory _creator = LogFactory.getFactory(); | |||
private Log log = null; | |||
private Log log; | |||
@Override | |||
public void initialize(final String cat) |
@@ -47,7 +47,7 @@ public class IntList | |||
{ | |||
private int[] _array; | |||
private int _limit; | |||
private int fillval = 0; | |||
private int fillval; | |||
private static final int _default_size = 128; | |||
/** |
@@ -54,7 +54,7 @@ public class LittleEndianCP950Reader extends Reader { | |||
private int offset; | |||
private int trailing; | |||
private int leading; | |||
int cnt = 0; | |||
int cnt; | |||
//the char that is logically trailing in Big5 encoding | |||
//however in LittleEndian order, this is the first encountered. | |||
public LittleEndianCP950Reader(byte[] data) { |
@@ -46,7 +46,7 @@ public final class POILogFactory { | |||
* The name of the class to use. Initialised the | |||
* first time we need it | |||
*/ | |||
static String _loggerClassName = null; | |||
static String _loggerClassName; | |||
/** | |||
* Construct a POILogFactory. |
@@ -35,9 +35,9 @@ public class ReplacingInputStream extends FilterInputStream { | |||
// while matching, this is where the bytes go. | |||
final int[] buf; | |||
private int matchedIndex=0; | |||
private int unbufferIndex=0; | |||
private int replacedIndex=0; | |||
private int matchedIndex; | |||
private int unbufferIndex; | |||
private int replacedIndex; | |||
private final byte[] pattern; | |||
private final byte[] replacement; |
@@ -315,7 +315,7 @@ public class StringUtil { | |||
*/ | |||
public static class StringsIterator implements Iterator<String> { | |||
private String[] strings = {}; | |||
private int position = 0; | |||
private int position; | |||
public StringsIterator(String[] strings) { | |||
if (strings != null) { | |||
this.strings = strings.clone(); |
@@ -93,7 +93,7 @@ public class POIXMLDocumentPart { | |||
* Counter that provides the amount of incoming relations from other parts | |||
* to this part. | |||
*/ | |||
private int relationCounter = 0; | |||
private int relationCounter; | |||
int incrementRelationCounter() { | |||
relationCounter++; |
@@ -116,7 +116,7 @@ public abstract class OPCPackage implements RelationshipSource, Closeable { | |||
/** | |||
* Flag if a modification is done to the document. | |||
*/ | |||
protected boolean isDirty = false; | |||
protected boolean isDirty; | |||
/** | |||
* File path of this package. |
@@ -80,7 +80,7 @@ public class PackagePropertiesMarshaller implements PartMarshaller { | |||
PackagePropertiesPart propsPart; | |||
// The document | |||
Document xmlDoc = null; | |||
Document xmlDoc; | |||
/** | |||
* Marshall package core properties to an XML document. Always return |
@@ -197,8 +197,8 @@ public class ZipSecureFile extends ZipFile { | |||
} | |||
public static class ThresholdInputStream extends PushbackInputStream { | |||
long counter = 0; | |||
long markPos = 0; | |||
long counter; | |||
long markPos; | |||
ThresholdInputStream cis; | |||
public ThresholdInputStream(InputStream is, ThresholdInputStream cis) { |
@@ -83,12 +83,12 @@ public class SignatureConfig { | |||
* the optional signature policy service used for XAdES-EPES. | |||
*/ | |||
private SignaturePolicyService signaturePolicyService; | |||
private URIDereferencer uriDereferencer = null; | |||
private URIDereferencer uriDereferencer; | |||
private String canonicalizationMethod = CanonicalizationMethod.INCLUSIVE; | |||
private boolean includeEntireCertificateChain = true; | |||
private boolean includeIssuerSerial = false; | |||
private boolean includeKeyValue = false; | |||
private boolean includeIssuerSerial; | |||
private boolean includeKeyValue; | |||
/** | |||
* the time-stamp service used for XAdES-T and XAdES-X. | |||
@@ -98,11 +98,11 @@ public class SignatureConfig { | |||
* timestamp service provider URL | |||
*/ | |||
private String tspUrl; | |||
private boolean tspOldProtocol = false; | |||
private boolean tspOldProtocol; | |||
/** | |||
* if not defined, it's the same as the main digest | |||
*/ | |||
private HashAlgorithm tspDigestAlgo = null; | |||
private HashAlgorithm tspDigestAlgo; | |||
private String tspUser; | |||
private String tspPass; | |||
private TimeStampServiceValidator tspValidator; | |||
@@ -121,8 +121,8 @@ public class SignatureConfig { | |||
/** | |||
* if not defined, it's the same as the main digest | |||
*/ | |||
private HashAlgorithm xadesDigestAlgo = null; | |||
private String xadesRole = null; | |||
private HashAlgorithm xadesDigestAlgo; | |||
private String xadesRole; | |||
private String xadesSignatureId = "idSignedProperties"; | |||
private boolean xadesSignaturePolicyImplied = true; | |||
private String xadesCanonicalizationMethod = CanonicalizationMethod.EXCLUSIVE; | |||
@@ -150,7 +150,7 @@ public class SignatureConfig { | |||
* with certain namespaces, so this EventListener is used to interfere | |||
* with the marshalling process. | |||
*/ | |||
EventListener signatureMarshalListener = null; | |||
EventListener signatureMarshalListener; | |||
/** | |||
* Map of namespace uris to prefix |
@@ -171,7 +171,7 @@ import org.xml.sax.SAXException; | |||
public class SignatureInfo implements SignatureConfigurable { | |||
private static final POILogger LOG = POILogFactory.getLogger(SignatureInfo.class); | |||
private static boolean isInitialized = false; | |||
private static boolean isInitialized; | |||
private SignatureConfig signatureConfig; | |||
@@ -376,8 +376,8 @@ public class SignatureInfo implements SignatureConfigurable { | |||
OPCPackage pkg = signatureConfig.getOpcPackage(); | |||
Iterator<PackageRelationship> sigOrigRels = | |||
pkg.getRelationshipsByType(PackageRelationshipTypes.DIGITAL_SIGNATURE_ORIGIN).iterator(); | |||
Iterator<PackageRelationship> sigRels = null; | |||
PackagePart sigPart = null; | |||
Iterator<PackageRelationship> sigRels; | |||
PackagePart sigPart; | |||
public boolean hasNext() { | |||
while (sigRels == null || !sigRels.hasNext()) { |
@@ -40,10 +40,10 @@ public class XDGFDocument { | |||
Map<Long, XDGFStyleSheet> _styleSheets = new HashMap<Long, XDGFStyleSheet>(); | |||
// defaults | |||
long _defaultFillStyle = 0; | |||
long _defaultGuideStyle = 0; | |||
long _defaultLineStyle = 0; | |||
long _defaultTextStyle = 0; | |||
long _defaultFillStyle; | |||
long _defaultGuideStyle; | |||
long _defaultLineStyle; | |||
long _defaultTextStyle; | |||
public XDGFDocument(VisioDocumentType document) { |
@@ -29,7 +29,7 @@ public class XDGFMaster { | |||
private MasterType _master; | |||
protected XDGFMasterContents _content; | |||
protected XDGFSheet _pageSheet = null; | |||
protected XDGFSheet _pageSheet; | |||
public XDGFMaster(MasterType master, XDGFMasterContents content, | |||
XDGFDocument document) { |
@@ -34,7 +34,7 @@ public class XDGFPage { | |||
private PageType _page; | |||
protected XDGFPageContents _content; | |||
protected XDGFPages _pages; | |||
protected XDGFSheet _pageSheet = null; | |||
protected XDGFSheet _pageSheet; | |||
public XDGFPage(PageType page, XDGFPageContents content, | |||
XDGFDocument document, XDGFPages pages) { |
@@ -49,58 +49,58 @@ public class XDGFShape extends XDGFSheet { | |||
XDGFBaseContents _parentPage; | |||
XDGFShape _parent; // only non-null if a subshape | |||
XDGFMaster _master = null; | |||
XDGFShape _masterShape = null; | |||
XDGFMaster _master; | |||
XDGFShape _masterShape; | |||
XDGFText _text = null; | |||
XDGFText _text; | |||
// subshapes if they exist | |||
List<XDGFShape> _shapes = null; | |||
List<XDGFShape> _shapes; | |||
// properties specific to shapes | |||
// center of rotation relative to origin of parent | |||
Double _pinX = null; | |||
Double _pinY = null; | |||
Double _pinX; | |||
Double _pinY; | |||
Double _width = null; | |||
Double _height = null; | |||
Double _width; | |||
Double _height; | |||
// center of rotation relative to self | |||
Double _locPinX = null; | |||
Double _locPinY = null; | |||
Double _locPinX; | |||
Double _locPinY; | |||
// start x coordinate, relative to parent | |||
// -> one dimensional shapes only | |||
Double _beginX = null; | |||
Double _beginY = null; | |||
Double _beginX; | |||
Double _beginY; | |||
// end x coordinate, relative to parent | |||
// -> one dimensional shapes only | |||
Double _endX = null; | |||
Double _endY = null; | |||
Double _endX; | |||
Double _endY; | |||
Double _angle = null; | |||
Double _rotationXAngle = null; | |||
Double _rotationYAngle = null; | |||
Double _rotationZAngle = null; | |||
Double _angle; | |||
Double _rotationXAngle; | |||
Double _rotationYAngle; | |||
Double _rotationZAngle; | |||
// end x coordinate, relative to parent | |||
Boolean _flipX = null; | |||
Boolean _flipY = null; | |||
Boolean _flipX; | |||
Boolean _flipY; | |||
// center of text relative to this shape | |||
Double _txtPinX = null; | |||
Double _txtPinY = null; | |||
Double _txtPinX; | |||
Double _txtPinY; | |||
// center of text relative to text block | |||
Double _txtLocPinX = null; | |||
Double _txtLocPinY = null; | |||
Double _txtLocPinX; | |||
Double _txtLocPinY; | |||
Double _txtAngle = null; | |||
Double _txtAngle; | |||
Double _txtWidth = null; | |||
Double _txtHeight = null; | |||
Double _txtWidth; | |||
Double _txtHeight; | |||
public XDGFShape(ShapeSheetType shapeSheet, XDGFBaseContents parentPage, | |||
XDGFDocument document) { |
@@ -52,7 +52,7 @@ public abstract class XDGFSheet { | |||
protected SortedMap<Long, GeometrySection> _geometry = new TreeMap<Long, GeometrySection>(); | |||
// special: character section | |||
protected CharacterSection _character = null; | |||
protected CharacterSection _character; | |||
public XDGFSheet(SheetType sheet, XDGFDocument document) { | |||
try { |
@@ -30,8 +30,8 @@ import com.microsoft.schemas.office.visio.x2012.main.SectionType; | |||
public class CharacterSection extends XDGFSection { | |||
Double _fontSize = null; | |||
Color _fontColor = null; | |||
Double _fontSize; | |||
Color _fontColor; | |||
Map<String, XDGFCell> _characterCells = new HashMap<String, XDGFCell>(); | |||
@@ -56,8 +56,8 @@ public class CombinedIterable<T> implements Iterable<T> { | |||
Long lastI = Long.MIN_VALUE; | |||
Entry<Long, T> currentBase = null; | |||
Entry<Long, T> currentMaster = null; | |||
Entry<Long, T> currentBase; | |||
Entry<Long, T> currentMaster; | |||
// grab the iterator for both | |||
Iterator<Entry<Long, T>> baseI = _baseItems.entrySet().iterator(); |
@@ -40,7 +40,7 @@ import com.microsoft.schemas.office.visio.x2012.main.SectionType; | |||
public class GeometrySection extends XDGFSection { | |||
GeometrySection _master = null; | |||
GeometrySection _master; | |||
// rows | |||
SortedMap<Long, GeometryRow> _rows = new TreeMap<Long, GeometryRow>(); |
@@ -31,18 +31,18 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
public class ArcTo implements GeometryRow { | |||
ArcTo _master = null; | |||
ArcTo _master; | |||
// The x-coordinate of the ending vertex of an arc. | |||
Double x = null; | |||
Double x; | |||
// The y-coordinate of the ending vertex of an arc. | |||
Double y = null; | |||
Double y; | |||
// The distance from the arc's midpoint to the midpoint of its chord. | |||
Double a = null; | |||
Double a; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -30,24 +30,24 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
public class Ellipse implements GeometryRow { | |||
Ellipse _master = null; | |||
Ellipse _master; | |||
// x coordinate of center point | |||
Double x = null; | |||
Double x; | |||
// y coordinate of center point | |||
Double y = null; | |||
Double y; | |||
// x coordinate of first point on ellipse | |||
Double a = null; | |||
Double a; | |||
// y coordinate of first point on ellipse | |||
Double b = null; | |||
Double b; | |||
// x coordinate of second point on ellipse | |||
Double c = null; | |||
Double c; | |||
// y coordinate of second point on ellipse | |||
Double d = null; | |||
Double d; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -30,36 +30,36 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
public class EllipticalArcTo implements GeometryRow { | |||
EllipticalArcTo _master = null; | |||
EllipticalArcTo _master; | |||
// The x-coordinate of the ending vertex on an arc. | |||
Double x = null; | |||
Double x; | |||
// The y-coordinate of the ending vertex on an arc. | |||
Double y = null; | |||
Double y; | |||
// The x-coordinate of the arc's control point; a point on the arc. The | |||
// control point is best located about halfway between the beginning and | |||
// ending vertices of the arc. Otherwise, the arc may grow to an extreme | |||
// size in order to pass through the control point, with unpredictable | |||
// results. | |||
Double a = null; | |||
Double a; | |||
// The y-coordinate of an arc's control point. | |||
Double b = null; | |||
Double b; | |||
// The angle of an arc's major axis relative to the x-axis of its parent | |||
// shape. | |||
Double c = null; | |||
Double c; | |||
// The ratio of an arc's major axis to its minor axis. Despite the usual | |||
// meaning of these words, the "major" axis does not have to be greater than | |||
// the "minor" axis, so this ratio does not have to be greater than 1. | |||
// Setting this cell to a value less than or equal to 0 or greater than 1000 | |||
// can lead to unpredictable results. | |||
Double d = null; | |||
Double d; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -129,7 +129,7 @@ public class EllipticalArcTo implements GeometryRow { | |||
_master = (EllipticalArcTo) row; | |||
} | |||
public static int draw = 0; | |||
public static int draw; | |||
@Override | |||
public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) { |
@@ -31,25 +31,25 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
*/ | |||
public class InfiniteLine implements GeometryRow { | |||
InfiniteLine _master = null; | |||
InfiniteLine _master; | |||
// An x-coordinate of a point on the infinite line; paired with y-coordinate | |||
// represented by the Y cell. | |||
Double x = null; | |||
Double x; | |||
// A y-coordinate of a point on the infinite line; paired with x-coordinate | |||
// represented by the X cell. | |||
Double y = null; | |||
Double y; | |||
// An x-coordinate of a point on the infinite line; paired with y-coordinate | |||
// represented by the B cell. | |||
Double a = null; | |||
Double a; | |||
// A y-coordinate of a point on an infinite line; paired with x-coordinate | |||
// represented by the A cell. | |||
Double b = null; | |||
Double b; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -26,12 +26,12 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
public class LineTo implements GeometryRow { | |||
LineTo _master = null; | |||
LineTo _master; | |||
Double x = null; | |||
Double y = null; | |||
Double x; | |||
Double y; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -31,12 +31,12 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
*/ | |||
public class MoveTo implements GeometryRow { | |||
MoveTo _master = null; | |||
MoveTo _master; | |||
Double x = null; | |||
Double y = null; | |||
Double x; | |||
Double y; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -33,30 +33,30 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
public class NURBSTo implements GeometryRow { | |||
NURBSTo _master = null; | |||
NURBSTo _master; | |||
// The x-coordinate of the last control point of a NURBS. | |||
Double x = null; | |||
Double x; | |||
// The y-coordinate of the last control point of a NURBS. | |||
Double y = null; | |||
Double y; | |||
// The second to the last knot of the NURBS. | |||
Double a = null; | |||
Double a; | |||
// The last weight of the NURBS. | |||
Double b = null; | |||
Double b; | |||
// The first knot of the NURBS. | |||
Double c = null; | |||
Double c; | |||
// The first weight of the NURBS. | |||
Double d = null; | |||
Double d; | |||
// A NURBS formula. | |||
String e = null; | |||
String e; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -27,18 +27,18 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
public class PolyLineTo implements GeometryRow { | |||
PolyLineTo _master = null; | |||
PolyLineTo _master; | |||
// The x-coordinate of the ending vertex of a polyline. | |||
Double x = null; | |||
Double x; | |||
// The y-coordinate of the ending vertex of a polyline. | |||
Double y = null; | |||
Double y; | |||
// The polyline formula | |||
String a = null; | |||
String a; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -26,35 +26,35 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
public class RelCubBezTo implements GeometryRow { | |||
RelCubBezTo _master = null; | |||
RelCubBezTo _master; | |||
// The x-coordinate of the ending vertex of a cubic Bezier curve relative to | |||
// the width of the shape. | |||
Double x = null; | |||
Double x; | |||
// The y-coordinate of the ending vertex of a cubic Bezier curve relative to | |||
// the height of the shape. | |||
Double y = null; | |||
Double y; | |||
// The x-coordinate of the curve's beginning control point relative to the | |||
// shape's width; a point on the arc. The control point is best located | |||
// between the beginning and ending vertices of the arc. | |||
Double a = null; | |||
Double a; | |||
// The y-coordinate of a curve's beginning control point relative to the | |||
// shape's height. | |||
Double b = null; | |||
Double b; | |||
// The x-coordinate of the curve's ending control point relative to the | |||
// shape's width; a point on the arc. The control point is best located | |||
// between the beginning control point and ending vertices of the arc. | |||
Double c = null; | |||
Double c; | |||
// The y-coordinate of a curve's ending control point relative to the | |||
// shape's height. | |||
Double d = null; | |||
Double d; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -26,32 +26,32 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
public class RelEllipticalArcTo implements GeometryRow { | |||
RelEllipticalArcTo _master = null; | |||
RelEllipticalArcTo _master; | |||
// The x-coordinate of the ending vertex on an arc relative to the width of | |||
// the shape. | |||
Double x = null; | |||
Double x; | |||
// The y-coordinate of the ending vertex on an arc relative to the height of | |||
// the shape. | |||
Double y = null; | |||
Double y; | |||
// The x-coordinate of the arc's control point relative to the shape's | |||
// width; a point on the arc. | |||
Double a = null; | |||
Double a; | |||
// The y-coordinate of an arc's control point relative to the shape's width. | |||
Double b = null; | |||
Double b; | |||
// The angle of an arc's major axis relative to the x-axis of its parent. | |||
Double c = null; | |||
Double c; | |||
// The ratio of an arc's major axis to its minor axis. Despite the usual | |||
// meaning of these words, the "major" axis does not have to be greater than | |||
// the "minor" axis, so this ratio does not have to be greater than 1. | |||
Double d = null; | |||
Double d; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -30,12 +30,12 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
*/ | |||
public class RelLineTo implements GeometryRow { | |||
RelLineTo _master = null; | |||
RelLineTo _master; | |||
Double x = null; | |||
Double y = null; | |||
Double x; | |||
Double y; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -26,12 +26,12 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
public class RelMoveTo implements GeometryRow { | |||
RelMoveTo _master = null; | |||
RelMoveTo _master; | |||
Double x = null; | |||
Double y = null; | |||
Double x; | |||
Double y; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -31,26 +31,26 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
*/ | |||
public class RelQuadBezTo implements GeometryRow { | |||
RelQuadBezTo _master = null; | |||
RelQuadBezTo _master; | |||
// The x-coordinate of the ending vertex of a quadratic Bezier curve | |||
// relative to the width of the shape. | |||
Double x = null; | |||
Double x; | |||
// The y-coordinate of the ending vertex of a quadratic Bezier curve | |||
// relative to the height of the shape. | |||
Double y = null; | |||
Double y; | |||
// The x-coordinate of the curve's control point relative to the shape's | |||
// width; a point on the arc. The control point is best located about | |||
// halfway between the beginning and ending vertices of the arc. | |||
Double a = null; | |||
Double a; | |||
// The y-coordinate of a curve's control point relative to the shape's | |||
// height. | |||
Double b = null; | |||
Double b; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -30,18 +30,18 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
*/ | |||
public class SplineKnot implements GeometryRow { | |||
SplineKnot _master = null; | |||
SplineKnot _master; | |||
// The x-coordinate of a control point. | |||
Double x = null; | |||
Double x; | |||
// The y-coordinate of a control point. | |||
Double y = null; | |||
Double y; | |||
// One of the spline's knots (other than the last one or the first two). | |||
Double a = null; | |||
Double a; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -29,27 +29,27 @@ import com.microsoft.schemas.office.visio.x2012.main.RowType; | |||
*/ | |||
public class SplineStart implements GeometryRow { | |||
SplineStart _master = null; | |||
SplineStart _master; | |||
// The x-coordinate of a spline's second control point. | |||
Double x = null; | |||
Double x; | |||
// The y-coordinate of a spline's second control point. | |||
Double y = null; | |||
Double y; | |||
// The second knot of the spline. | |||
Double a = null; | |||
Double a; | |||
// The first knot of a spline. | |||
Double b = null; | |||
Double b; | |||
// The last knot of a spline. | |||
Double c = null; | |||
Double c; | |||
// The degree of a spline (an integer from 1 to 25). | |||
Integer d = null; | |||
Integer d; | |||
Boolean deleted = null; | |||
Boolean deleted; | |||
// TODO: support formulas | |||
@@ -25,7 +25,7 @@ import org.apache.poi.xdgf.usermodel.XDGFShape; | |||
public class ShapeDebuggerRenderer extends ShapeRenderer { | |||
ShapeVisitorAcceptor _debugAcceptor = null; | |||
ShapeVisitorAcceptor _debugAcceptor; | |||
public ShapeDebuggerRenderer() { | |||
super(); |
@@ -49,8 +49,8 @@ public class XSLFPowerPointExtractor extends POIXMLTextExtractor { | |||
private XMLSlideShow slideshow; | |||
private boolean slidesByDefault = true; | |||
private boolean notesByDefault = false; | |||
private boolean masterByDefault = false; | |||
private boolean notesByDefault; | |||
private boolean masterByDefault; | |||
public XSLFPowerPointExtractor(XMLSlideShow slideshow) { | |||
super(slideshow); |
@@ -43,10 +43,10 @@ import org.apache.poi.util.Units; | |||
*/ | |||
@Beta | |||
public final class XSLFPictureData extends POIXMLDocumentPart implements PictureData { | |||
private Long checksum = null; | |||
private Long checksum; | |||
// original image dimensions (for formats supported by BufferedImage) | |||
private Dimension origSize = null; | |||
private Dimension origSize; | |||
private int index = -1; | |||
/** |
@@ -69,14 +69,14 @@ import org.openxmlformats.schemas.drawingml.x2006.main.STTextVerticalType; | |||
* Represents a cell of a table in a .pptx presentation | |||
*/ | |||
public class XSLFTableCell extends XSLFTextShape implements TableCell<XSLFShape,XSLFTextParagraph> { | |||
private CTTableCellProperties _tcPr = null; | |||
private CTTableCellProperties _tcPr; | |||
private final XSLFTable table; | |||
private int row = 0, col = 0; | |||
private int row, col; | |||
/** | |||
* Volatile/temporary anchor - e.g. for rendering | |||
*/ | |||
private Rectangle2D anchor = null; | |||
private Rectangle2D anchor; | |||
/*package*/ XSLFTableCell(CTTableCell cell, XSLFTable table){ | |||
super(cell, table.getSheet()); |
@@ -42,9 +42,9 @@ public class XSSFBCommentsTable extends XSSFBParser { | |||
//these are all used only during parsing, and they are mutable! | |||
private int authorId = -1; | |||
private CellAddress cellAddress = null; | |||
private XSSFBCellRange cellRange = null; | |||
private String comment = null; | |||
private CellAddress cellAddress; | |||
private XSSFBCellRange cellRange; | |||
private String comment; | |||
private StringBuilder authorBuffer = new StringBuilder(); | |||
@@ -47,9 +47,9 @@ public class XSSFBSheetHandler extends XSSFBParser { | |||
private int lastEndedRow = -1; | |||
private int lastStartedRow = -1; | |||
private int currentRow = 0; | |||
private int currentRow; | |||
private byte[] rkBuffer = new byte[8]; | |||
private XSSFBCellRange hyperlinkCellRange = null; | |||
private XSSFBCellRange hyperlinkCellRange; | |||
private StringBuilder xlWideStringBuffer = new StringBuilder(); | |||
private final XSSFBCellHeader cellBuffer = new XSSFBCellHeader(); |
@@ -40,8 +40,8 @@ public class XSSFBStylesTable extends XSSFBParser { | |||
private final SortedMap<Short, String> numberFormats = new TreeMap<Short,String>(); | |||
private final List<Short> styleIds = new ArrayList<Short>(); | |||
private boolean inCellXFS = false; | |||
private boolean inFmts = false; | |||
private boolean inCellXFS; | |||
private boolean inFmts; | |||
public XSSFBStylesTable(InputStream is) throws IOException { | |||
super(is); | |||
parse(); |
@@ -183,7 +183,7 @@ public class XSSFBReader extends XSSFReader { | |||
static { | |||
RECORDS.set(XSSFBRecordType.BrtAbsPath15.getId()); | |||
} | |||
private String path = null; | |||
private String path; | |||
public PathExtractor(InputStream is) { | |||
super(is, RECORDS); | |||
} |
@@ -51,7 +51,7 @@ public class XSSFBEventBasedExcelExtractor extends XSSFEventBasedExcelExtractor | |||
XSSFRelation.XLSB_BINARY_WORKBOOK | |||
}; | |||
private boolean handleHyperlinksInCells = false; | |||
private boolean handleHyperlinksInCells; | |||
public XSSFBEventBasedExcelExtractor(String path) throws XmlException, OpenXML4JException, IOException { | |||
super(path); |
@@ -65,9 +65,9 @@ public class XSSFEventBasedExcelExtractor extends POIXMLTextExtractor | |||
private Locale locale; | |||
private boolean includeTextBoxes = true; | |||
private boolean includeSheetNames = true; | |||
private boolean includeCellComments = false; | |||
private boolean includeCellComments; | |||
private boolean includeHeadersFooters = true; | |||
private boolean formulasNotResults = false; | |||
private boolean formulasNotResults; | |||
private boolean concatenatePhoneticRuns = true; | |||
public XSSFEventBasedExcelExtractor(String path) throws XmlException, OpenXML4JException, IOException { |
@@ -59,7 +59,7 @@ import org.apache.poi.util.Internal; | |||
// untrackedColumns stores columns have been explicitly untracked so they aren't implicitly re-tracked by trackAllColumns | |||
// Using a HashSet instead of a TreeSet because we don't care about order. | |||
private final Set<Integer> untrackedColumns = new HashSet<Integer>(); | |||
private boolean trackAllColumns = false; | |||
private boolean trackAllColumns; | |||
/** | |||
* Tuple to store the column widths considering and not considering merged cells |