remove some deprecated code

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

diff --git a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java b/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
index 96462bc128eba843ef9eaf858ad5daf9b7fa6384..a68bee910bc24ed5e6fc2af66b3f9937830155dd 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
@@ -23,7 +23,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Row height for rows with undefined or not explicitly defined heights.
@@ -110,16 +109,6 @@ public final class DefaultRowHeightRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DefaultRowHeightRecord clone() {
-        return copy();
-    }
-
     @Override
     public DefaultRowHeightRecord copy() {
         return new DefaultRowHeightRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/EOFRecord.java b/src/java/org/apache/poi/hssf/record/EOFRecord.java
index 73245a82e914cf694682c6aade54aef2ca1e9dfe..a067b2917dc4f1611a7279c46fb50c18e44dcf33 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/EOFRecord.java
+++ b/src/java/org/apache/poi/hssf/record/EOFRecord.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import java.util.function.Supplier;
 
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Marks the end of records belonging to a particular object in the HSSF File
@@ -53,16 +52,6 @@ public final class EOFRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public EOFRecord clone() {
-        return copy();
-    }
-
     @Override
     public EOFRecord copy() {
       return instance;

diff --git a/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java b/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java
index c46551f79e89b50cfd4551bfabfcd58e026f80b3..deb5daaa6a9300d44f9bec1c19d543b4035d6992 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java
@@ -23,7 +23,6 @@ import java.util.function.Supplier;
 import org.apache.poi.hssf.record.common.FtrHeader;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Title: FeatHdr (Feature Header) Record
@@ -112,17 +111,6 @@ public final class FeatHdrRecord extends StandardRecord {
                return 12 + 2+1+4+rgbHdrData.length;
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public FeatHdrRecord clone() {
-               return copy();
-       }
-
        @Override
     public FeatHdrRecord copy() {
            //HACK: do a "cheat" clone, see Record.java for more information

diff --git a/src/java/org/apache/poi/hssf/record/FeatRecord.java b/src/java/org/apache/poi/hssf/record/FeatRecord.java
index d955a911d3e935acc329a86340c8d8f65c40075d..e51cb32bc9a5446bc866de8e2122afff366a4263 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FeatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FeatRecord.java
@@ -31,7 +31,6 @@ import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Title: Feat (Feature) Record
@@ -181,17 +180,6 @@ public final class FeatRecord extends StandardRecord {
                }
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public FeatRecord clone() {
-               return copy();
-       }
-
        @Override
        public FeatRecord copy() {
         return new FeatRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/FormulaRecord.java b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
index e7ec130a8c2ef1b7e65d2047d4434b17628baf46..0b702b01280175f7189d46a4a19334f999a4c213 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FormulaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
@@ -247,17 +247,6 @@ public final class FormulaRecord extends CellRecord {
                return "FORMULA";
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public FormulaRecord clone() {
-               return copy();
-       }
-
        @Override
        public FormulaRecord copy() {
                return new FormulaRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java b/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
index 5102fd4f45a41141d9c17e504a9b53fa6d0a0f15..529b9ec234b121684c073496f9739306e6c08041 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
@@ -25,8 +25,6 @@ import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
-
 
 /**
  * This structure appears as part of an Obj record that represents a checkbox or radio button.
@@ -87,16 +85,6 @@ public final class FtCblsSubRecord extends SubRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FtCblsSubRecord clone() {
-        return copy();
-    }
-
     @Override
     public FtCblsSubRecord copy() {
         return new FtCblsSubRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/GutsRecord.java b/src/java/org/apache/poi/hssf/record/GutsRecord.java
index 8534b6612f8a894a2a24d3689d941c89e2809eb5..165b502677960c67c1559b1894612807a6cd21ac 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/GutsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/GutsRecord.java
@@ -24,7 +24,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Row/column gutter sizes
@@ -164,16 +163,6 @@ public final class GutsRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public GutsRecord clone() {
-        return copy();
-    }
-
     @Override
     public GutsRecord copy() {
       return new GutsRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
index 68ed39de03f988083dd91506165292c740f4673e..7130aef0abe0b763ab1255536499c86b7cc3c562 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
+++ b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
@@ -36,7 +36,6 @@ import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -599,16 +598,6 @@ public final class HyperlinkRecord extends StandardRecord {
         setTextMark("");
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public HyperlinkRecord clone() {
-        return copy();
-    }
-
     @Override
     public HyperlinkRecord copy() {
         return new HyperlinkRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/NumberRecord.java b/src/java/org/apache/poi/hssf/record/NumberRecord.java
index 1b3753de7c4420ff8ff06622f538a3633b18a9a3..8441736aa4db10dba1127fa665c9a8b5fa830a6e 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/NumberRecord.java
+++ b/src/java/org/apache/poi/hssf/record/NumberRecord.java
@@ -22,7 +22,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * NUMBER (0x0203) Contains a numeric cell value.
@@ -86,16 +85,6 @@ public final class NumberRecord extends CellRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public NumberRecord clone() {
-        return copy();
-    }
-
     @Override
     public NumberRecord copy() {
         return new NumberRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java b/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
index c1e3a15934590ab4223c482746fe9a9f11e25bda..7de13c6ec88f389d7a6df70ca93ff48a7a8b0d43 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
@@ -21,7 +21,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Whether to print the gridlines when you enjoy the spreadsheet on paper.
@@ -75,16 +74,6 @@ public final class PrintGridlinesRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public PrintGridlinesRecord clone() {
-        return copy();
-    }
-
     public PrintGridlinesRecord copy() {
         return new PrintGridlinesRecord(this);
     }

diff --git a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
index f51dee1438574bdf58b3b2ba7510380d059fe064..0c4f4e6a2ba3c56b6d24c70dee6ecddb3a2869fa 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
@@ -27,7 +27,6 @@ import org.apache.poi.ss.formula.SharedFormula;
 import org.apache.poi.ss.formula.ptg.Ptg;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Primarily used as an excel optimization so that multiple similar formulas are not
@@ -103,16 +102,6 @@ public final class SharedFormulaRecord extends SharedValueRecordBase {
         return sf.convertSharedFormulas(field_7_parsed_expr.getTokens(), formulaRow, formulaColumn);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SharedFormulaRecord clone() {
-        return copy();
-    }
-
     @Override
     public SharedFormulaRecord copy() {
         return new SharedFormulaRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java b/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
index 1027c5e215b48d57b2826dade8de1e0cea4d7390..d7f5563c147d16b2767967bdd08a55f7a4071318 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
@@ -488,16 +488,6 @@ public final class FontFormatting implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FontFormatting clone() {
-        return copy();
-    }
-
     @Override
     public FontFormatting copy() {
         return new FontFormatting(this);

diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
index 291e8603f9fc49077327989848d8b3594a7599ac..3236ff04df1ec66fa5cf5ada2733e792cab2e146 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
@@ -29,7 +29,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The axis options record provides unit information and other various tidbits about the axis.
@@ -112,16 +111,6 @@ public final class AxisOptionsRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public AxisOptionsRecord clone() {
-        return copy();
-    }
-
     /**
      * Get the minimum category field for the AxisOptions record.
      */

diff --git a/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java b/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
index 3737a25767c69765217971c3b140d2e5b19f3c1a..ebbe2e1e76dbff6a94cadd9bc51be8b9a711b7ca 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
@@ -30,7 +30,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Defines a legend for a chart.
@@ -106,24 +105,12 @@ public final class LegendRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public LegendRecord clone() {
-        return copy();
-    }
-
     @Override
     public LegendRecord copy() {
         return new LegendRecord(this);
     }
 
 
-
-
     /**
      * Get the x axis upper left field for the Legend record.
      */

diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
index 2d340d94405ea0a0d88eb80e48acc6341278ea43..ca456168a448e187f82b5a7e0af4c08aa51ba4d9 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The series chart group index record stores the index to the CHARTFORMAT record (0 based).
@@ -59,16 +58,6 @@ public final class SeriesChartGroupIndexRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SeriesChartGroupIndexRecord clone() {
-        return copy();
-    }
-
     @Override
     public SeriesChartGroupIndexRecord copy() {
         return new SeriesChartGroupIndexRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
index 52c5fcf4f11b615b955d6c0c0b7497b408de0f8d..ac1fb5aba2d07bddba9bfdf4a2d852ea69b56789 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * SERIESLIST (0x1016)<p>
@@ -75,16 +74,6 @@ public final class SeriesListRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SeriesListRecord clone() {
-        return copy();
-    }
-
     @Override
     public SeriesListRecord copy() {
         return new SeriesListRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
index 02c4216cfd615d9d1c747275646d01327be30f43..4eecfc484a6001eb2ee74312f83ffdd8f85ec09b 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -90,17 +89,6 @@ public final class SeriesTextRecord extends StandardRecord {
                return sid;
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public SeriesTextRecord clone() {
-               return copy();
-       }
-
        @Override
        public SeriesTextRecord copy() {
                return new SeriesTextRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/chart/TextRecord.java b/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
index 9bbeae41233f4e126e9f6b0c10e82ecae8b4927d..7c3c8666aaf5e6e5e286fe1d6c29fc661e139b0b 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
@@ -31,7 +31,6 @@ import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The text record is used to define text stored on a chart.
@@ -156,13 +155,6 @@ public final class TextRecord extends StandardRecord {
         return sid;
     }
 
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public TextRecord clone() {
-        return copy();
-    }
-
     @Override
     public TextRecord copy() {
         return new TextRecord(this);