Added patch (along with fixes to it so that the unit tests work) for bug 37637

Bug 37622 and 30319 should be fixed. Tested that Euro DataFormat now works.

Ill provide a euro symbol/unicode unit test shortly.

Numerous minor changes so eclipse doesnt give so many warnings (incomplete)

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

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

@@ -24,7 +24,6 @@ package org.apache.poi.hssf.dev;
 import org.apache.poi.hssf.record.*;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
 
 import java.io.FileInputStream;
 import java.io.IOException;

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

@@ -21,8 +21,6 @@ import java.io.InputStream;
 import java.io.IOException;
 
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.hssf.eventmodel.*;
-import org.apache.poi.hssf.eventusermodel.*;
 import org.apache.poi.hssf.record.Record;
 
 import org.apache.poi.hssf.eventusermodel.HSSFRequest;

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

@@ -23,22 +23,15 @@
  */
 package org.apache.poi.hssf.dev;
 
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 
 //import java.io.*;
 import java.util.List;
 
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.HexDump;
 import org.apache.poi.hssf.record.*;
 import org.apache.poi.hssf.record.formula.*;
 import org.apache.poi.hssf.model.*;
-import org.apache.poi.hssf.usermodel.*;
 
 /**
  * FormulaViewer - finds formulas in a BIFF8 file and attempts to read them/display

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

@@ -17,13 +17,11 @@
 
 package org.apache.poi.hssf.dev;
 
-import java.io.InputStream;
 import java.io.IOException;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.hssf.record.*;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.util.*;
 
@@ -41,9 +39,6 @@ public class HSSF
 {
     private String         filename     = null;
 
-    // private POIFSFileSystem     fs           = null;
-    private InputStream    stream       = null;
-    private Record[]       records      = null;
     protected HSSFWorkbook hssfworkbook = null;
 
     /**
@@ -98,13 +93,13 @@ public class HSSF
 
         f.setFontHeightInPoints(( short ) 12);
         f.setColor(( short ) 0xA);
-        f.setBoldweight(f.BOLDWEIGHT_BOLD);
+        f.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
         f2.setFontHeightInPoints(( short ) 10);
         f2.setColor(( short ) 0xf);
-        f2.setBoldweight(f2.BOLDWEIGHT_BOLD);
+        f2.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
         cs.setFont(f);
         cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("($#,##0_);[Red]($#,##0)"));
-        cs2.setBorderBottom(cs2.BORDER_THIN);
+        cs2.setBorderBottom(HSSFCellStyle.BORDER_THIN);
         cs2.setFillPattern(( short ) 1);   // fill w fg
         cs2.setFillForegroundColor(( short ) 0xA);
         cs2.setFont(f2);
@@ -144,7 +139,7 @@ public class HSSF
         rownum++;
         rownum++;
         r = s.createRow(rownum);
-        cs3.setBorderBottom(cs3.BORDER_THICK);
+        cs3.setBorderBottom(HSSFCellStyle.BORDER_THICK);
         for (short cellnum = ( short ) 0; cellnum < 50; cellnum++)
         {
             c = r.createCell(cellnum, HSSFCell.CELL_TYPE_BLANK);
@@ -183,7 +178,7 @@ public class HSSF
     public HSSF(String infile, String outfile, boolean write)
         throws IOException
     {
-        this.filename = filename;
+        this.filename = infile;
         POIFSFileSystem fs =
             new POIFSFileSystem(new FileInputStream(filename));
 

src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java

@@ -16,7 +16,6 @@
 
 package org.apache.poi.hssf.eventmodel;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -104,7 +103,6 @@ import org.apache.poi.hssf.record.WindowOneRecord;
 import org.apache.poi.hssf.record.WindowProtectRecord;
 import org.apache.poi.hssf.record.WindowTwoRecord;
 import org.apache.poi.hssf.record.WriteAccessRecord;
-import org.apache.poi.util.LittleEndian;
 
 
 /**

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

@@ -20,7 +20,6 @@ package org.apache.poi.hssf.eventusermodel;
 import java.io.InputStream;
 import java.io.IOException;
 
-import org.apache.poi.util.LittleEndian;
 import org.apache.poi.hssf.eventusermodel.HSSFUserException;
 import org.apache.poi.hssf.record.RecordFormatException;
 import org.apache.poi.hssf.record.Record;

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

@@ -63,16 +63,11 @@ public class FormulaParser {
      * Using an unsynchronized linkedlist to implement a stack since we're not multi-threaded.
      */
     private List functionTokens = new LinkedList();
