optimized unused imports and removed deprecation warnings in poi-main

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

diff --git a/src/java/org/apache/poi/ddf/EscherOptRecord.java b/src/java/org/apache/poi/ddf/EscherOptRecord.java
index 33c894cab9ff4abea32517e1bb89df7417edd87c..e83b324adfcf1783d3db02920bd2e76d511a506b 100644 (file)
--- 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 978ff777e4575675e763a846a13e8c45bd337caf..9b93b08b9d796fd3892a38e47eac4d8dcc5aed54 100644 (file)
--- 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 1055875e9f8fa2d9a0eb55a6f10b2d48d26a6d73..0eb5a31d49f81db8b694a83a971605580ce2aa5f 100644 (file)
--- 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 {
     }
 
     /**
+     * <p
+     * Note that <code>options</code> is an internal field. Use {@link #setInstance(short)} ()} and
+     *             {@link #setVersion(short)} ()} to set the actual fields.
+     * </p>
      * @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
+     *
+     * <p
+     * Note that <code>options</code> is an internal field. Use {@link #getInstance()} and
      *             {@link #getVersion()} to access actual fields.
+     * </p>
      */
-    @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 7ba86555cd164b583dbe19f3d7debf6d067f8250..a3ca1d0360809635e0dd065d5321f11b3b6835c5 100644 (file)
--- 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 145a660cdb93887edb5089625ed639116b44c3c2..a1ddb0812ebe4f0177770f1f1f45546d9e9a267d 100644 (file)
--- 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 32f9049639a163066ffc303f21507040bc60e5eb..2c9a0628921bcb0993802e8e63122f096b294b86 100644 (file)
--- 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 a4ff616125526aed8cfd58b533c98afcc9428d15..aef71dc5481423f77d3b9595a56924fe84f38d51 100644 (file)
--- 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 c1ec938cf37efd083ad68f7c2e180c8f41c80af2..3f421d99b65955e4b79a815a73bccd02c20888bb 100644 (file)
--- 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 08ba314edba3d4fb4814525a37b849e54411866f..ed35816353f44126e7ff4982e458c0c570d37a91 100755 (executable)
--- 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 96457b99cd6f6626230acbbb3ba3b823ff153031..3eb602463f17f6f154e28eab544ef299850d5969 100644 (file)
--- 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 7b632a02e56f03abd4ff7e51b87ef03a4104ac8e..92aaf8a131e16df667334f057143673245ccd8fe 100644 (file)
--- 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 02f72acf18b871d50903a658f0f17628d93b11e6..2427729e32653da15b0fd9d81f97a5e72c86be55 100644 (file)
--- 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 17cb84d55dffa1d1084e16807508b12f3b0f8ee8..676a8f983133560250c356cb8f01218a4ff6b6c1 100644 (file)
--- 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 bd9ecbac7b443a6097b77223826d017c21f8edfc..3ee5e4e66cf4ad211ee0ad94026c1c3b71832ec3 100644 (file)
--- 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 80fb4ef99f73701d2348c7a490794e501e9ea53b..46403fc369c4c03715d3c4d7d8310260b0f91d4e 100644 (file)
--- 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 <tt>CellRangeAddress</tt>s. never <code>null</code> 

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java b/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
index e2a87a4639b374e2dc897e998d0e44aab9e13513..26800d6d3e0d2cfef477903896baab007241cef4 100644 (file)
--- 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 e89579fdbd4c5556fe429497f4cf594bffbd0d41..d4a7205c73099460d814cd3493cb8a84b0e63e66 100644 (file)
--- 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 48e87b85a83d1d7b147f8d60115eba0b62d58394..fe332eb83e5b0766f3caf14e710d7be0884423ec 100644 (file)
--- 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 b75f0a620f16d01a24c232dbae223193189dd7c0..0101eef7b32b6b2c34d3349d6422542322506cac 100644 (file)
--- 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 <tt>CellRangeAddress</tt> instead of <tt>Region</tt>
         */
