Remove unnecessary initialization of members

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1808510 13f79535-47bb-0310-9956-ffa450edef68

src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java

@@ -794,9 +794,9 @@ public class AddDimensionedImage {
      */
     public class ClientAnchorDetail {
 
-        public int fromIndex = 0;
+        public int fromIndex;
-        public int toIndex = 0;
+        public int toIndex;
-        public int inset = 0;
+        public int inset;
 
         /**
          * Create a new instance of the ClientAnchorDetail class using the

src/examples/src/org/apache/poi/hssf/usermodel/examples/InCellLists.java

@@ -512,8 +512,8 @@ public class InCellLists {
      */
     public final class MultiLevelListItem {
 
-        private String itemText = null;
+        private String itemText;
-        private ArrayList<String> lowerLevelItems = null;
+        private ArrayList<String> lowerLevelItems;
 
         /**
          * Create a new instance of the MultiLevelListItem class using the

src/examples/src/org/apache/poi/hssf/view/SVBorder.java

@@ -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 northColor;
-  private Color eastColor = null;
+  private Color eastColor;
-  private Color southColor = null;
+  private Color southColor;
-  private Color westColor = null;
+  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 northBorder;
-  private boolean eastBorder=false;
+  private boolean eastBorder;
-  private boolean southBorder=false;
+  private boolean southBorder;
-  private boolean westBorder=false;
+  private boolean westBorder;
-  private boolean selected = false;
+  private boolean selected;
 
    public void setBorder(Color northColor, Color eastColor,
                          Color southColor, Color westColor,

src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java

@@ -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.
      */

src/examples/src/org/apache/poi/hssf/view/SVTableModel.java

@@ -34,8 +34,8 @@ import org.apache.poi.hssf.usermodel.HSSFCell;
  */
 
 public class SVTableModel extends AbstractTableModel {
-  private HSSFSheet st = null;
+  private HSSFSheet st;
-  int maxcol = 0;
+  int maxcol;
 
   public SVTableModel(HSSFSheet st, int maxcol) {
     this.st = st;

src/examples/src/org/apache/poi/hssf/view/SViewer.java

@@ -40,8 +40,8 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
  */
 public class SViewer extends JApplet {
   private SViewerPanel panel;
-  boolean isStandalone = false;
+  boolean isStandalone;
-  String filename = null;
+  String filename;
 
   /**Get a parameter value*/
   public String getParameter(String key, String def) {

src/examples/src/org/apache/poi/ss/examples/AddDimensionedImage.java

@@ -864,9 +864,9 @@ public class AddDimensionedImage {
      */
     public class ClientAnchorDetail {
 
-        public int fromIndex = 0;
+        public int fromIndex;
-        public int toIndex = 0;
+        public int toIndex;
-        public int inset = 0;
+        public int inset;
 
         /**
          * Create a new instance of the ClientAnchorDetail class using the

src/examples/src/org/apache/poi/ss/examples/ToCSV.java

@@ -132,13 +132,13 @@ import org.apache.poi.ss.usermodel.WorkbookFactory;
  */
 public class ToCSV {
 
-    private Workbook workbook = null;
+    private Workbook workbook;
-    private ArrayList<ArrayList<String>> csvData = null;
+    private ArrayList<ArrayList<String>> csvData;
-    private int maxRowWidth = 0;
+    private int maxRowWidth;
-    private int formattingConvention = 0;
+    private int formattingConvention;
-    private DataFormatter formatter = null;
+    private DataFormatter formatter;
-    private FormulaEvaluator evaluator = null;
+    private FormulaEvaluator evaluator;
-    private String separator = null;
+    private String separator;
 
     private static final String CSV_FILE_EXTENSION = ".csv";
     private static final String DEFAULT_SEPARATOR = ",";

src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java

@@ -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;
         

src/examples/src/org/apache/poi/xwpf/usermodel/examples/UpdateEmbeddedDoc.java

@@ -49,8 +49,8 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument;
  */
 public class UpdateEmbeddedDoc {
 
-    private XWPFDocument doc = null;
+    private XWPFDocument doc;
-    private File docFile = null;
+    private File docFile;
 
     private static final int SHEET_NUM = 0;
     private static final int ROW_NUM = 0;

src/excelant/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java

@@ -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() {}

src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java

@@ -37,7 +37,7 @@ public class ExcelAntTask extends Task {
 	
 	private String excelFileName ;
 	
-	private boolean failOnError = false  ;
+	private boolean failOnError;
 	
 	private ExcelAntWorkbookUtil workbookUtil ;
 	

src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java

@@ -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;
 	
 

src/excelant/testcases/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java

@@ -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 boolean executed;
-    public static Workbook workbook = null;
+    public static Workbook workbook;
     
     
     @Override

src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java

@@ -26,8 +26,8 @@ import org.junit.Test;
 public class TestExcelAntEvaluationResult {
 	private ExcelAntEvaluationResult fixture;
 	
-	private boolean completedWithError = false;
+	private boolean completedWithError;
-    private boolean passed = false;
+    private boolean passed;
     private double retValue  = 1.1; 
     private String errMessage = "error message";  
     private double delta = 2.2; 

src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java

@@ -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,7 +92,7 @@ public class HPSFFileHandler extends POIFSFileHandler {
 	    try {
 	        return PropertySet.isPropertySetStream(dis);
 	    } finally {
-	        dis.close();;
+	        dis.close();
         }
 	}
 	

src/java/org/apache/poi/POITextExtractor.java

@@ -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.

src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java

@@ -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) {

src/java/org/apache/poi/ddf/EscherColorRef.java

@@ -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. */

src/java/org/apache/poi/hpsf/ClipboardData.java

@@ -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() {}

src/java/org/apache/poi/hpsf/Thumbnail.java

@@ -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;
 
 
 

src/java/org/apache/poi/hssf/dev/FormulaViewer.java

@@ -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 */
 

src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java

@@ -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;

src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java

@@ -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() {

src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java

@@ -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 _includeCellComments;
-	private boolean _includeBlankCells = false;
+	private boolean _includeBlankCells;
 	private boolean _includeHeadersFooters = true;
 
 	public ExcelExtractor(HSSFWorkbook wb) {

src/java/org/apache/poi/hssf/model/InternalSheet.java

@@ -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 PrintGridlinesRecord       printGridlines;
-    protected PrintHeadersRecord         printHeaders      =     null;
+    protected PrintHeadersRecord         printHeaders;
-    protected GridsetRecord              gridset           =     null;
+    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 WindowTwoRecord            windowTwo;
-    protected SelectionRecord            _selection         =     null;
+    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;

src/java/org/apache/poi/hssf/model/WorkbookRecordList.java

@@ -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;
 

src/java/org/apache/poi/hssf/record/FontRecord.java

@@ -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;
 

src/java/org/apache/poi/hssf/record/FtCfSubRecord.java

@@ -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

src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java

@@ -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

src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java

@@ -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
 	 */

src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java

@@ -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() {

src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java

@@ -307,8 +307,8 @@ public final class ValueRecordsAggregate implements Iterable<CellValueRecordInte
 	 */
 	class ValueIterator implements Iterator<CellValueRecordInterface> {
 
-		int curRowIndex = 0, curColIndex = -1;
+		int curRowIndex, curColIndex = -1;
-		int nextRowIndex = 0, nextColIndex = -1;
+		int nextRowIndex, nextColIndex = -1;
 
 		public ValueIterator() {
 			getNextPos();

src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java

@@ -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;
     

src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java

@@ -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 options;
-    private byte percentMin = 0;
+    private byte percentMin;
-    private byte percentMax = 0;
+    private byte percentMax;
     private ExtendedColor color;
     private DataBarThreshold thresholdMin;
     private DataBarThreshold thresholdMax;

src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java

@@ -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 {

src/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java

@@ -30,8 +30,8 @@ import org.apache.poi.ss.usermodel.ChildAnchor;
  */
 public abstract class HSSFAnchor implements ChildAnchor {
 
-    protected boolean _isHorizontallyFlipped = false;
+    protected boolean _isHorizontallyFlipped;
-    protected boolean _isVerticallyFlipped = false;
+    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;
         }

src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java

@@ -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.

src/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java

@@ -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;

src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java

@@ -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();

src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java

@@ -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 {

src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java

@@ -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);

src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java

@@ -203,9 +203,9 @@ public class DataSpaceMapUtils {
         int transformType;
         String transformerId;
         String transformerName;
-        int readerVersionMajor = 1, readerVersionMinor = 0;
+        int readerVersionMajor = 1, readerVersionMinor;
-        int updaterVersionMajor = 1, updaterVersionMinor = 0;
+        int updaterVersionMajor = 1, updaterVersionMinor;
-        int writerVersionMajor = 1, writerVersionMinor = 0;
+        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 readerVersionMajor = 1, readerVersionMinor;
-        int updaterVersionMajor = 1, updaterVersionMinor = 0;
+        int updaterVersionMajor = 1, updaterVersionMinor;
-        int writerVersionMajor = 1, writerVersionMinor = 0;
+        int writerVersionMajor = 1, writerVersionMinor;
         
         public DataSpaceVersionInfo(LittleEndianInput is) {
             featureIdentifier = readUnicodeLPP4(is);

src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java

@@ -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 recordStart;
-        private int recordEnd = 0;
+        private int recordEnd;
         
         public XORCipherInputStream(InputStream stream, int initialPos)
                 throws GeneralSecurityException {

src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java

@@ -88,8 +88,8 @@ public class XOREncryptor extends Encryptor implements Cloneable {
     }
 
     private class XORCipherOutputStream extends ChunkedCipherOutputStream {
-        private int recordStart = 0;
+        private int recordStart;
-        private int recordEnd = 0;
+        private int recordEnd;
 
         public XORCipherOutputStream(OutputStream stream, int initialPos) throws IOException, GeneralSecurityException {
             super(stream, -1);

src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java

@@ -51,7 +51,7 @@ public class POIFSReader
 {
     private final POIFSReaderRegistry registry;
     private boolean registryClosed;
-    private boolean notifyEmptyDirectories = false;
+    private boolean notifyEmptyDirectories;
 
     /**
      * Create a POIFSReader

src/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java

@@ -30,7 +30,7 @@ public class DocumentDescriptor
 {
     private POIFSDocumentPath path;
     private String            name;
-    private int               hashcode = 0;
+    private int               hashcode;
 
     /**
      * Trivial constructor

src/java/org/apache/poi/poifs/filesystem/Ole10Native.java

@@ -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 ...

src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java

@@ -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

src/java/org/apache/poi/ss/format/CellDateFormatter.java

@@ -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;

src/java/org/apache/poi/ss/util/SheetBuilder.java

@@ -35,8 +35,8 @@ public class SheetBuilder {
 
     private final Workbook workbook;
     private final Object[][] cells;
-    private boolean shouldCreateEmptyCells = false;
+    private boolean shouldCreateEmptyCells;
-    private String sheetName = null;
+    private String sheetName;
 
     public SheetBuilder(Workbook workbook, Object[][] cells) {
         this.workbook = workbook;

src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java

@@ -110,9 +110,9 @@ public class CellWalk {
      * @author Roman Kashitsyn
      */
     private static class SimpleCellWalkContext implements CellWalkContext {
-        public long ordinalNumber = 0;
+        public long ordinalNumber;
-        public int rowNumber = 0;
+        public int rowNumber;
-        public int colNumber = 0;
+        public int colNumber;
 
         public long getOrdinalNumber() {
             return ordinalNumber;

src/java/org/apache/poi/util/BoundedInputStream.java

@@ -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;

src/java/org/apache/poi/util/CommonsLogger.java

@@ -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)

src/java/org/apache/poi/util/IntList.java

@@ -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;
 
     /**

src/java/org/apache/poi/util/LittleEndianCP950Reader.java

@@ -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) {

src/java/org/apache/poi/util/POILogFactory.java

@@ -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.

src/java/org/apache/poi/util/ReplacingInputStream.java

@@ -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 matchedIndex;
-    private int unbufferIndex=0;
+    private int unbufferIndex;
-    private int replacedIndex=0;
+    private int replacedIndex;
 
     private final byte[] pattern;
     private final byte[] replacement;

src/java/org/apache/poi/util/StringUtil.java

@@ -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();

src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java

@@ -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++;

src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java

@@ -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.

src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java

@@ -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

src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java

@@ -197,8 +197,8 @@ public class ZipSecureFile extends ZipFile {
     }
 
     public static class ThresholdInputStream extends PushbackInputStream {
-        long counter = 0;
+        long counter;
-        long markPos = 0;
+        long markPos;
         ThresholdInputStream cis;
 
         public ThresholdInputStream(InputStream is, ThresholdInputStream cis) {

src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java

@@ -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 includeIssuerSerial;
-    private boolean includeKeyValue = false;
+    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 HashAlgorithm xadesDigestAlgo;
-    private String xadesRole = null;
+    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

src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java

@@ -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;
+                    Iterator<PackageRelationship> sigRels;
-                    PackagePart sigPart = null;
+                    PackagePart sigPart;
                     
                     public boolean hasNext() {
                         while (sigRels == null || !sigRels.hasNext()) {

src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java

@@ -40,10 +40,10 @@ public class XDGFDocument {
     Map<Long, XDGFStyleSheet> _styleSheets = new HashMap<Long, XDGFStyleSheet>();
 
     // defaults
-    long _defaultFillStyle = 0;
+    long _defaultFillStyle;
-    long _defaultGuideStyle = 0;
+    long _defaultGuideStyle;
-    long _defaultLineStyle = 0;
+    long _defaultLineStyle;
-    long _defaultTextStyle = 0;
+    long _defaultTextStyle;
 
 
     public XDGFDocument(VisioDocumentType document) {

src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java

@@ -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) {

src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java

@@ -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) {

src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java

@@ -49,58 +49,58 @@ public class XDGFShape extends XDGFSheet {
     XDGFBaseContents _parentPage;
     XDGFShape _parent; // only non-null if a subshape
 
-    XDGFMaster _master = null;
+    XDGFMaster _master;
-    XDGFShape _masterShape = null;
+    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 _pinX;
-    Double _pinY = null;
+    Double _pinY;
 
-    Double _width = null;
+    Double _width;
-    Double _height = null;
+    Double _height;
 
     // center of rotation relative to self
-    Double _locPinX = null;
+    Double _locPinX;
-    Double _locPinY = null;
+    Double _locPinY;
 
     // start x coordinate, relative to parent
     // -> one dimensional shapes only
-    Double _beginX = null;
+    Double _beginX;
-    Double _beginY = null;
+    Double _beginY;
 
     // end x coordinate, relative to parent
     // -> one dimensional shapes only
-    Double _endX = null;
+    Double _endX;
-    Double _endY = null;
+    Double _endY;
 
-    Double _angle = null;
+    Double _angle;
-    Double _rotationXAngle = null;
+    Double _rotationXAngle;
-    Double _rotationYAngle = null;
+    Double _rotationYAngle;
-    Double _rotationZAngle = null;
+    Double _rotationZAngle;
 
     // end x coordinate, relative to parent
-    Boolean _flipX = null;
+    Boolean _flipX;
-    Boolean _flipY = null;
+    Boolean _flipY;
 
     // center of text relative to this shape
-    Double _txtPinX = null;
+    Double _txtPinX;
-    Double _txtPinY = null;
+    Double _txtPinY;
 
     // center of text relative to text block
-    Double _txtLocPinX = null;
+    Double _txtLocPinX;
-    Double _txtLocPinY = null;
+    Double _txtLocPinY;
 
-    Double _txtAngle = null;
+    Double _txtAngle;
 
-    Double _txtWidth = null;
+    Double _txtWidth;
-    Double _txtHeight = null;
+    Double _txtHeight;
 
     public XDGFShape(ShapeSheetType shapeSheet, XDGFBaseContents parentPage,
             XDGFDocument document) {

src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java

@@ -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 {

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java

@@ -30,8 +30,8 @@ import com.microsoft.schemas.office.visio.x2012.main.SectionType;
 
 public class CharacterSection extends XDGFSection {
 
-    Double _fontSize = null;
+    Double _fontSize;
-    Color _fontColor = null;
+    Color _fontColor;
 
     Map<String, XDGFCell> _characterCells = new HashMap<String, XDGFCell>();
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java

@@ -56,8 +56,8 @@ public class CombinedIterable<T> implements Iterable<T> {
 
             Long lastI = Long.MIN_VALUE;
 
-            Entry<Long, T> currentBase = null;
+            Entry<Long, T> currentBase;
-            Entry<Long, T> currentMaster = null;
+            Entry<Long, T> currentMaster;
 
             // grab the iterator for both
             Iterator<Entry<Long, T>> baseI = _baseItems.entrySet().iterator();

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java

@@ -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>();

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java

@@ -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) {

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java

@@ -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 x;
-    Double y = null;
+    Double y;
 
-    Boolean deleted = null;
+    Boolean deleted;
 
     // TODO: support formulas
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java

@@ -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 x;
-    Double y = null;
+    Double y;
 
-    Boolean deleted = null;
+    Boolean deleted;
 
     // TODO: support formulas
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java

@@ -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 x;
-    Double y = null;
+    Double y;
 
-    Boolean deleted = null;
+    Boolean deleted;
 
     // TODO: support formulas
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java

@@ -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 x;
-    Double y = null;
+    Double y;
 
-    Boolean deleted = null;
+    Boolean deleted;
 
     // TODO: support formulas
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java

@@ -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
 

src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java

@@ -25,7 +25,7 @@ import org.apache.poi.xdgf.usermodel.XDGFShape;
 
 public class ShapeDebuggerRenderer extends ShapeRenderer {
 
-    ShapeVisitorAcceptor _debugAcceptor = null;
+    ShapeVisitorAcceptor _debugAcceptor;
 
     public ShapeDebuggerRenderer() {
         super();

src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java

@@ -49,8 +49,8 @@ public class XSLFPowerPointExtractor extends POIXMLTextExtractor {
    
 	private XMLSlideShow slideshow;
 	private boolean slidesByDefault = true;
-	private boolean notesByDefault = false;
+	private boolean notesByDefault;
-   private boolean masterByDefault = false;
+   private boolean masterByDefault;
 	
 	public XSLFPowerPointExtractor(XMLSlideShow slideshow) {
 		super(slideshow);

src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java

@@ -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;
 
     /**

src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java

@@ -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());

src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java

@@ -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 CellAddress cellAddress;
-    private XSSFBCellRange cellRange = null;
+    private XSSFBCellRange cellRange;
-    private String comment = null;
+    private String comment;
     private StringBuilder authorBuffer = new StringBuilder();
 
 

src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java

@@ -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();

src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java

@@ -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 inCellXFS;
-    private boolean inFmts = false;
+    private boolean inFmts;
     public XSSFBStylesTable(InputStream is) throws IOException {
         super(is);
         parse();

src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java

@@ -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);
         }

src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java

@@ -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);

src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java

@@ -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 {

src/ooxml/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java

@@ -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

src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java

@@ -42,8 +42,8 @@ public class SXSSFRow implements Row, Comparable<SXSSFRow>
     private final SortedMap<Integer, SXSSFCell> _cells = new TreeMap<Integer, SXSSFCell>();
     private short _style = -1; // index of cell style in style table
     private short _height = -1; // row height in twips (1/20 point)
-    private boolean _zHeight = false; // row zero-height (this is somehow different than being hidden)
+    private boolean _zHeight; // row zero-height (this is somehow different than being hidden)
-    private int _outlineLevel = 0;   // Outlining level of the row, when outlining is on
+    private int _outlineLevel;   // Outlining level of the row, when outlining is on
     // use Boolean to have a tri-state for on/off/undefined 
     private Boolean _hidden = UNDEFINED;
     private Boolean _collapsed = UNDEFINED;
@@ -490,7 +490,7 @@ public class SXSSFRow implements Row, Comparable<SXSSFRow>
     public class CellIterator implements Iterator<Cell>
     {
         final int maxColumn = getLastCellNum(); //last column PLUS ONE
-        int pos = 0;
+        int pos;
 
         @Override
         public boolean hasNext()