diff --git a/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/src/java/org/apache/poi/hssf/dev/BiffViewer.java index 910224bd1..29d75fb5f 100644 --- a/src/java/org/apache/poi/hssf/dev/BiffViewer.java +++ b/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; diff --git a/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java b/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java index bc0b21575..b5b2457f6 100644 --- a/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java +++ b/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; diff --git a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java b/src/java/org/apache/poi/hssf/dev/FormulaViewer.java index aad277106..cd361d473 100644 --- a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java +++ b/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 diff --git a/src/java/org/apache/poi/hssf/dev/HSSF.java b/src/java/org/apache/poi/hssf/dev/HSSF.java index 2b683f838..b5967657b 100644 --- a/src/java/org/apache/poi/hssf/dev/HSSF.java +++ b/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)); diff --git a/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java b/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java index c48dd8507..438107ac4 100644 --- a/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java +++ b/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; /** diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java b/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java index dcdbfc3b2..c4ce0b962 100644 --- a/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java +++ b/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; diff --git a/src/java/org/apache/poi/hssf/model/FormulaParser.java b/src/java/org/apache/poi/hssf/model/FormulaParser.java index e8bbc3b67..e15e7cff8 100644 --- a/src/java/org/apache/poi/hssf/model/FormulaParser.java +++ b/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; diff --git a/src/java/org/apache/poi/hssf/model/PolygonShape.java b/src/java/org/apache/poi/hssf/model/PolygonShape.java index 5c6f44bbf..59353a074 100644 --- a/src/java/org/apache/poi/hssf/model/PolygonShape.java +++ b/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; diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java index 34f0e9d88..1c55ab50f 100644 --- a/src/java/org/apache/poi/hssf/model/Sheet.java +++ b/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>>>>>> 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; } } diff --git a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java b/src/java/org/apache/poi/hssf/record/CalcCountRecord.java index ff63f4944..ed313e820 100644 --- a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/CalcModeRecord.java b/src/java/org/apache/poi/hssf/record/CalcModeRecord.java index 8c56fa9c3..11ab0d134 100644 --- a/src/java/org/apache/poi/hssf/record/CalcModeRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java b/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java index c305ac66a..d8c2b169e 100644 --- a/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java b/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java index 2b22c64a7..a4abb9e2a 100644 --- a/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java +++ b/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() diff --git a/src/java/org/apache/poi/hssf/record/ChartRecord.java b/src/java/org/apache/poi/hssf/record/ChartRecord.java index bc203c88a..a8e437d1a 100644 --- a/src/java/org/apache/poi/hssf/record/ChartRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/CodepageRecord.java b/src/java/org/apache/poi/hssf/record/CodepageRecord.java index 05ada0ce6..03af4060f 100644 --- a/src/java/org/apache/poi/hssf/record/CodepageRecord.java +++ b/src/java/org/apache/poi/hssf/record/CodepageRecord.java @@ -123,6 +123,6 @@ public class CodepageRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java b/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java index aa68c8a2f..d9412c319 100644 --- a/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/ContinueRecord.java b/src/java/org/apache/poi/hssf/record/ContinueRecord.java index dde8e6189..8c3423502 100644 --- a/src/java/org/apache/poi/hssf/record/ContinueRecord.java +++ b/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; } /** diff --git a/src/java/org/apache/poi/hssf/record/CountryRecord.java b/src/java/org/apache/poi/hssf/record/CountryRecord.java index 8c267eb9f..831347102 100644 --- a/src/java/org/apache/poi/hssf/record/CountryRecord.java +++ b/src/java/org/apache/poi/hssf/record/CountryRecord.java @@ -144,6 +144,6 @@ public class CountryRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/DBCellRecord.java b/src/java/org/apache/poi/hssf/record/DBCellRecord.java index e4ee39b7f..ec3f82476 100644 --- a/src/java/org/apache/poi/hssf/record/DBCellRecord.java +++ b/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() diff --git a/src/java/org/apache/poi/hssf/record/DSFRecord.java b/src/java/org/apache/poi/hssf/record/DSFRecord.java index 857dc29ac..b68be022b 100644 --- a/src/java/org/apache/poi/hssf/record/DSFRecord.java +++ b/src/java/org/apache/poi/hssf/record/DSFRecord.java @@ -112,6 +112,6 @@ public class DSFRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/DatRecord.java b/src/java/org/apache/poi/hssf/record/DatRecord.java index 182142826..5c56765b3 100644 --- a/src/java/org/apache/poi/hssf/record/DatRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/DataFormatRecord.java b/src/java/org/apache/poi/hssf/record/DataFormatRecord.java index 5f6ee27a0..b444461fb 100644 --- a/src/java/org/apache/poi/hssf/record/DataFormatRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java b/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java index 6b4614e22..90eac8cdd 100644 --- a/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java +++ b/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java @@ -112,6 +112,6 @@ public class DateWindow1904Record public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java b/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java index 853965054..98dca9609 100644 --- a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java b/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java index 607049e3e..ffb5e0290 100644 --- a/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java b/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java index b33403699..8d75d8d83 100644 --- a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/DeltaRecord.java b/src/java/org/apache/poi/hssf/record/DeltaRecord.java index 30b3615a2..4bf8b6eaa 100644 --- a/src/java/org/apache/poi/hssf/record/DeltaRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/DimensionsRecord.java b/src/java/org/apache/poi/hssf/record/DimensionsRecord.java index bb14ff53f..01e973474 100644 --- a/src/java/org/apache/poi/hssf/record/DimensionsRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/EOFRecord.java b/src/java/org/apache/poi/hssf/record/EOFRecord.java index 4798fd5d7..6ca42c247 100644 --- a/src/java/org/apache/poi/hssf/record/EOFRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/EndRecord.java b/src/java/org/apache/poi/hssf/record/EndRecord.java index f2fcbd851..f2b527400 100644 --- a/src/java/org/apache/poi/hssf/record/EndRecord.java +++ b/src/java/org/apache/poi/hssf/record/EndRecord.java @@ -88,6 +88,6 @@ public class EndRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/EndSubRecord.java b/src/java/org/apache/poi/hssf/record/EndSubRecord.java index 0efe34dfe..9fa379e4d 100644 --- a/src/java/org/apache/poi/hssf/record/EndSubRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java b/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java index e19d89480..a83f5458c 100644 --- a/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java +++ b/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java @@ -1814,6 +1814,6 @@ public class ExtendedFormatRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java b/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java index 22c207634..312ee8c14 100644 --- a/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java +++ b/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; } } diff --git a/src/java/org/apache/poi/hssf/record/ExternSheetSubRecord.java b/src/java/org/apache/poi/hssf/record/ExternSheetSubRecord.java index 3a455dc95..29f517f60 100644 --- a/src/java/org/apache/poi/hssf/record/ExternSheetSubRecord.java +++ b/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; } } diff --git a/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java b/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java index 18bd19764..838a6a4e9 100644 --- a/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java +++ b/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java @@ -120,6 +120,6 @@ public class FnGroupCountRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/FontBasisRecord.java b/src/java/org/apache/poi/hssf/record/FontBasisRecord.java index ff924a08d..6f9e2391d 100644 --- a/src/java/org/apache/poi/hssf/record/FontBasisRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/FontIndexRecord.java b/src/java/org/apache/poi/hssf/record/FontIndexRecord.java index 9b67e638a..4f881d75f 100644 --- a/src/java/org/apache/poi/hssf/record/FontIndexRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/FontRecord.java b/src/java/org/apache/poi/hssf/record/FontRecord.java index 8c0100893..4e1360ed6 100644 --- a/src/java/org/apache/poi/hssf/record/FontRecord.java +++ b/src/java/org/apache/poi/hssf/record/FontRecord.java @@ -538,6 +538,6 @@ public class FontRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/FooterRecord.java b/src/java/org/apache/poi/hssf/record/FooterRecord.java index a8846fc2c..4492ef3bd 100644 --- a/src/java/org/apache/poi/hssf/record/FooterRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/FormatRecord.java b/src/java/org/apache/poi/hssf/record/FormatRecord.java index ec2c8297f..0ac50747f 100644 --- a/src/java/org/apache/poi/hssf/record/FormatRecord.java +++ b/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; } } diff --git a/src/java/org/apache/poi/hssf/record/FrameRecord.java b/src/java/org/apache/poi/hssf/record/FrameRecord.java index 48e6bb430..6c7c5c1c2 100644 --- a/src/java/org/apache/poi/hssf/record/FrameRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/GridsetRecord.java b/src/java/org/apache/poi/hssf/record/GridsetRecord.java index 2d2148fcf..7dc920409 100644 --- a/src/java/org/apache/poi/hssf/record/GridsetRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/GutsRecord.java b/src/java/org/apache/poi/hssf/record/GutsRecord.java index 7adbe763c..d6592b887 100644 --- a/src/java/org/apache/poi/hssf/record/GutsRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/HCenterRecord.java b/src/java/org/apache/poi/hssf/record/HCenterRecord.java index a0a817619..f23c86de3 100644 --- a/src/java/org/apache/poi/hssf/record/HCenterRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/HeaderRecord.java b/src/java/org/apache/poi/hssf/record/HeaderRecord.java index 4b9ec0bfc..a64146b12 100644 --- a/src/java/org/apache/poi/hssf/record/HeaderRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/HideObjRecord.java b/src/java/org/apache/poi/hssf/record/HideObjRecord.java index 57a2f7239..a116bfcdd 100644 --- a/src/java/org/apache/poi/hssf/record/HideObjRecord.java +++ b/src/java/org/apache/poi/hssf/record/HideObjRecord.java @@ -122,6 +122,6 @@ public class HideObjRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/IndexRecord.java b/src/java/org/apache/poi/hssf/record/IndexRecord.java index dd46b6ad0..b4bcddc66 100644 --- a/src/java/org/apache/poi/hssf/record/IndexRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java b/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java index 1bdbeb2bd..63e89c005 100644 --- a/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java +++ b/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java @@ -87,6 +87,6 @@ public class InterfaceEndRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java b/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java index 6a21849b6..798a909f7 100644 --- a/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java +++ b/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java @@ -121,6 +121,6 @@ public class InterfaceHdrRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/IterationRecord.java b/src/java/org/apache/poi/hssf/record/IterationRecord.java index 7f4afa829..c7fbe4c47 100644 --- a/src/java/org/apache/poi/hssf/record/IterationRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/LabelRecord.java b/src/java/org/apache/poi/hssf/record/LabelRecord.java index 8ef60644a..04702fd29 100644 --- a/src/java/org/apache/poi/hssf/record/LabelRecord.java +++ b/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

@@ -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() diff --git a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java b/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java index 99262606b..990d1a030 100644 --- a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java +++ b/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) diff --git a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java b/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java index f9c8b9660..1d7a91a05 100644 --- a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java +++ b/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; } /** diff --git a/src/java/org/apache/poi/hssf/record/LegendRecord.java b/src/java/org/apache/poi/hssf/record/LegendRecord.java index 7f402e2aa..b80c24d44 100644 --- a/src/java/org/apache/poi/hssf/record/LegendRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/LineFormatRecord.java b/src/java/org/apache/poi/hssf/record/LineFormatRecord.java index 756f81b7b..dab9003da 100644 --- a/src/java/org/apache/poi/hssf/record/LineFormatRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java b/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java index 20a64fe0e..e6d3a0986 100644 --- a/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/MMSRecord.java b/src/java/org/apache/poi/hssf/record/MMSRecord.java index fc82e8a51..ba7a562c0 100644 --- a/src/java/org/apache/poi/hssf/record/MMSRecord.java +++ b/src/java/org/apache/poi/hssf/record/MMSRecord.java @@ -137,6 +137,6 @@ public class MMSRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/MulBlankRecord.java b/src/java/org/apache/poi/hssf/record/MulBlankRecord.java index 8f44818ff..45e54082a 100644 --- a/src/java/org/apache/poi/hssf/record/MulBlankRecord.java +++ b/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

* 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) diff --git a/src/java/org/apache/poi/hssf/record/MulRKRecord.java b/src/java/org/apache/poi/hssf/record/MulRKRecord.java index 01ed4ebea..514af56fd 100644 --- a/src/java/org/apache/poi/hssf/record/MulRKRecord.java +++ b/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) diff --git a/src/java/org/apache/poi/hssf/record/NameRecord.java b/src/java/org/apache/poi/hssf/record/NameRecord.java index 9b4541047..576385cfb 100644 --- a/src/java/org/apache/poi/hssf/record/NameRecord.java +++ b/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 diff --git a/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java b/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java index f219a3899..0856d01a7 100644 --- a/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/NumberRecord.java b/src/java/org/apache/poi/hssf/record/NumberRecord.java index 3696144cd..d213b19eb 100644 --- a/src/java/org/apache/poi/hssf/record/NumberRecord.java +++ b/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) diff --git a/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java b/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java index 8a0c84084..f939b7dfa 100644 --- a/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/PaletteRecord.java b/src/java/org/apache/poi/hssf/record/PaletteRecord.java index eb6ebd067..57fe5ba57 100644 --- a/src/java/org/apache/poi/hssf/record/PaletteRecord.java +++ b/src/java/org/apache/poi/hssf/record/PaletteRecord.java @@ -123,7 +123,7 @@ public class PaletteRecord public short getSid() { - return this.sid; + return sid; } /** diff --git a/src/java/org/apache/poi/hssf/record/PaneRecord.java b/src/java/org/apache/poi/hssf/record/PaneRecord.java index 980d06f4b..c499b88e7 100644 --- a/src/java/org/apache/poi/hssf/record/PaneRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/PasswordRecord.java b/src/java/org/apache/poi/hssf/record/PasswordRecord.java index 26e7ac7d7..7fe1e4464 100644 --- a/src/java/org/apache/poi/hssf/record/PasswordRecord.java +++ b/src/java/org/apache/poi/hssf/record/PasswordRecord.java @@ -113,7 +113,7 @@ public class PasswordRecord public short getSid() { - return this.sid; + return sid; } /** diff --git a/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java b/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java index 272067b65..28bde210f 100644 --- a/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java +++ b/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java @@ -114,6 +114,6 @@ public class PasswordRev4Record public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java b/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java index 724a4b3e4..51065e8ff 100644 --- a/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java b/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java index 7464c1a9a..b418f954d 100644 --- a/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/PrecisionRecord.java b/src/java/org/apache/poi/hssf/record/PrecisionRecord.java index 832a2297d..0f9cc1068 100644 --- a/src/java/org/apache/poi/hssf/record/PrecisionRecord.java +++ b/src/java/org/apache/poi/hssf/record/PrecisionRecord.java @@ -121,6 +121,6 @@ public class PrecisionRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java b/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java index d7bfa0847..4fec7e22b 100644 --- a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java b/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java index fa1ebdc9d..850718d60 100644 --- a/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java b/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java index c7ee3d06e..61f5c80c0 100644 --- a/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/ProtectRecord.java b/src/java/org/apache/poi/hssf/record/ProtectRecord.java index 8bd56948c..d13115155 100644 --- a/src/java/org/apache/poi/hssf/record/ProtectRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java b/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java index a5288e7a1..b2caaba7c 100644 --- a/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java +++ b/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java @@ -119,6 +119,6 @@ public class ProtectionRev4Record public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/RKRecord.java b/src/java/org/apache/poi/hssf/record/RKRecord.java index ddedbf37a..0ead1dad9 100644 --- a/src/java/org/apache/poi/hssf/record/RKRecord.java +++ b/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) diff --git a/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java b/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java index 29f424593..cd00f0be4 100644 --- a/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java +++ b/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java @@ -148,6 +148,6 @@ public class RecalcIdRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/RecordFactory.java b/src/java/org/apache/poi/hssf/record/RecordFactory.java index ede447625..544a89658 100644 --- a/src/java/org/apache/poi/hssf/record/RecordFactory.java +++ b/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.*; diff --git a/src/java/org/apache/poi/hssf/record/RecordInputStream.java b/src/java/org/apache/poi/hssf/record/RecordInputStream.java index 52551d840..17c98763a 100755 --- a/src/java/org/apache/poi/hssf/record/RecordInputStream.java +++ b/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

diff --git a/src/java/org/apache/poi/hssf/record/RecordProcessor.java b/src/java/org/apache/poi/hssf/record/RecordProcessor.java index e00179281..88a66f00d 100644 --- a/src/java/org/apache/poi/hssf/record/RecordProcessor.java +++ b/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. diff --git a/src/java/org/apache/poi/hssf/record/RefModeRecord.java b/src/java/org/apache/poi/hssf/record/RefModeRecord.java index c78dfed9d..02bd51078 100644 --- a/src/java/org/apache/poi/hssf/record/RefModeRecord.java +++ b/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() { diff --git a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java b/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java index 695458c1b..c203f73bd 100644 --- a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java +++ b/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java @@ -119,6 +119,6 @@ public class RefreshAllRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java b/src/java/org/apache/poi/hssf/record/RightMarginRecord.java index 611a0aa53..037d0130c 100644 --- a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java +++ b/src/java/org/apache/poi/hssf/record/RightMarginRecord.java @@ -73,7 +73,7 @@ public class RightMarginRecord extends Record implements Margin */ public int getRecordSize() { return 4 + 8; } - public short getSid() { return this.sid; } + public short getSid() { return sid; } /** * Get the margin field for the RightMargin record. diff --git a/src/java/org/apache/poi/hssf/record/RowRecord.java b/src/java/org/apache/poi/hssf/record/RowRecord.java index 73aa1db6a..29e701bc1 100644 --- a/src/java/org/apache/poi/hssf/record/RowRecord.java +++ b/src/java/org/apache/poi/hssf/record/RowRecord.java @@ -52,13 +52,13 @@ public class RowRecord // for generated sheets. private short field_6_reserved; private short field_7_option_flags; - private BitField outlineLevel = BitFieldFactory.getInstance(0x07); + private static final BitField outlineLevel = BitFieldFactory.getInstance(0x07); // bit 3 reserved - private BitField colapsed = BitFieldFactory.getInstance(0x10); - private BitField zeroHeight = BitFieldFactory.getInstance(0x20); - private BitField badFontHeight = BitFieldFactory.getInstance(0x40); - private BitField formatted = BitFieldFactory.getInstance(0x80); + private static final BitField colapsed = BitFieldFactory.getInstance(0x10); + private static final BitField zeroHeight = BitFieldFactory.getInstance(0x20); + private static final BitField badFontHeight = BitFieldFactory.getInstance(0x40); + private static final BitField formatted = BitFieldFactory.getInstance(0x80); private short field_8_xf_index; // only if isFormatted public RowRecord() @@ -433,7 +433,7 @@ public class RowRecord public short getSid() { - return this.sid; + return sid; } public int compareTo(Object obj) diff --git a/src/java/org/apache/poi/hssf/record/SCLRecord.java b/src/java/org/apache/poi/hssf/record/SCLRecord.java index f751a5046..6ffbb466f 100644 --- a/src/java/org/apache/poi/hssf/record/SCLRecord.java +++ b/src/java/org/apache/poi/hssf/record/SCLRecord.java @@ -72,11 +72,8 @@ public class SCLRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_numerator = in.readShort(); field_2_denominator = in.readShort(); - } public String toString() @@ -120,7 +117,7 @@ public class SCLRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SSTRecord.java b/src/java/org/apache/poi/hssf/record/SSTRecord.java index 6679609bd..8901480f9 100644 --- a/src/java/org/apache/poi/hssf/record/SSTRecord.java +++ b/src/java/org/apache/poi/hssf/record/SSTRecord.java @@ -22,7 +22,6 @@ import org.apache.poi.util.IntMapper; import org.apache.poi.util.LittleEndianConsts; import java.util.Iterator; -import java.util.List; /** * Title: Static String Table Record diff --git a/src/java/org/apache/poi/hssf/record/SSTSerializer.java b/src/java/org/apache/poi/hssf/record/SSTSerializer.java index b860426f7..02e5ac714 100644 --- a/src/java/org/apache/poi/hssf/record/SSTSerializer.java +++ b/src/java/org/apache/poi/hssf/record/SSTSerializer.java @@ -21,10 +21,6 @@ package org.apache.poi.hssf.record; import org.apache.poi.util.IntMapper; import org.apache.poi.util.LittleEndian; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; - /** * This class handles serialization of SST records. It utilizes the record processor * class write individual records. This has been refactored from the SSTRecord class. diff --git a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java b/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java index 95bfb1741..3500ef190 100644 --- a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java +++ b/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java @@ -112,7 +112,7 @@ public class SaveRecalcRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SelectionRecord.java b/src/java/org/apache/poi/hssf/record/SelectionRecord.java index 044de1d5e..ee31d75f6 100644 --- a/src/java/org/apache/poi/hssf/record/SelectionRecord.java +++ b/src/java/org/apache/poi/hssf/record/SelectionRecord.java @@ -246,7 +246,7 @@ public class SelectionRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java b/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java index 2755c2577..590de27e9 100644 --- a/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java +++ b/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java @@ -71,10 +71,7 @@ public class SeriesChartGroupIndexRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_chartGroupIndex = in.readShort(); - } public String toString() @@ -113,7 +110,7 @@ public class SeriesChartGroupIndexRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java b/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java index ffebafd94..bcbdbcc54 100644 --- a/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java +++ b/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java @@ -71,10 +71,7 @@ public class SeriesIndexRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_index = in.readShort(); - } public String toString() @@ -113,7 +110,7 @@ public class SeriesIndexRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java b/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java index 762175654..d7e484a3a 100644 --- a/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java +++ b/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java @@ -77,10 +77,7 @@ public class SeriesLabelsRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_formatFlags = in.readShort(); - } public String toString() @@ -125,7 +122,7 @@ public class SeriesLabelsRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SeriesListRecord.java b/src/java/org/apache/poi/hssf/record/SeriesListRecord.java index 4130fc1b8..c4afcc14c 100644 --- a/src/java/org/apache/poi/hssf/record/SeriesListRecord.java +++ b/src/java/org/apache/poi/hssf/record/SeriesListRecord.java @@ -71,10 +71,7 @@ public class SeriesListRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_seriesNumbers = in.readShortArray(); - } public String toString() @@ -112,7 +109,7 @@ public class SeriesListRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SeriesRecord.java b/src/java/org/apache/poi/hssf/record/SeriesRecord.java index 3ec97b5d7..7b279fcd7 100644 --- a/src/java/org/apache/poi/hssf/record/SeriesRecord.java +++ b/src/java/org/apache/poi/hssf/record/SeriesRecord.java @@ -88,8 +88,6 @@ public class SeriesRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_categoryDataType = in.readShort(); field_2_valuesDataType = in.readShort(); field_3_numCategories = in.readShort(); @@ -160,7 +158,7 @@ public class SeriesRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java b/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java index b861abf85..14bc266cb 100644 --- a/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java +++ b/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java @@ -74,8 +74,6 @@ public class SeriesTextRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_id = in.readShort(); field_2_textLength = in.readByte(); field_3_undocumented = in.readByte(); @@ -132,7 +130,7 @@ public class SeriesTextRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java b/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java index 84cf77aa9..437c3d929 100644 --- a/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java +++ b/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java @@ -71,10 +71,7 @@ public class SeriesToChartGroupRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_chartGroupIndex = in.readShort(); - } public String toString() @@ -113,7 +110,7 @@ public class SeriesToChartGroupRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java index 18638090e..be31e46f3 100755 --- a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java +++ b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java @@ -113,7 +113,7 @@ public class SharedFormulaRecord public short getSid() { - return this.sid; + return sid; } /** diff --git a/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java b/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java index 94c857bda..9c35c3322 100644 --- a/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java +++ b/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java @@ -80,11 +80,8 @@ public class SheetPropertiesRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_flags = in.readShort(); field_2_empty = in.readByte(); - } public String toString() @@ -133,7 +130,7 @@ public class SheetPropertiesRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/StringRecord.java b/src/java/org/apache/poi/hssf/record/StringRecord.java index 262e3fb81..33b2ba2d9 100644 --- a/src/java/org/apache/poi/hssf/record/StringRecord.java +++ b/src/java/org/apache/poi/hssf/record/StringRecord.java @@ -60,7 +60,7 @@ public class StringRecord */ protected void validateSid( short id ) { - if (id != this.sid) + if (id != sid) { throw new RecordFormatException("Not a valid StringRecord"); } @@ -95,11 +95,6 @@ public class StringRecord return true; } - private int getStringLength() - { - return field_1_string_length; - } - private int getStringByteLength() { return isUnCompressedUnicode() ? field_1_string_length * 2 : field_1_string_length; @@ -180,6 +175,7 @@ public class StringRecord { this.field_1_string_length = string.length(); this.field_3_string = string; + setCompressedFlag(StringUtil.hasMultibyte(string) ? (byte)1 : (byte)0); } diff --git a/src/java/org/apache/poi/hssf/record/StyleRecord.java b/src/java/org/apache/poi/hssf/record/StyleRecord.java index 0779e036b..b92e10a13 100644 --- a/src/java/org/apache/poi/hssf/record/StyleRecord.java +++ b/src/java/org/apache/poi/hssf/record/StyleRecord.java @@ -362,6 +362,6 @@ public class StyleRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/SupBookRecord.java b/src/java/org/apache/poi/hssf/record/SupBookRecord.java index 2a507709d..b19f25548 100644 --- a/src/java/org/apache/poi/hssf/record/SupBookRecord.java +++ b/src/java/org/apache/poi/hssf/record/SupBookRecord.java @@ -131,6 +131,6 @@ public class SupBookRecord extends Record public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/TabIdRecord.java b/src/java/org/apache/poi/hssf/record/TabIdRecord.java index 5c007fdd2..cce8e7265 100644 --- a/src/java/org/apache/poi/hssf/record/TabIdRecord.java +++ b/src/java/org/apache/poi/hssf/record/TabIdRecord.java @@ -131,6 +131,6 @@ public class TabIdRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java b/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java index b27fbf68a..ad4086b79 100644 --- a/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java +++ b/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java @@ -98,8 +98,6 @@ public class TextObjectBaseRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_options = in.readShort(); field_2_textOrientation = in.readShort(); field_3_reserved4 = in.readShort(); @@ -188,7 +186,7 @@ public class TextObjectBaseRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/TextRecord.java b/src/java/org/apache/poi/hssf/record/TextRecord.java index e15be8c34..3b75983f7 100644 --- a/src/java/org/apache/poi/hssf/record/TextRecord.java +++ b/src/java/org/apache/poi/hssf/record/TextRecord.java @@ -121,8 +121,6 @@ public class TextRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_horizontalAlignment = in.readByte(); field_2_verticalAlignment = in.readByte(); field_3_displayMode = in.readShort(); @@ -135,7 +133,6 @@ public class TextRecord field_10_indexOfColorValue = in.readShort(); field_11_options2 = in.readShort(); field_12_textRotation = in.readShort(); - } public String toString() @@ -243,7 +240,7 @@ public class TextRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/TickRecord.java b/src/java/org/apache/poi/hssf/record/TickRecord.java index 0e4b4d3f0..18d33e3ec 100644 --- a/src/java/org/apache/poi/hssf/record/TickRecord.java +++ b/src/java/org/apache/poi/hssf/record/TickRecord.java @@ -189,7 +189,7 @@ public class TickRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { @@ -370,7 +370,7 @@ public class TickRecord */ public void setZero3(short field_12_zero3) { - this.field_12_zero5 = field_12_zero5; + this.field_12_zero5 = field_12_zero3; } /** diff --git a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java b/src/java/org/apache/poi/hssf/record/TopMarginRecord.java index b4c292e17..ada1eba9d 100644 --- a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java +++ b/src/java/org/apache/poi/hssf/record/TopMarginRecord.java @@ -82,7 +82,7 @@ public class TopMarginRecord extends Record implements Margin */ public int getRecordSize() { return 4 + 8; } - public short getSid() { return this.sid; } + public short getSid() { return sid; } /** * Get the margin field for the TopMargin record. diff --git a/src/java/org/apache/poi/hssf/record/UnicodeString.java b/src/java/org/apache/poi/hssf/record/UnicodeString.java index 9121a0968..9a4068739 100644 --- a/src/java/org/apache/poi/hssf/record/UnicodeString.java +++ b/src/java/org/apache/poi/hssf/record/UnicodeString.java @@ -49,9 +49,9 @@ public class UnicodeString private String field_3_string; // = null; private List field_4_format_runs; private byte[] field_5_ext_rst; - private BitField highByte = BitFieldFactory.getInstance(0x1); - private BitField extBit = BitFieldFactory.getInstance(0x4); - private BitField richText = BitFieldFactory.getInstance(0x8); + private static final BitField highByte = BitFieldFactory.getInstance(0x1); + private static final BitField extBit = BitFieldFactory.getInstance(0x4); + private static final BitField richText = BitFieldFactory.getInstance(0x8); public static class FormatRun implements Comparable { private short character; @@ -840,7 +840,7 @@ public class UnicodeString public short getSid() { - return this.sid; + return sid; } public int compareTo(Object obj) diff --git a/src/java/org/apache/poi/hssf/record/UnitsRecord.java b/src/java/org/apache/poi/hssf/record/UnitsRecord.java index c7eeb4d35..d2eb91469 100644 --- a/src/java/org/apache/poi/hssf/record/UnitsRecord.java +++ b/src/java/org/apache/poi/hssf/record/UnitsRecord.java @@ -71,8 +71,6 @@ public class UnitsRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_units = in.readShort(); } @@ -113,7 +111,7 @@ public class UnitsRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/UnknownRecord.java b/src/java/org/apache/poi/hssf/record/UnknownRecord.java index b1ab4f41b..e61bc76e3 100644 --- a/src/java/org/apache/poi/hssf/record/UnknownRecord.java +++ b/src/java/org/apache/poi/hssf/record/UnknownRecord.java @@ -130,7 +130,7 @@ public class UnknownRecord public short getSid() { - return this.sid; + return sid; } /** diff --git a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java b/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java index a36a2de36..80de1c5e7 100644 --- a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java +++ b/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java @@ -120,6 +120,6 @@ public class UseSelFSRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/VCenterRecord.java b/src/java/org/apache/poi/hssf/record/VCenterRecord.java index 2813c277e..6f733e4b6 100644 --- a/src/java/org/apache/poi/hssf/record/VCenterRecord.java +++ b/src/java/org/apache/poi/hssf/record/VCenterRecord.java @@ -118,7 +118,7 @@ public class VCenterRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java b/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java index 353f669d9..164edb8b3 100644 --- a/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java +++ b/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java @@ -85,8 +85,6 @@ public class ValueRangeRecord protected void fillFields(RecordInputStream in) { - - int pos = 0; field_1_minimumAxisValue = in.readDouble(); field_2_maximumAxisValue = in.readDouble(); field_3_majorIncrement = in.readDouble(); @@ -161,7 +159,7 @@ public class ValueRangeRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java b/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java index b40684260..2462a4c88 100644 --- a/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java +++ b/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java @@ -55,7 +55,7 @@ public class VerticalPageBreakRecord extends PageBreakRecord { * @see org.apache.poi.hssf.record.Record#getSid() */ public short getSid() { - return PageBreakRecord.VERTICAL_SID; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java index d5fedd457..a90ff34be 100644 --- a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java +++ b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java @@ -366,7 +366,7 @@ public class WSBoolRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/WindowOneRecord.java b/src/java/org/apache/poi/hssf/record/WindowOneRecord.java index e8482d0d9..bb6b1b33a 100644 --- a/src/java/org/apache/poi/hssf/record/WindowOneRecord.java +++ b/src/java/org/apache/poi/hssf/record/WindowOneRecord.java @@ -450,6 +450,6 @@ public class WindowOneRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java index c4a93efa0..ad3a0f70b 100644 --- a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java +++ b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java @@ -119,6 +119,6 @@ public class WindowProtectRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java b/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java index 335ab1dd7..7e06ffc52 100644 --- a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java +++ b/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java @@ -563,7 +563,7 @@ public class WindowTwoRecord public short getSid() { - return this.sid; + return sid; } public Object clone() { diff --git a/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java b/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java index 797b3038e..a5dab5328 100644 --- a/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java +++ b/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java @@ -140,6 +140,6 @@ public class WriteAccessRecord public short getSid() { - return this.sid; + return sid; } } diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java index ea1585d9e..1486db41d 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java @@ -58,11 +58,11 @@ public class ColumnInfoRecordsAggregate public Object clone() { ColumnInfoRecordsAggregate rec = new ColumnInfoRecordsAggregate(); - for ( Iterator colIter = getIterator(); colIter.hasNext(); ) + for (int k = 0; k < records.size(); k++) { - //return the cloned Row Record & insert - ColumnInfoRecord col = (ColumnInfoRecord) ( (ColumnInfoRecord) colIter.next() ).clone(); - rec.insertColumn( col ); + ColumnInfoRecord ci = ( ColumnInfoRecord ) records.get(k); + ci=(ColumnInfoRecord) ci.clone(); + rec.insertColumn( ci ); } return rec; } diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java index 32faec30a..a3c62679c 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java @@ -22,8 +22,6 @@ import org.apache.poi.hssf.record.*; import java.util.Iterator; import java.util.List; -import java.util.SortedMap; -import java.util.TreeMap; /** @@ -41,144 +39,75 @@ public class ValueRecordsAggregate public final static short sid = -1000; int firstcell = -1; int lastcell = -1; - TreeMap records = null; + CellValueRecordInterface[][] records; - /** This class is used to find a row in the TreeMap. - * - * This instance of which is used by the rowHasCells method as the key. - */ - private class RowComparator implements CellValueRecordInterface, Comparable { - private int row; - - public void setRow(int row) { - this.row = row; - } - - public int compareTo(Object obj) { - CellValueRecordInterface cell = (CellValueRecordInterface) obj; - - if (row == cell.getRow()) { - return 0; - } - else if (row < cell.getRow()) { - return -1; - } - else if (row > cell.getRow()){ - return 1; - } - return -1; - } - public int getRow() { return row;} - public short getColumn() { return 0;} - public void setColumn(short col){} - public void setXFIndex(short xf){} - public short getXFIndex(){return 0;} - public boolean isBefore(CellValueRecordInterface i){ return false; } - public boolean isAfter(CellValueRecordInterface i){ return false; } - public boolean isEqual(CellValueRecordInterface i){ return false; } - public Object clone(){ return null;} - } - - /** - * Iterates the cell records that exist between the startRow and endRow (inclusive). - * - * User must ensure that hasNext & next are called insequence for correct - * operation. Could fix, but since this is only used internally to the - * ValueRecordsAggregate class there doesnt seem much point. - */ - private class RowCellIterator implements Iterator { - private int startRow; - private int endRow; - private Iterator internalIterator; - private CellValueRecordInterface atCell; - - public class RowCellComparator extends RowComparator { - public int compareTo(Object obj) { - CellValueRecordInterface cell = (CellValueRecordInterface) obj; - - if (getRow() == cell.getRow() && cell.getColumn() == 0) { - return 0; - } - else if (getRow() < cell.getRow()) { - return -1; - } - else if (getRow() > cell.getRow()){ - return 1; - } - if (cell.getColumn() > 0) - { - return -1; - } - if (cell.getColumn() < 0) - { - return 1; - } - return -1; - } - } - - private RowCellComparator rowCellCompare; - - - public RowCellIterator(int startRow, int endRow) { - this.startRow = startRow; - this.endRow = endRow; - rowCellCompare = new RowCellComparator(); - rowCellCompare.setRow(startRow); - } - - public boolean hasNext() { - if (internalIterator == null) { - internalIterator = records.tailMap(rowCellCompare).values().iterator(); - } - if (internalIterator.hasNext()) { - atCell = (CellValueRecordInterface) internalIterator.next(); - return (atCell.getRow() <= endRow); - } else return false; - } - - public Object next() { - return atCell; - } - - public void remove() { - //Do Nothing (Not called) - } - } - - //Only need a single instance of this class, but the row fields - //will probably change each use. Instance is only used in the rowHasCells method. - public final RowComparator compareRow = new RowComparator(); - /** Creates a new instance of ValueRecordsAggregate */ public ValueRecordsAggregate() { - records = new TreeMap(); + records = new CellValueRecordInterface[30][]; // We start with 30 Rows. } - public void insertCell(CellValueRecordInterface cell) - { - Object o = records.put(cell, cell); - - if ((cell.getColumn() < firstcell) || (firstcell == -1)) - { - firstcell = cell.getColumn(); - } - if ((cell.getColumn() > lastcell) || (lastcell == -1)) - { - lastcell = cell.getColumn(); - } + public void insertCell(CellValueRecordInterface cell) { + short column = cell.getColumn(); + int row = cell.getRow(); + if (row >= records.length) { + CellValueRecordInterface[][] oldRecords = records; + int newSize = oldRecords.length * 2; + if(newSize= rowCells.length) { + CellValueRecordInterface[] oldRowCells = rowCells; + int newSize = oldRowCells.length * 2; + if(newSize257) newSize=257; // activate? + rowCells = new CellValueRecordInterface[newSize]; + System.arraycopy(oldRowCells, 0, rowCells, 0, oldRowCells.length); + records[row] = rowCells; + } + rowCells[column] = cell; + + if ((column < firstcell) || (firstcell == -1)) { + firstcell = column; + } + if ((column > lastcell) || (lastcell == -1)) { + lastcell = column; + } + } public void removeCell(CellValueRecordInterface cell) { - records.remove(cell); + if (cell != null) { + short column = cell.getColumn(); + int row = cell.getRow(); + if(row>=records.length) return; + CellValueRecordInterface[] rowCells=records[row]; + if(rowCells==null) return; + if(column>=rowCells.length) return; + rowCells[column]=null; + } } public int getPhysicalNumberOfCells() { - return records.size(); + int count=0; + for(int r=0;r=cells.length) { - row.setFirstCol(cell.getCellNum()); + HSSFCell[] oldCells=cells; + int newSize=oldCells.length*2; + if(newSize row.getLastCol()) + cells[column]=cell; + + if (column < row.getFirstCol()) { - row.setLastCol(cell.getCellNum()); + row.setFirstCol(column); + } + if (column > row.getLastCol()) + { + row.setLastCol(column); } } @@ -261,17 +268,8 @@ public class HSSFRow public HSSFCell getCell(short cellnum) { - -/* for (int k = 0; k < cells.size(); k++) - { - HSSFCell cell = ( HSSFCell ) cells.get(k); - - if (cell.getCellNum() == cellnum) - { - return cell; - } - }*/ - return (HSSFCell) cells.get(new Integer(cellnum)); + if(cellnum<0||cellnum>=cells.length) return null; + return cells[cellnum]; } /** @@ -309,11 +307,12 @@ public class HSSFRow public int getPhysicalNumberOfCells() { - if (cells == null) - { - return 0; // shouldn't be possible but it is due to missing API support for BLANK/MULBLANK - } - return cells.size(); + int count=0; + for(int i=0;i