-       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 e52fecc279f1303c1d7821d9f8cb058d1d987617..afd0bce10fba20367e99f296c50ced545e62d994 100644 (file)
--- 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 f3ce0689b44e6adc28fc85dfd7a51756f6993a63..3e491e7e8e9d222b57201387b746fdf381d61363 100644 (file)
--- 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 25a67db211db9abd9dd050cce3e76111ea6ffa56..4e417b5672e051b20c85b5a050d6b8f0923dafd3 100644 (file)
--- 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 1ef66d5e7c5c82b9eeef6dfe019e100cb9ffe6f1..fbc58ab0c44381580f71eae2118b53948dcb3b79 100644 (file)
--- 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;\r
       flags2 = LittleEndian.getShort(data, ofs);\r
       ofs += LittleEndianConsts.SHORT_SIZE;\r
-      len = LittleEndian.getUnsignedByte(data, ofs);\r
+      len = LittleEndian.getUByte(data, ofs);\r
       unknown1 = new byte[len];\r
       ofs += len;\r
       len = 3;\r

diff --git a/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java b/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java
index e7762ffbf6a2635f3037c3e1782e463b71577d17..8c726caa0aacb9f7c3dd0747ab3b3291f43a18ef 100644 (file)
--- 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 1ba1e1a3f20fc5f061f791bf62e83858c24a6f31..76f926879fa277861939f4c284417c7e74c11dd7 100644 (file)
--- 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 32ac41712835a0cee47bc47f4b5cd73146121fe9..51fda2648bfb9f0469549e15d46588a66c167db6 100644 (file)
--- 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 611ace95746fb746ce94bfa3d5a9850404f2951c..1f0ca6d8a3d5ff41c2f89260afcdea7278922292 100644 (file)
--- 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 4609094ffe264f32e2fac749f54dd69870a783b5..760120f49b56fd026c1e9c6670aaca89d69ef70b 100644 (file)
--- 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 b14d95d10f953bc056e6531686a4ba916408f788..f8a55a28e301a034af4c5b9a83b24a08ee7005d3 100644 (file)
--- 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 674c0470beabb87e0c1818783f8621f8c42902f4..3344963bb6bce46065064ee51a959e59d408bf7e 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
+++ b/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
@@ -19,7 +19,6 @@
 \r
 package org.apache.poi.ss.usermodel;\r
 \r