-    
-    //private Stack tokens = new java.util.Stack();
-    private List result = new ArrayList();
-    private int numParen;
-    
+        
     private static char TAB = '\t';
     private static char CR = '\n';
     
    private char look;              // Lookahead Character
-   private boolean inFunction = false;
    
    private Workbook book;
     

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

@@ -22,7 +22,6 @@ import org.apache.poi.hssf.record.ObjRecord;
 import org.apache.poi.hssf.record.EscherAggregate;
 import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
 import org.apache.poi.hssf.record.EndSubRecord;
-import org.apache.poi.hssf.usermodel.HSSFSimpleShape;
 import org.apache.poi.hssf.usermodel.HSSFShape;
 import org.apache.poi.hssf.usermodel.HSSFPolygon;
 import org.apache.poi.util.LittleEndian;

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

@@ -936,10 +936,13 @@ public class Sheet implements Model
     public void addValueRecord(int row, CellValueRecordInterface col)
     {
         checkCells();
-        log.logFormatted(POILogger.DEBUG, "add value record  row,loc %,%", new int[]
+        if(log.check(POILogger.DEBUG))
         {
-            row, loc
-        });
+          log.logFormatted(POILogger.DEBUG, "add value record  row,loc %,%", new int[]
+          {
+              row, loc
+          });
+        }
         DimensionsRecord d = ( DimensionsRecord ) records.get(getDimsLoc());
 
         if (col.getColumn() > d.getLastCol())
