diff --git a/src/java/org/apache/poi/ddf/EscherOptRecord.java b/src/java/org/apache/poi/ddf/EscherOptRecord.java index 33c894cab..e83b324ad 100644 --- a/src/java/org/apache/poi/ddf/EscherOptRecord.java +++ b/src/java/org/apache/poi/ddf/EscherOptRecord.java @@ -16,6 +16,8 @@ ==================================================================== */ package org.apache.poi.ddf; +import org.apache.poi.util.Internal; + /** * The opt record is used to store property values for a shape. It is the key to * determining the attributes of a shape. Properties can be of two types: simple @@ -39,7 +41,7 @@ public class EscherOptRecord extends AbstractEscherOptRecord /** * Automatically recalculate the correct option */ - @Deprecated + @Internal public short getOptions() { // update values diff --git a/src/java/org/apache/poi/ddf/EscherPictBlip.java b/src/java/org/apache/poi/ddf/EscherPictBlip.java index 978ff777e..9b93b08b9 100644 --- a/src/java/org/apache/poi/ddf/EscherPictBlip.java +++ b/src/java/org/apache/poi/ddf/EscherPictBlip.java @@ -95,7 +95,7 @@ public final class EscherPictBlip extends EscherBlipRecord { int pos = offset; LittleEndian.putShort( data, pos, getOptions() ); pos += 2; LittleEndian.putShort( data, pos, getRecordId() ); pos += 2; - LittleEndian.putInt( data, getRecordSize() - HEADER_SIZE ); pos += 4; + LittleEndian.putInt( data, 0, getRecordSize() - HEADER_SIZE ); pos += 4; System.arraycopy( field_1_UID, 0, data, pos, 16 ); pos += 16; LittleEndian.putInt( data, pos, field_2_cb ); pos += 4; diff --git a/src/java/org/apache/poi/ddf/EscherRecord.java b/src/java/org/apache/poi/ddf/EscherRecord.java index 1055875e9..0eb5a31d4 100644 --- a/src/java/org/apache/poi/ddf/EscherRecord.java +++ b/src/java/org/apache/poi/ddf/EscherRecord.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.poi.util.BitField; import org.apache.poi.util.BitFieldFactory; +import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; /** @@ -107,11 +108,13 @@ public abstract class EscherRecord { } /** + *
options is an internal field. Use {@link #setInstance(short)} ()} and + * {@link #setVersion(short)} ()} to set the actual fields. + *
* @return The options field for this record. All records have one. - * @deprecated Options is an internal field. Use {@link #getInstance()} and - * {@link #getVersion()} to access actual fields. */ - @Deprecated + @Internal public short getOptions() { return _options; @@ -120,10 +123,13 @@ public abstract class EscherRecord { /** * Set the options this this record. Container records should have the * last nibble set to 0xF. - * @deprecated Options is an internal field. Use {@link #getInstance()} and + * + *options is an internal field. Use {@link #getInstance()} and * {@link #getVersion()} to access actual fields. + *
*/ - @Deprecated + @Internal public void setOptions( short options ) { // call to handle correct/incorrect values setVersion( fVersion.getShortValue( options ) ); diff --git a/src/java/org/apache/poi/hpsf/PropertySet.java b/src/java/org/apache/poi/hpsf/PropertySet.java index 7ba86555c..a3ca1d036 100644 --- a/src/java/org/apache/poi/hpsf/PropertySet.java +++ b/src/java/org/apache/poi/hpsf/PropertySet.java @@ -369,13 +369,13 @@ public class PropertySet final int byteOrder = LittleEndian.getUShort(src, o); o += LittleEndian.SHORT_SIZE; byte[] temp = new byte[LittleEndian.SHORT_SIZE]; - LittleEndian.putShort(temp, (short) byteOrder); + LittleEndian.putShort(temp, 0, (short) byteOrder); if (!Util.equal(temp, BYTE_ORDER_ASSERTION)) return false; final int format = LittleEndian.getUShort(src, o); o += LittleEndian.SHORT_SIZE; temp = new byte[LittleEndian.SHORT_SIZE]; - LittleEndian.putShort(temp, (short) format); + LittleEndian.putShort(temp, 0, (short) format); if (!Util.equal(temp, FORMAT_ASSERTION)) return false; // final long osVersion = LittleEndian.getUInt(src, offset); diff --git a/src/java/org/apache/poi/hpsf/Vector.java b/src/java/org/apache/poi/hpsf/Vector.java index 145a660cd..a1ddb0812 100644 --- a/src/java/org/apache/poi/hpsf/Vector.java +++ b/src/java/org/apache/poi/hpsf/Vector.java @@ -16,7 +16,6 @@ ==================================================================== */ package org.apache.poi.hpsf; -import org.apache.poi.util.HexDump; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; diff --git a/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java b/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java index 32f904963..2c9a06289 100644 --- a/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java +++ b/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java @@ -18,7 +18,6 @@ package org.apache.poi.hpsf.extractor; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Iterator; diff --git a/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java b/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java index a4ff61612..aef71dc54 100644 --- a/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java +++ b/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java @@ -87,6 +87,8 @@ public class EventBasedExcelExtractor extends POIOLE2TextExtractor { /** * Return the underlying POIFS FileSystem of * this document. + * + * @deprecated Use {@link #getRoot()} instead */ public POIFSFileSystem getFileSystem() { return _dir.getFileSystem(); diff --git a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java index c1ec938cf..3f421d99b 100644 --- a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java +++ b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java @@ -89,7 +89,6 @@ import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalName; import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalSheet; import org.apache.poi.ss.usermodel.BuiltinFormats; -import org.apache.poi.ss.util.WorkbookUtil; import org.apache.poi.util.Internal; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; diff --git a/src/java/org/apache/poi/hssf/record/DConRefRecord.java b/src/java/org/apache/poi/hssf/record/DConRefRecord.java index 08ba314ed..ed3581635 100755 --- a/src/java/org/apache/poi/hssf/record/DConRefRecord.java +++ b/src/java/org/apache/poi/hssf/record/DConRefRecord.java @@ -18,7 +18,7 @@ */ package org.apache.poi.hssf.record; -import java.util.Arrays; +import org.apache.poi.util.ArrayUtil; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianOutput; @@ -273,7 +273,7 @@ public class DConRefRecord extends StandardRecord */ public byte[] getPath() { - return Arrays.copyOf(path, path.length); + return ArrayUtil.copyOf(path, path.length); } /** @@ -291,7 +291,7 @@ public class DConRefRecord extends StandardRecord { offset++; } - String out = new String(Arrays.copyOfRange(path, offset, path.length)); + String out = new String(ArrayUtil.copyOfRange(path, offset, path.length)); //UNC paths have \u0003 chars as path separators. out = out.replaceAll("\u0003", "/"); return out; diff --git a/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java b/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java index 96457b99c..3eb602463 100644 --- a/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java +++ b/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java @@ -17,7 +17,6 @@ package org.apache.poi.hssf.record; -import org.apache.poi.hssf.record.aggregates.PageSettingsBlock; import org.apache.poi.util.HexDump; import org.apache.poi.util.LittleEndianOutput; diff --git a/src/java/org/apache/poi/hssf/record/UserSViewBegin.java b/src/java/org/apache/poi/hssf/record/UserSViewBegin.java index 7b632a02e..92aaf8a13 100644 --- a/src/java/org/apache/poi/hssf/record/UserSViewBegin.java +++ b/src/java/org/apache/poi/hssf/record/UserSViewBegin.java @@ -17,11 +17,9 @@ package org.apache.poi.hssf.record; -import org.apache.poi.hssf.record.aggregates.PageSettingsBlock; import org.apache.poi.util.HexDump; import org.apache.poi.util.LittleEndianOutput; -import java.util.Arrays; /** * The UserSViewBegin record specifies settings for a custom view associated with the sheet. diff --git a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java b/src/java/org/apache/poi/hssf/record/UserSViewEnd.java index 02f72acf1..2427729e3 100644 --- a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java +++ b/src/java/org/apache/poi/hssf/record/UserSViewEnd.java @@ -17,12 +17,9 @@ package org.apache.poi.hssf.record; -import org.apache.poi.hssf.record.aggregates.PageSettingsBlock; import org.apache.poi.util.HexDump; import org.apache.poi.util.LittleEndianOutput; -import java.util.Arrays; - /** * The UserSViewEnd record marks the end of the settings for a custom view associated with the sheet * diff --git a/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java b/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java index 17cb84d55..676a8f983 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java @@ -18,7 +18,6 @@ package org.apache.poi.hssf.record.aggregates; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Arrays; diff --git a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java b/src/java/org/apache/poi/hssf/record/common/UnicodeString.java index bd9ecbac7..3ee5e4e66 100644 --- a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java +++ b/src/java/org/apache/poi/hssf/record/common/UnicodeString.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.poi.hssf.record.cont.ContinuableRecordInput; import org.apache.poi.hssf.record.RecordInputStream; import org.apache.poi.hssf.record.cont.ContinuableRecordOutput; -import org.apache.poi.poifs.dev.POIFSLister; import org.apache.poi.util.*; /** diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java b/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java index 80fb4ef99..46403fc36 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java @@ -21,7 +21,6 @@ import org.apache.poi.hssf.record.aggregates.CFRecordsAggregate; import org.apache.poi.ss.usermodel.ConditionalFormatting; import org.apache.poi.ss.usermodel.ConditionalFormattingRule; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.ss.util.Region; /** * HSSFConditionalFormatting class encapsulates all settings of Conditional Formatting. @@ -99,10 +98,10 @@ public final class HSSFConditionalFormatting implements ConditionalFormatting /** * @deprecated (Aug-2008) use {@link HSSFConditionalFormatting#getFormattingRanges()} */ - public Region[] getFormattingRegions() + public org.apache.poi.ss.util.Region[] getFormattingRegions() { CellRangeAddress[] cellRanges = getFormattingRanges(); - return Region.convertCellRangesToRegions(cellRanges); + return org.apache.poi.ss.util.Region.convertCellRangesToRegions(cellRanges); } /** * @return array of CellRangeAddresss. nevernull
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java b/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
index e2a87a463..26800d6d3 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
@@ -26,7 +26,6 @@ package org.apache.poi.hssf.usermodel;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
import java.util.Vector;
import org.apache.poi.hssf.model.InternalWorkbook;
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
index e89579fdb..d4a7205c7 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
@@ -24,8 +24,6 @@ import org.apache.poi.ddf.EscherBSERecord;
import org.apache.poi.ddf.EscherBlipRecord;
import org.apache.poi.ss.usermodel.Picture;
import org.apache.poi.ss.util.ImageUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
import org.apache.poi.hssf.model.InternalWorkbook;
/**
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index 48e87b85a..fe332eb83 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -35,7 +35,6 @@ import org.apache.poi.ss.formula.FormulaShifter;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.hssf.util.PaneInformation;
-import org.apache.poi.hssf.util.Region;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.formula.FormulaType;
import org.apache.poi.ss.usermodel.Cell;
@@ -765,10 +764,10 @@ public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
/**
* @deprecated (Aug-2008) use {@link HSSFSheet#getMergedRegion(int)}
*/
- public Region getMergedRegionAt(int index) {
+ public org.apache.poi.hssf.util.Region getMergedRegionAt(int index) {
CellRangeAddress cra = getMergedRegion(index);
- return new Region(cra.getFirstRow(), (short)cra.getFirstColumn(),
+ return new org.apache.poi.hssf.util.Region(cra.getFirstRow(), (short)cra.getFirstColumn(),
cra.getLastRow(), (short)cra.getLastColumn());
}
/**
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
index b75f0a620..0101eef7b 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
@@ -23,7 +23,6 @@ import org.apache.poi.hssf.record.aggregates.ConditionalFormattingTable;
import org.apache.poi.ss.usermodel.ConditionalFormatting;
import org.apache.poi.ss.usermodel.ConditionalFormattingRule;
import org.apache.poi.ss.usermodel.SheetConditionalFormatting;
-import org.apache.poi.ss.util.Region;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.SpreadsheetVersion;
@@ -122,8 +121,8 @@ public final class HSSFSheetConditionalFormatting implements SheetConditionalFor
/**
* @deprecated use CellRangeAddress instead of Region
*/
- public int addConditionalFormatting(Region[] regions, HSSFConditionalFormattingRule[] cfRules) {
- return addConditionalFormatting(Region.convertRegionsToCellRanges(regions), cfRules);
+ public int addConditionalFormatting(org.apache.poi.ss.util.Region[] regions, HSSFConditionalFormattingRule[] cfRules) {
+ return addConditionalFormatting(org.apache.poi.ss.util.Region.convertRegionsToCellRanges(regions), cfRules);
}
/**
* Allows to add a new Conditional Formatting set to the sheet.
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index e52fecc27..afd0bce10 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
@@ -51,9 +51,7 @@ import org.apache.poi.ss.formula.FormulaType;
import org.apache.poi.ss.formula.SheetNameFormatter;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.OperandPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
import org.apache.poi.ss.formula.ptg.UnionPtg;
import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
import org.apache.poi.ss.formula.udf.UDFFinder;
diff --git a/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java b/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
index f3ce0689b..3e491e7e8 100644
--- a/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
+++ b/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
@@ -21,7 +21,6 @@ import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.util.RegionUtil;
import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.Region;
/**
* Various utility functions that make working with a region of cells easier.
@@ -34,8 +33,11 @@ public final class HSSFRegionUtil {
// no instances of this class
}
- private static CellRangeAddress toCRA(Region region) {
- return Region.convertToCellRangeAddress(region);
+ /**
+ * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of {@link Region}
+ */
+ private static CellRangeAddress toCRA(org.apache.poi.ss.util.Region region) {
+ return org.apache.poi.ss.util.Region.convertToCellRangeAddress(region);
}
/**
diff --git a/src/java/org/apache/poi/hssf/util/Region.java b/src/java/org/apache/poi/hssf/util/Region.java
index 25a67db21..4e417b567 100644
--- a/src/java/org/apache/poi/hssf/util/Region.java
+++ b/src/java/org/apache/poi/hssf/util/Region.java
@@ -24,6 +24,7 @@ package org.apache.poi.hssf.util;
* to represent a string of characters. Its really only useful for HSSF though.
*
* @author Andrew C. Oliver acoliver at apache dot org
+ * @deprecated (Aug-2008) use {@link org.apache.poi.ss.util.CellRangeAddress}
*/
public class Region extends org.apache.poi.ss.util.Region
diff --git a/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java b/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java
index 1ef66d5e7..fbc58ab0c 100644
--- a/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java
+++ b/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java
@@ -138,7 +138,7 @@ public class Ole10Native {
ofs += len;
flags2 = LittleEndian.getShort(data, ofs);
ofs += LittleEndianConsts.SHORT_SIZE;
- len = LittleEndian.getUnsignedByte(data, ofs);
+ len = LittleEndian.getUByte(data, ofs);
unknown1 = new byte[len];
ofs += len;
len = 3;
diff --git a/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java b/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java
index e7762ffbf..8c726caa0 100644
--- a/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java
+++ b/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
/**
* Storage for documents that are too small to use regular
diff --git a/src/java/org/apache/poi/ss/formula/LazyAreaEval.java b/src/java/org/apache/poi/ss/formula/LazyAreaEval.java
index 1ba1e1a3f..76f926879 100644
--- a/src/java/org/apache/poi/ss/formula/LazyAreaEval.java
+++ b/src/java/org/apache/poi/ss/formula/LazyAreaEval.java
@@ -22,9 +22,6 @@ import org.apache.poi.ss.formula.ptg.AreaI.OffsetArea;
import org.apache.poi.ss.formula.eval.AreaEval;
import org.apache.poi.ss.formula.eval.AreaEvalBase;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.util.CellReference;
/**
diff --git a/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java b/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
index 32ac41712..51fda2648 100644
--- a/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
+++ b/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
@@ -16,8 +16,6 @@ import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.function.FunctionMetadata;
import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.functions.Function;
-import org.apache.poi.ss.formula.functions.NotImplementedFunction;
import org.apache.poi.ss.formula.functions.Sumifs;
import org.apache.poi.ss.formula.udf.UDFFinder;
diff --git a/src/java/org/apache/poi/ss/formula/atp/YearFrac.java b/src/java/org/apache/poi/ss/formula/atp/YearFrac.java
index 611ace957..1f0ca6d8a 100644
--- a/src/java/org/apache/poi/ss/formula/atp/YearFrac.java
+++ b/src/java/org/apache/poi/ss/formula/atp/YearFrac.java
@@ -18,8 +18,6 @@
package org.apache.poi.ss.formula.atp;
import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.regex.Pattern;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
diff --git a/src/java/org/apache/poi/ss/formula/functions/Npv.java b/src/java/org/apache/poi/ss/formula/functions/Npv.java
index 4609094ff..760120f49 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Npv.java
+++ b/src/java/org/apache/poi/ss/formula/functions/Npv.java
@@ -17,14 +17,11 @@
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import java.util.Arrays;
-
/**
* Calculates the net present value of an investment by using a discount rate
* and a series of future payments (negative values) and income (positive
diff --git a/src/java/org/apache/poi/ss/usermodel/Chart.java b/src/java/org/apache/poi/ss/usermodel/Chart.java
index b14d95d10..f8a55a28e 100644
--- a/src/java/org/apache/poi/ss/usermodel/Chart.java
+++ b/src/java/org/apache/poi/ss/usermodel/Chart.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.poi.ss.usermodel.charts.ChartData;
import org.apache.poi.ss.usermodel.charts.ChartAxis;
import org.apache.poi.ss.usermodel.charts.ChartLegend;
-import org.apache.poi.ss.usermodel.charts.ManualLayout;
import org.apache.poi.ss.usermodel.charts.ManuallyPositionable;
import org.apache.poi.ss.usermodel.charts.ChartDataFactory;
import org.apache.poi.ss.usermodel.charts.ChartAxisFactory;
diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java b/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
index 674c0470b..3344963bb 100644
--- a/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
+++ b/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
@@ -19,7 +19,6 @@
package org.apache.poi.ss.usermodel;
-import org.apache.poi.hssf.usermodel.HSSFConditionalFormattingRule;
import org.apache.poi.ss.util.CellRangeAddress;
/**
diff --git a/src/java/org/apache/poi/ss/usermodel/charts/ChartAxisFactory.java b/src/java/org/apache/poi/ss/usermodel/charts/ChartAxisFactory.java
index bd037f500..8bf32b2b8 100644
--- a/src/java/org/apache/poi/ss/usermodel/charts/ChartAxisFactory.java
+++ b/src/java/org/apache/poi/ss/usermodel/charts/ChartAxisFactory.java
@@ -17,7 +17,6 @@
package org.apache.poi.ss.usermodel.charts;
-import org.apache.poi.ss.usermodel.Chart;
import org.apache.poi.util.Beta;
/**
diff --git a/src/java/org/apache/poi/util/ArrayUtil.java b/src/java/org/apache/poi/util/ArrayUtil.java
index e5c674476..3461ee715 100644
--- a/src/java/org/apache/poi/util/ArrayUtil.java
+++ b/src/java/org/apache/poi/util/ArrayUtil.java
@@ -128,4 +128,44 @@ public class ArrayUtil
Math.min( source.length, newLength ) );
return result;
}
+
+ /**
+ * Copies the specified range of the specified array into a new array.
+ * The initial index of the range (from) must lie between zero
+ * and original.length, inclusive. The value at
+ * original[from] is placed into the initial element of the copy
+ * (unless from == original.length or from == to).
+ * Values from subsequent elements in the original array are placed into
+ * subsequent elements in the copy. The final index of the range
+ * (to), which must be greater than or equal to from,
+ * may be greater than original.length, in which case
+ * (byte)0 is placed in all elements of the copy whose index is
+ * greater than or equal to original.length - from. The length
+ * of the returned array will be to - from.
+ *
+ * This method is temporary
+ * replace for Arrays.copyOfRange() until we start to require JDK 1.6.
+ *
+ * @param original the array from which a range is to be copied
+ * @param from the initial index of the range to be copied, inclusive
+ * @param to the final index of the range to be copied, exclusive.
+ * (This index may lie outside the array.)
+ * @return a new array containing the specified range from the original array,
+ * truncated or padded with zeros to obtain the required length
+ * @throws ArrayIndexOutOfBoundsException if from < 0
+ * or from > original.length()
+ * @throws IllegalArgumentException if from > to
+ * @throws NullPointerException if original is null
+ * @since 1.6
+ */
+ public static byte[] copyOfRange(byte[] original, int from, int to) {
+ int newLength = to - from;
+ if (newLength < 0)
+ throw new IllegalArgumentException(from + " > " + to);
+ byte[] copy = new byte[newLength];
+ System.arraycopy(original, from, copy, 0,
+ Math.min(original.length - from, newLength));
+ return copy;
+ }
+
}
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherProperty.java b/src/testcases/org/apache/poi/ddf/TestEscherProperty.java
index faa7604c3..c7d704ff1 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherProperty.java
+++ b/src/testcases/org/apache/poi/ddf/TestEscherProperty.java
@@ -19,11 +19,6 @@ package org.apache.poi.ddf;
import junit.framework.TestCase;
-import java.util.List;
-import java.lang.reflect.Field;
-
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.HexDump;
/**
* @author Yegor Kozlov
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java b/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
index 5c1549729..5652f45e1 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
@@ -19,28 +19,11 @@ package org.apache.poi.hpsf.basic;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
import java.util.Date;
-import java.util.List;
-import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.HPSFException;
-import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.Section;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.POIDataSamples;
/**
* Tests various bugs have been fixed
diff --git a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java b/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
index f053ba14b..d62a80d72 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
@@ -30,7 +30,6 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.record.*;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.TestHSSFWorkbook;
import org.apache.poi.ss.formula.ptg.NameXPtg;
/**
diff --git a/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java b/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
index d8aa165f5..14b4fbfc1 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
@@ -29,7 +29,6 @@ import org.apache.poi.ss.formula.udf.DefaultUDFFinder;
import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
import org.apache.poi.ss.formula.OperationEvaluationContext;
/**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java b/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
index e4354082c..13f854dbd 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
@@ -18,16 +18,6 @@
package org.apache.poi.hssf.record;
import junit.framework.TestCase;
-import org.apache.poi.ddf.EscherClientDataRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hssf.model.DrawingManager2;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-import java.util.ArrayList;
-import java.util.List;
import java.util.Arrays;
/**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java b/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
index 82074549e..9518f3fff 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
@@ -23,12 +23,8 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Arrays;
import junit.framework.TestCase;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.apache.poi.util.ArrayUtil;
import org.apache.poi.util.LittleEndianOutputStream;
-//import static org.junit.Assert.assertArrayEquals;
-//import org.junit.Test;
-import junit.framework.Assert;
/**
* Unit tests for DConRefRecord class.
@@ -292,7 +288,7 @@ public class TestDConRefRecord extends TestCase
public void testGetPath()
{
DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
- byte[] expResult = Arrays.copyOfRange(data1, 9, data1.length);
+ byte[] expResult = ArrayUtil.copyOfRange(data1, 9, data1.length);
byte[] result = instance.getPath();
assertTrue("get path", Arrays.equals(expResult, result));
}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java b/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
index 0ca4fddf7..28bfb3509 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
@@ -21,7 +21,6 @@ import org.apache.poi.hssf.usermodel.HSSFName;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.ptg.ArrayPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
import junit.framework.AssertionFailedError;
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
index a8240995e..5fd20be33 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
@@ -54,6 +54,7 @@ public final class TestValueRecordsAggregate extends TestCase {
* Make sure the shared formula DOESNT makes it to the FormulaRecordAggregate when being parsed
* as part of the value records
*/
+ @SuppressWarnings("deprecation") // uses deprecated {@link ValueRecordsAggregate#getValueRecords()}
public void testSharedFormula() {
List