-import org.apache.poi.hssf.usermodel.HSSFConditionalFormattingRule;\r
 import org.apache.poi.ss.util.CellRangeAddress;\r
 \r
 /**\r

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 bd037f500ff457a5a88e089bff41964b12428f51..8bf32b2b8cfb6f22fd30fde3b47dcc14842defc2 100644 (file)
--- 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 e5c6744764a5bf4cee3b116a07ac7d955ce2fb39..3461ee71527cfd4c377a394fe662c464572f127c 100644 (file)
--- 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 (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>(byte)0</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     *
+     * 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 <tt>from &lt; 0</tt>
+     *     or <tt>from &gt; original.length()</tt>
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> 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 faa7604c3e2d5e38569749e8c8f70e828da737ad..c7d704ff149d6cfb78368071ac25e21fbc92aa73 100644 (file)
--- 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 5c154972991105bf73753fea93729238227026b3..5652f45e14087616cc389ada25992dcd88760693 100644 (file)
--- 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 f053ba14b60437bed707494b8427db0e27cd2554..d62a80d72b3ddfca32405801779ab8866ee4c046 100644 (file)
--- 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 d8aa165f5c79f515e830cc5b2082c441df613648..14b4fbfc1dd49a037c43e19a64944a032e239564 100644 (file)
--- 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 e4354082c96aeb278a2b371c416c43cf1eb222fc..13f854dbda675dc96dc7a42cae05a7f1f7cfd26f 100644 (file)
--- 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 82074549ecd7628ccbd74a46262827a8aa6cd39a..9518f3fff2fb5955f298789a467cc3f839614071 100644 (file)
--- 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 0ca4fddf705ec4f1f87c7e9b5f885d9db3ce1a1c..28bfb350990f9752ce78399854b6785951736c17 100644 (file)
--- 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 a8240995ea48c60e603d565fc7d1b7748513dd44..5fd20be332b71dff63cafe0b74632b2754578550 100644 (file)
--- 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<Record> records = new ArrayList<Record>();
                records.add(new FormulaRecord());
@@ -94,6 +95,7 @@ public final class TestValueRecordsAggregate extends TestCase {
                return records;
        }
 
+    @SuppressWarnings("deprecation") // uses deprecated {@link ValueRecordsAggregate#getValueRecords()}
        public void testInsertCell() {
                CellValueRecordInterface[] cvrs = valueRecord.getValueRecords();
                assertEquals(0, cvrs.length);
@@ -104,6 +106,7 @@ public final class TestValueRecordsAggregate extends TestCase {
                assertEquals(1, cvrs.length);
        }
 
+    @SuppressWarnings("deprecation") // uses deprecated {@link ValueRecordsAggregate#getValueRecords()}
        public void testRemoveCell() {
                BlankRecord blankRecord1 = newBlankRecord();
                valueRecord.insertCell( blankRecord1 );

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
index 6f1fdcde2e49b5538cc27bfb7f623573a2f51132..111130e29ded1a5ef0289965a5334e93448600e4 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -1037,6 +1037,7 @@ public final class TestBugs extends BaseTestBugzillaIssues {
         confirmCachedValue("70164", nc2);
         confirmCachedValue("90210", nc3);
 
+        @SuppressWarnings("deprecation")
         CellValueRecordInterface[] cvrs = ns.getSheet().getValueRecords();
         for (int i = 0; i < cvrs.length; i++) {
             CellValueRecordInterface cvr = cvrs[i];

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java b/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
index a24013f84992a5bebfbd71fa60d351d1163f5c9b..b0e03cb71d124079ee477f0a2c61a7af38dd1b2f 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
@@ -26,7 +26,6 @@ import java.io.InputStream;
 import java.io.PrintStream;
 
 import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
 
 import org.apache.poi.hssf.HSSFITestDataProvider;
 import org.apache.poi.hssf.HSSFTestDataSamples;
@@ -34,10 +33,8 @@ import org.apache.poi.hssf.eventmodel.ERFListener;
 import org.apache.poi.hssf.eventmodel.EventRecordFactory;
 import org.apache.poi.hssf.record.DVRecord;
 import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
 
 /**

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
index 54951997701433683209e753af0cf44dca953944..943ebd004ea5e5d7c56371bc7d625ee55db06932 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
@@ -17,14 +17,9 @@
 
 package org.apache.poi.hssf.usermodel;
 
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
 
 import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.record.CFRuleRecord.ComparisonOperator;
-import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.BaseTestConditionalFormatting;
-import org.apache.poi.ss.util.CellRangeAddress;
 
 /**
  *

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
index c96316744fd6e4b326a7c4f7bb61fab3002c2dde..8761ecf1046ac2b4bb7a38ff04673530c13e9da4 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
@@ -20,7 +20,6 @@ package org.apache.poi.hssf.usermodel;
 import org.apache.poi.hssf.HSSFITestDataProvider;
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellReference;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
index 4759a6c04ba0edfe35321dfe78213de01db3160b..8ef9a41be5f546aac987d866ff152a13e7ab7fc7 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
@@ -17,14 +17,12 @@
 
 package org.apache.poi.hssf.usermodel;
 
-import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.Format;
 import java.text.SimpleDateFormat;
 import java.util.GregorianCalendar;
 import java.util.Iterator;
-import java.util.Locale;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.ss.usermodel.Cell;

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
index 926572b1a8efef19b174819fd4859127a971fa0e..bc87fe76a5cfcaea6aec9eafe060e74bff8d029a 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
@@ -26,7 +26,6 @@ import junit.framework.TestCase;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.ss.usermodel.DateUtil;
 
 /**
  * Class TestHSSFDateUtil

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java b/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java
index 4e64d97dcd4cddcb929c2d65c902a24c9620cafb..4a65b86bc957e75978a272edc3eccf75bebf8ef5 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java
@@ -17,12 +17,6 @@
 
 package org.apache.poi.hssf.usermodel;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.HSSFITestDataProvider;
 import org.apache.poi.ss.usermodel.BaseTestSheetHiding;
 

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
index f794cd2b5d2a4a16b6a09938e28cb31e60e19d2c..9a2dc5dfbd4f3e7c90a3c210cf089e3612f1bdac 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
@@ -24,8 +24,6 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.record.RecordFormatException;
 
 import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.File;
 
 /**
  * @author aviks

diff --git a/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java b/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java
index 4ad351cbeabb6d8b11cbfab4c7e47da1fbcd605c..e40100d5b963499bdc67dac084987115b219c386 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java
+++ b/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java
@@ -19,19 +19,9 @@
 
 package org.apache.poi.ss.formula;
 
-import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.ss.formula.IEvaluationListener.ICacheEntry;
 import org.apache.poi.ss.formula.PlainCellCache.Loc;
 import org.apache.poi.ss.formula.eval.*;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.CellValue;
-
-import java.io.PrintStream;
-import java.util.*;
 
 /**
  * @author Yegor Kozlov

diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java b/src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java
index ad3c35441c28ee3f3b223a0707ee6b4016e56231..9dcbf16ac31783e8e1c7d0a043ebabfb6a50ff18 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java
+++ b/src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java
@@ -59,12 +59,14 @@ public class TestDateParser extends TestCase {
         }
     }
 
+    @SuppressWarnings("deprecation")
     public void testShouldParseValidDate() throws EvaluationException {
         Calendar aDate = Calendar.getInstance();
         aDate.setTime(new Date(84, OCTOBER, 20));
         assertEquals(aDate, DateParser.parseDate("1984/10/20"));
     }
 
+    @SuppressWarnings("deprecation")
     public void testShouldIgnoreTimestamp() throws EvaluationException {
         Calendar aDate = Calendar.getInstance();
         aDate.setTime(new Date(84, OCTOBER, 20));

diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java b/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java
index 5f9acff9f4b5189c116d10bebb3870486c433794..2338fbbe6d9aae659159a681d1b8bd3d135e1802 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java
+++ b/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java
@@ -17,7 +17,6 @@
 package org.apache.poi.ss.formula.atp;
 
 import junit.framework.TestCase;
-import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.formula.eval.ErrorEval;
 import org.apache.poi.ss.usermodel.*;

diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java b/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
index 6f178e1aec6dc4a6bcba0ea02378f68181cfbf6e..8e9e7366c5db70df661250f4d2abbf7bc8638a0e 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
+++ b/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
@@ -43,6 +43,7 @@ import org.apache.poi.ss.formula.eval.ValueEval;
 /**
  * @author jfaenomoto@gmail.com
  */