@@ -1764,9 +1767,10 @@ public class Sheet implements Model
 
         if (columns != null)
         {
-            for ( Iterator iterator = columns.getIterator(); iterator.hasNext(); )
+            int count=columns.getNumColumns();
+            for ( int k=0;k<count;k++ )
             {
-                ci = ( ColumnInfoRecord ) iterator.next();
+                ci = columns.getColInfo(k);
                 if ((ci.getFirstColumn() <= column)
                         && (column <= ci.getLastColumn()))
                 {
@@ -1804,8 +1808,10 @@ public class Sheet implements Model
         short retval = 0;
         ColumnInfoRecord ci = null;
         if (columns != null) {
-            for (Iterator iterator = columns.getIterator(); iterator.hasNext();) {
-                ci = (ColumnInfoRecord) iterator.next();
+          int count=columns.getNumColumns();
+          for ( int k=0;k<count;k++ )
+          {
+                ci = columns.getColInfo(k);
                 if ((ci.getFirstColumn() <= column)
                         && (column <= ci.getLastColumn())) {
                     break;
@@ -1850,9 +1856,10 @@ public class Sheet implements Model
 
         // Determine the maximum overall level
         int maxLevel = 0;
-        for ( Iterator iterator = columns.getIterator(); iterator.hasNext(); )
+        int count=columns.getNumColumns();
+        for ( int k=0;k<count;k++ )
         {
-            ColumnInfoRecord columnInfoRecord = (ColumnInfoRecord) iterator.next();
+            ColumnInfoRecord columnInfoRecord = columns.getColInfo(k);
             maxLevel = Math.max(columnInfoRecord.getOutlineLevel(), maxLevel);
         }
 

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

@@ -23,7 +23,6 @@ import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.hssf.util.SheetReferences;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
 
 import java.util.ArrayList;
 import java.util.Iterator;

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

@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.poi.hssf.record.NameRecord;
 import org.apache.poi.hssf.record.Record;
 
 public class WorkbookRecordList

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

@@ -78,8 +78,6 @@ public class AreaFormatRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_foregroundColor        = in.readInt();
         field_2_backgroundColor        = in.readInt();
         field_3_pattern                = in.readShort();
@@ -152,7 +150,7 @@ public class AreaFormatRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -75,9 +75,7 @@ public class AreaRecord
     protected void fillFields(RecordInputStream in)
     {
 
-        int pos = 0;
         field_1_formatFlags            = in.readShort();
-
     }
 
     public String toString()
@@ -119,7 +117,7 @@ public class AreaRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -75,10 +75,7 @@ public class AxisLineFormatRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_axisType               = in.readShort();
-
     }
 
     public String toString()
@@ -117,7 +114,7 @@ public class AxisLineFormatRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -87,8 +87,6 @@ public class AxisOptionsRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_minimumCategory        = in.readShort();
         field_2_maximumCategory        = in.readShort();
         field_3_majorUnitValue         = in.readShort();
@@ -98,7 +96,6 @@ public class AxisOptionsRecord
         field_7_baseUnit               = in.readShort();
         field_8_crossingPoint          = in.readShort();
         field_9_options                = in.readShort();
-
     }
 
     public String toString()
@@ -185,7 +182,7 @@ public class AxisOptionsRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -77,14 +77,11 @@ public class AxisParentRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_axisType               = in.readShort();
         field_2_x                      = in.readInt();
         field_3_y                      = in.readInt();
         field_4_width                  = in.readInt();
         field_5_height                 = in.readInt();
-
     }
 
     public String toString()
@@ -143,7 +140,7 @@ public class AxisParentRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -78,14 +78,11 @@ public class AxisRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_axisType               = in.readShort();
         field_2_reserved1              = in.readInt();
         field_3_reserved2              = in.readInt();
         field_4_reserved3              = in.readInt();
         field_5_reserved4              = in.readInt();
-
     }
 
     public String toString()
@@ -144,7 +141,7 @@ public class AxisRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -71,10 +71,7 @@ public class AxisUsedRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_numAxis                = in.readShort();
-
     }
 
     public String toString()
@@ -113,7 +110,7 @@ public class AxisUsedRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -304,7 +304,7 @@ public class BOFRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -114,6 +114,6 @@ public class BackupRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -77,12 +77,9 @@ public class BarRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_barSpace               = in.readShort();
         field_2_categorySpace          = in.readShort();
         field_3_formatFlags            = in.readShort();
-
     }
 
     public String toString()
@@ -135,7 +132,7 @@ public class BarRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -87,6 +87,6 @@ public class BeginRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -214,7 +214,7 @@ public class BlankRecord
 
     public short getSid()
     {
-        return BlankRecord.sid;
+        return sid;
     }
 
     public String toString()

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

@@ -114,6 +114,6 @@ public class BookBoolRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -268,7 +268,7 @@ public class BoolErrRecord
 
     protected void validateSid(short id)
     {
-        if (id != this.sid)
+        if (id != BoolErrRecord.sid)
         {
             throw new RecordFormatException("Not a valid BoolErrRecord");
         }
@@ -276,7 +276,7 @@ public class BoolErrRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public boolean isBefore(CellValueRecordInterface i)

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

@@ -97,7 +97,7 @@ public class BottomMarginRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     /**

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

@@ -144,11 +144,7 @@ public class BoundSheetRecord
     /**
      * Set the sheetname for this sheet.  (this appears in the tabs at the bottom)
      * @param sheetname the name of the sheet
-<<<<<<< BoundSheetRecord.java
-     * @thows IllegalArgumentException if sheet name will cause excel to crash.
-=======
      * @throws IllegalArgumentException if sheet name will cause excel to crash. 
->>>>>>> 1.14
      */
 
     public void setSheetname( String sheetname )
@@ -165,6 +161,7 @@ public class BoundSheetRecord
                     throw new IllegalArgumentException("Sheet name cannot be blank, greater than 31 chars, or contain any of /\\*?[]");
         }
         field_5_sheetname = sheetname;
+        setCompressedUnicodeFlag(StringUtil.hasMultibyte(sheetname) ?  (byte)1 : (byte)0);        
     }
 
     /**
@@ -303,6 +300,6 @@ public class BoundSheetRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -117,7 +117,7 @@ public class CalcCountRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -142,7 +142,7 @@ public class CalcModeRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -77,13 +77,10 @@ public class CategorySeriesAxisRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_crossingPoint          = in.readShort();
         field_2_labelFrequency         = in.readShort();
         field_3_tickMarkFrequency      = in.readShort();
         field_4_options                = in.readShort();
-
     }
 
     public String toString()
@@ -140,7 +137,7 @@ public class CategorySeriesAxisRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -116,7 +116,7 @@ public class ChartFormatRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public int getXPosition()

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

@@ -74,13 +74,10 @@ public class ChartRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_x                      = in.readInt();
         field_2_y                      = in.readInt();
         field_3_width                  = in.readInt();
         field_4_height                 = in.readInt();
-
     }
 
     public String toString()
@@ -134,7 +131,7 @@ public class ChartRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -123,6 +123,6 @@ public class CodepageRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -110,15 +110,12 @@ public class CommonObjectDataSubRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_objectType             = in.readShort();
         field_2_objectId               = in.readShort();
         field_3_option                 = in.readShort();
         field_4_reserved1              = in.readInt();
         field_5_reserved2              = in.readInt();
         field_6_reserved3              = in.readInt();
-
     }
 
     public String toString()
@@ -186,7 +183,7 @@ public class CommonObjectDataSubRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -18,8 +18,6 @@
 
 package org.apache.poi.hssf.record;
 
-import java.util.ArrayList;
-
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -134,7 +132,7 @@ public class ContinueRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     /**

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

@@ -144,6 +144,6 @@ public class CountryRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -184,7 +184,7 @@ public class DBCellRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public boolean isInValueSection()

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

@@ -112,6 +112,6 @@ public class DSFRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -75,10 +75,7 @@ public class DatRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_options                = in.readShort();
-
     }
 
     public String toString()
@@ -121,7 +118,7 @@ public class DatRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -75,13 +75,10 @@ public class DataFormatRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_pointNumber            = in.readShort();
         field_2_seriesIndex            = in.readShort();
         field_3_seriesNumber           = in.readShort();
         field_4_formatFlags            = in.readShort();
-
     }
 
     public String toString()
@@ -136,7 +133,7 @@ public class DataFormatRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -112,6 +112,6 @@ public class DateWindow1904Record
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -112,7 +112,7 @@ public class DefaultColWidthRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -74,10 +74,7 @@ public class DefaultDataLabelTextPropertiesRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_categoryDataType       = in.readShort();
-
     }
 
     public String toString()
@@ -116,7 +113,7 @@ public class DefaultDataLabelTextPropertiesRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -137,7 +137,7 @@ public class DefaultRowHeightRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -115,7 +115,7 @@ public class DeltaRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -192,7 +192,7 @@ public class DimensionsRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -89,7 +89,7 @@ public class EOFRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -88,6 +88,6 @@ public class EndRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -70,9 +70,6 @@ public class EndSubRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
-
     }
 
     public String toString()
@@ -87,8 +84,6 @@ public class EndSubRecord
 
     public int serialize(int offset, byte[] data)
     {
-        int pos = 0;
-
         LittleEndian.putShort(data, 0 + offset, sid);
         LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
 
@@ -106,7 +101,7 @@ public class EndSubRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -1814,6 +1814,6 @@ public class ExtendedFormatRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -174,6 +174,6 @@ public class ExternSheetRecord extends Record {
      * return the non static version of the id for this record.
      */
     public short getSid() {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -155,6 +155,6 @@ public class ExternSheetSubRecord extends Record {
      * return the non static version of the id for this record.
      */
     public short getSid() {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -120,6 +120,6 @@ public class FnGroupCountRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -75,14 +75,11 @@ public class FontBasisRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_xBasis                 = in.readShort();
         field_2_yBasis                 = in.readShort();
         field_3_heightBasis            = in.readShort();
         field_4_scale                  = in.readShort();
         field_5_indexToFontTable       = in.readShort();
-
     }
 
     public String toString()
@@ -141,7 +138,7 @@ public class FontBasisRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -71,10 +71,7 @@ public class FontIndexRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_fontIndex              = in.readShort();
-
     }
 
     public String toString()
@@ -113,7 +110,7 @@ public class FontIndexRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -538,6 +538,6 @@ public class FontRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -202,7 +202,7 @@ public class FooterRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -127,7 +127,7 @@ public class FormatRecord
     public void setFormatString(String fs)
     {
         field_4_formatstring = fs;
-        setUnicodeFlag(StringUtil.isUnicodeString(fs));
+        setUnicodeFlag(StringUtil.hasMultibyte(fs));
     }
 
     /**
@@ -227,6 +227,6 @@ public class FormatRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -76,11 +76,8 @@ public class FrameRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_borderType             = in.readShort();
         field_2_options                = in.readShort();
-
     }
 
     public String toString()
@@ -126,7 +123,7 @@ public class FrameRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -124,7 +124,7 @@ public class GridsetRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -194,7 +194,7 @@ public class GutsRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -118,7 +118,7 @@ public class HCenterRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -202,7 +202,7 @@ public class HeaderRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -122,6 +122,6 @@ public class HideObjRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -180,7 +180,7 @@ public class IndexRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -87,6 +87,6 @@ public class InterfaceEndRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -121,6 +121,6 @@ public class InterfaceHdrRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -122,7 +122,7 @@ public class IterationRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -23,9 +23,6 @@
  */
 package org.apache.poi.hssf.record;
 
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-
 /**
  * Label Record - read only support for strings stored directly in the cell..  Don't
  * use this (except to read), use LabelSST instead <P>
@@ -77,7 +74,7 @@ public class LabelRecord
 
     protected void validateSid(short id)
     {
-        if (id != this.sid)
+        if (id != sid)
         {
             throw new RecordFormatException("Not a valid LabelRecord");
         }
@@ -181,7 +178,7 @@ public class LabelRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public String toString()

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

@@ -182,7 +182,7 @@ public class LabelSSTRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public boolean isBefore(CellValueRecordInterface i)

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

@@ -84,7 +84,7 @@ public class LeftMarginRecord extends Record implements Margin
     }
 
     public short getSid()    {
-        return this.sid;
+        return sid;
     }
 
     /**

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

@@ -92,8 +92,6 @@ public class LegendRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_xAxisUpperLeft         = in.readInt();
         field_2_yAxisUpperLeft         = in.readInt();
         field_3_xSize                  = in.readInt();
@@ -101,7 +99,6 @@ public class LegendRecord
         field_5_type                   = in.readByte();
         field_6_spacing                = in.readByte();
         field_7_options                = in.readShort();
-
     }
 
     public String toString()
@@ -176,7 +173,7 @@ public class LegendRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -91,8 +91,6 @@ public class LineFormatRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_lineColor              = in.readInt();
         field_2_linePattern            = in.readShort();
         field_3_weight                 = in.readShort();
@@ -160,7 +158,7 @@ public class LineFormatRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -148,7 +148,7 @@ public class LinkedDataRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -137,6 +137,6 @@ public class MMSRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -23,8 +23,6 @@
  */
 package org.apache.poi.hssf.record;
 
-import org.apache.poi.util.LittleEndian;
-
 /**
  * Title:        Mulitple Blank cell record <P>
  * Description:  Represents a  set of columns in a row with no value but with styling.
@@ -34,7 +32,6 @@ import org.apache.poi.util.LittleEndian;
  * @author Andrew C. Oliver (acoliver at apache dot org)
  * @author Glen Stampoultzis (glens at apache.org)
  * @version 2.0-pre
- * @see org.apache.poi.hssf.record.RecordFactory
  * @see org.apache.poi.hssf.record.BlankRecord
  */
 
@@ -185,7 +182,7 @@ public class MulBlankRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public int serialize(int offset, byte [] data)

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

@@ -25,7 +25,6 @@ package org.apache.poi.hssf.record;
 
 import java.util.ArrayList;
 
-import org.apache.poi.util.LittleEndian;
 import org.apache.poi.hssf.util.RKUtil;
 
 /**
@@ -188,7 +187,7 @@ public class MulRKRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public int serialize(int offset, byte [] data)

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

@@ -767,7 +767,7 @@ public class NameRecord extends Record {
      * return the non static version of the id for this record.
      */
     public short getSid() {
-        return this.sid;
+        return sid;
     }
     /*
       20 00 

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

@@ -71,10 +71,7 @@ public class NumberFormatIndexRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_formatIndex            = in.readShort();
-
     }
 
     public String toString()
@@ -113,7 +110,7 @@ public class NumberFormatIndexRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -205,7 +205,7 @@ public class NumberRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public boolean isBefore(CellValueRecordInterface i)

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

@@ -78,8 +78,6 @@ public class ObjectLinkRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_anchorId               = in.readShort();
         field_2_link1                  = in.readShort();
         field_3_link2                  = in.readShort();
@@ -132,7 +130,7 @@ public class ObjectLinkRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -123,7 +123,7 @@ public class PaletteRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     /**

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

@@ -79,8 +79,6 @@ public class PaneRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_x                      = in.readShort();
         field_2_y                      = in.readShort();
         field_3_topRow                 = in.readShort();
@@ -145,7 +143,7 @@ public class PaneRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -113,7 +113,7 @@ public class PasswordRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     /**

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

@@ -114,6 +114,6 @@ public class PasswordRev4Record
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -71,8 +71,6 @@ public class PlotAreaRecord
     protected void fillFields(RecordInputStream in)
     {
 
-        int pos = 0;
-
     }
 
     public String toString()
@@ -87,8 +85,6 @@ public class PlotAreaRecord
 
     public int serialize(int offset, byte[] data)
     {
-        int pos = 0;
-
         LittleEndian.putShort(data, 0 + offset, sid);
         LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
 
@@ -106,7 +102,7 @@ public class PlotAreaRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -72,8 +72,6 @@ public class PlotGrowthRecord
 
     protected void fillFields(RecordInputStream in)
     {
-
-        int pos = 0;
         field_1_horizontalScale        = in.readInt();
         field_2_verticalScale          = in.readInt();
 
@@ -120,7 +118,7 @@ public class PlotGrowthRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -121,6 +121,6 @@ public class PrecisionRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -120,7 +120,7 @@ public class PrintGridlinesRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -119,7 +119,7 @@ public class PrintHeadersRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -373,7 +373,7 @@ public class PrintSetupRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -120,7 +120,7 @@ public class ProtectRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {

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

@@ -119,6 +119,6 @@ public class ProtectionRev4Record
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -18,7 +18,6 @@
 
 package org.apache.poi.hssf.record;
 
-import org.apache.poi.util.LittleEndian;
 import org.apache.poi.hssf.util.RKUtil;
 
 /**
@@ -216,7 +215,7 @@ public class RKRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public boolean isBefore(CellValueRecordInterface i)

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

@@ -148,6 +148,6 @@ public class RecalcIdRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 }

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

@@ -18,9 +18,6 @@
 
 package org.apache.poi.hssf.record;
 
-import org.apache.poi.util.LittleEndian;
-
-import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.util.*;

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

@@ -23,8 +23,6 @@ import org.apache.poi.util.LittleEndian;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Constructor;
-import java.util.*;
 
 /**
  * Title:  Record Input Stream<P>

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

@@ -18,8 +18,6 @@
 
 package org.apache.poi.hssf.record;
 
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndian;
 
 /**
  * Process a single record.  That is, an SST record or a continue record.

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

@@ -118,7 +118,7 @@ public class RefModeRecord
 
     public short getSid()
     {
-        return this.sid;
+        return sid;
     }
 
     public Object clone() {