+@SuppressWarnings("deprecation") // YK: uses deprecated {@link java.util.Date(int year, int month, int date)}
 public class TestNetworkdaysFunction extends TestCase {
 
     private static final SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd");

diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
index ff632a0b8b5600a804e8fdfff12c6f919f53cd00..18d2a6262f173accdf3158ed65eb54b9d592ba44 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
+++ b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
@@ -29,6 +29,7 @@ import org.apache.poi.ss.usermodel.DateUtil;
 /**
  * @author jfaenomoto@gmail.com
  */
+@SuppressWarnings("deprecation") // YK: heavily uses deprecated {@link java.util.Date(int year, int month, int date)}
 public class TestWorkdayCalculator extends TestCase {
 
     public void testCalculateWorkdaysShouldReturnJustWeekdaysWhenNoWeekend() {

diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
index 811ec18204be6471ffa862648ffe4c4b40cfc96e..6540de028a8955983d1857039e7821d5e1e5f030 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
+++ b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
@@ -25,12 +25,10 @@ import static java.util.Calendar.MAY;
 import static java.util.Calendar.NOVEMBER;
 import static java.util.Calendar.OCTOBER;
 import static java.util.Calendar.SEPTEMBER;
-import static org.apache.poi.ss.formula.eval.ErrorEval.NUM_ERROR;
 import static org.apache.poi.ss.formula.eval.ErrorEval.VALUE_INVALID;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -48,6 +46,7 @@ import org.apache.poi.ss.usermodel.DateUtil;
 /**
  * @author jfaenomoto@gmail.com
  */
+@SuppressWarnings("deprecation") // YK: heavily uses deprecated {@link java.util.Date(int year, int month, int date)}
 public class TestWorkdayFunction extends TestCase {
 
     private static final SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd");

diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java b/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
index ba25c4d7d15aa868bb10a95792a37f3e84fdaf10..07fb6aa895808f5b134a45884c2f33a94afa88ce 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
@@ -22,7 +22,6 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.CellValue;\r
 \r
 import junit.framework.TestCase;\r
-import org.apache.poi.ss.util.CellReference;\r
 \r
 public final class TestAddress extends TestCase {\r
 \r

diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java b/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
index 40525480f577282322eeb504156498ffae4ce24a..2d340ad8f16e6f9047d220eb91b0dea70b48a3e2 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
@@ -17,9 +17,6 @@
 
 package org.apache.poi.ss.formula.functions;
 
-import java.util.Arrays;
-import java.util.List;
-
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 

diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java b/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
index 247138a4b62aa544aa3740e6866c9b6605d83bbb..b0078f71d5d0781daeceb7ec780ebb2f96c34e03 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
@@ -21,8 +21,6 @@ import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.CellValue;
 
 /**

diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java b/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java
index bd16d6a533ce802030fa4acf6290d05c929fab8a..14cb2d8283b152aceccd640e66daa277d3c97165 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java
@@ -18,20 +18,14 @@
 package org.apache.poi.ss.formula.functions;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
 import org.apache.poi.ss.formula.eval.AreaEval;
 import org.apache.poi.ss.formula.eval.NumberEval;
 import org.apache.poi.ss.formula.eval.ValueEval;
 
 import junit.framework.TestCase;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.SheetBuilder;
-
-import java.util.Date;
 
 /**
  * Tests for {@link Subtotal}

diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java b/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java
index 7ecc330f5e37d293f55c5e8cff9a9d2fb6db1df4..386b521f2120deb298e3522ba3415f88b4b53493 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.formula.OperationEvaluationContext;
 import org.apache.poi.ss.formula.eval.*;
-import org.apache.poi.ss.usermodel.CellValue;
 
 /**
  * Test cases for SUMIFS()

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
index 7ddb3f02ceb71f037b92ee0f2a36c84d905778f3..550dd03c13566aacbf71b255d6036b9a41f707c9 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
@@ -21,7 +21,6 @@ package org.apache.poi.ss.usermodel;
 \r
 import junit.framework.TestCase;\r
 import org.apache.poi.ss.ITestDataProvider;\r
-import org.apache.poi.ss.usermodel.*;\r
 import org.apache.poi.ss.util.CellRangeAddress;\r
 \r
 /**\r

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
index b0bd1910ad622fe8e442e1950eea5a4694ca6fcc..347eded97354229fc6c7c3c5c8f60f32a5b5ae18 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
@@ -23,9 +23,6 @@ import junit.framework.TestCase;
 import org.apache.poi.ss.ITestDataProvider;
 import org.apache.poi.ss.util.CellRangeAddress;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
 /**
  * @author Yegor Kozlov
  */

diff --git a/src/testcases/org/apache/poi/util/TestLittleEndian.java b/src/testcases/org/apache/poi/util/TestLittleEndian.java
index 4313e34991fd7d242589a9de4e433c02d1561a55..f398ff40a309f34c612b37ba2ddbec06c381c2f3 100644 (file)
--- a/src/testcases/org/apache/poi/util/TestLittleEndian.java
+++ b/src/testcases/org/apache/poi/util/TestLittleEndian.java
@@ -160,7 +160,7 @@ public final class TestLittleEndian extends TestCase {
 
         testdata[0] = ( short ) 0xFF01;
         testdata[1] = 0x02FF;
-        LittleEndian.putShort(received, testdata[0]);
+        LittleEndian.putShort(received, 0, testdata[0]);
         assertTrue(compareByteArrays(received, expected, 0, LittleEndian.SHORT_SIZE));
         LittleEndian.putShort(received, 1, testdata[1]);
         assertTrue(compareByteArrays(received, expected, 1, LittleEndian.SHORT_SIZE));
@@ -180,7 +180,7 @@ public final class TestLittleEndian extends TestCase {
         };
         byte[] received = new byte[ LittleEndian.INT_SIZE + 1 ];
 
-        LittleEndian.putInt(received, 0xFFFFFF01);
+        LittleEndian.putInt(received, 0, 0xFFFFFF01);
         assertTrue(compareByteArrays(received, expected, 0, LittleEndian.INT_SIZE));
         LittleEndian.putInt(received, 1, 0x02FFFFFF);
         assertTrue(compareByteArrays(received, expected, 1, LittleEndian.INT_SIZE));