remove some deprecated code

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

diff --git a/src/java/org/apache/poi/hssf/record/BoolErrRecord.java b/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
index d54ac52b494391e1cb8312fd8fbb65652daac047..94266db6215aa283257cfccf57c0e7bdd3816c9c 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
+++ b/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
@@ -24,7 +24,6 @@ import org.apache.poi.ss.usermodel.FormulaError;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 
 /**
  * Creates new BoolErrRecord. (0x0205)
@@ -178,17 +177,6 @@ public final class BoolErrRecord extends CellRecord {
                return sid;
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public BoolErrRecord clone() {
-               return copy();
-       }
-
        @Override
        public BoolErrRecord copy() {
                return new BoolErrRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/CFRule12Record.java b/src/java/org/apache/poi/hssf/record/CFRule12Record.java
index bd4805cc32507005a0aaa1328a3c88206a221644..e98cfce142902bcdedb28551004c6fe667f1eb2c 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/CFRule12Record.java
+++ b/src/java/org/apache/poi/hssf/record/CFRule12Record.java
@@ -41,7 +41,6 @@ import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Conditional Formatting v12 Rule Record (0x087A).
@@ -449,17 +448,6 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         return len;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public CFRule12Record clone() {
-        return copy();
-    }
-
     @Override
     public CFRule12Record copy() {
         return new CFRule12Record(this);

diff --git a/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java b/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
index edfb06a75e97f953dc4cbb652928dfc3ab8cfafa..6cbdc796915d5db9b4a7139fc08fefbdc16621e8 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
@@ -24,7 +24,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 with width and formatting for a range of columns
@@ -239,16 +238,6 @@ public final class ColumnInfoRecord extends StandardRecord {
         return 12;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ColumnInfoRecord clone() {
-        return copy();
-    }
-
     @Override
     public ColumnInfoRecord copy() {
         return new ColumnInfoRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java b/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
index b9797905df08a3a074700b0347f7a9f4d6911ce4..14d7c2f1f59969d07c9f45a28c8dbecf026d85bc 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
@@ -28,7 +28,6 @@ import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 
 /**
  * The common object data record is used to store all common preferences for an excel object.
@@ -136,17 +135,6 @@ public final class CommonObjectDataSubRecord extends SubRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public CommonObjectDataSubRecord clone() {
-        return copy();
-    }
-
     @Override
     public CommonObjectDataSubRecord copy() {
         return new CommonObjectDataSubRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/ContinueRecord.java b/src/java/org/apache/poi/hssf/record/ContinueRecord.java
index 0041437fed3b7cea3d2653f753ee55f0e924c45f..0b44be58577a50f4ce3f33a689ef29a7328d1ecf 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/ContinueRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ContinueRecord.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;
 
 /**
  * Helper class used primarily for SST Records<p>
@@ -66,16 +65,6 @@ public final class ContinueRecord extends StandardRecord {
         _data = in.readRemainder();
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ContinueRecord clone() {
-        return copy();
-    }
-
     @Override
     public ContinueRecord copy() {
         return new ContinueRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/DVALRecord.java b/src/java/org/apache/poi/hssf/record/DVALRecord.java
index 93b4bb641c0c5957307f2994eeab2e214b4431af..8fed47a42991e778ba1e01525f7ffed0aeb7ee06 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/DVALRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DVALRecord.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;
 
 /**
  * This record is the list header of all data validation records (0x01BE) in the current sheet.
@@ -155,17 +154,6 @@ public final class DVALRecord extends StandardRecord {
         return sid;
     }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public DVALRecord clone() {
-               return copy();
-       }
-
        @Override
     public DVALRecord copy() {
       return new DVALRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/DVRecord.java b/src/java/org/apache/poi/hssf/record/DVRecord.java
index 5f1598fb9e11ca68b5a23c00b1ceac7f0c646e3b..a81e67295e7ada8fd0aa9efe6f4f1a8820a22615 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/DVRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DVRecord.java
@@ -30,7 +30,6 @@ import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -331,17 +330,6 @@ public final class DVRecord extends StandardRecord {
                return sid;
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public DVRecord clone() {
-               return copy();
-       }
-
        /** Clones the object. */
        @Override
        public DVRecord copy() {

diff --git a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java b/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
index ab79205130baa2e1b06ca310a5cf0beeba1203a3..8c18ae1458b739c900732ed8a8a204a20eced8dd 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.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;
 
 /**
  * Specifies the default width for columns that have no specific width set.
@@ -86,16 +85,6 @@ public final class DefaultColWidthRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DefaultColWidthRecord clone() {
-        return copy();
-    }
-
     @Override
     public DefaultColWidthRecord copy() {
       return new DefaultColWidthRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/DeltaRecord.java b/src/java/org/apache/poi/hssf/record/DeltaRecord.java
index 3649e419990d41daf84fa05dcb887cafed5fad18..dd9a28809a2a4c6c15171a9181f1d36ee27bc86a 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/DeltaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DeltaRecord.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;
 
 /** Controls the accuracy of the calculations */
 public final class DeltaRecord extends StandardRecord {
@@ -66,16 +65,6 @@ public final class DeltaRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DeltaRecord clone() {
-        return copy();
-    }
-
     @Override
     public DeltaRecord copy() {
         // immutable

diff --git a/src/java/org/apache/poi/hssf/record/DrawingRecord.java b/src/java/org/apache/poi/hssf/record/DrawingRecord.java
index 35ed7eb9613ce9a6729aea4f8416eac60567fd6d..b368008236ac36b2ab168129b17ddb06b5bcb34f 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/DrawingRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DrawingRecord.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;
 
 public final class DrawingRecord extends StandardRecord {
     public static final short sid = 0x00EC;
@@ -83,13 +82,6 @@ public final class DrawingRecord extends StandardRecord {
         recordData = thedata;
     }
 
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DrawingRecord clone() {
-        return copy();
-    }
-
     /**
      * Cloning of drawing records must be executed through HSSFPatriarch, because all id's must be changed
      * @return cloned drawing records

diff --git a/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java b/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
index 894ac930c4470d77e13fdc247cd5a1bc8a196ac1..94b6ac83d61d9718ae27d97315a8904d866b1ef0 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
@@ -24,7 +24,6 @@ import org.apache.poi.common.usermodel.GenericRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * MsoDrawingSelection (0x00ED)<p>
@@ -114,17 +113,6 @@ public final class DrawingSelectionRecord extends StandardRecord {
                }
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public DrawingSelectionRecord clone() {
-               return copy();
-       }
-
        @Override
        public DrawingSelectionRecord copy() {
                // currently immutable

diff --git a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java b/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
index 5ef7fdfcd982f1dcf8be9f769fd96574bc55c59c..915e1771ee5211be2698dcb9e787739a8136d35f 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
@@ -35,7 +35,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;
 
 /**
@@ -320,17 +319,6 @@ public final class EmbeddedObjectRefSubRecord extends SubRecord {
                return field_6_unknown;
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings("squid:S2975")
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public EmbeddedObjectRefSubRecord clone() {
-               return copy();
-       }
-
        @Override
        public EmbeddedObjectRefSubRecord copy() {
                return new EmbeddedObjectRefSubRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/EndSubRecord.java b/src/java/org/apache/poi/hssf/record/EndSubRecord.java
index 4158dd6ea9d2ff83217f558f03fc5c824fb28226..498ce88b06176c1d7c79daff8cbfdc4941a4c9dd 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/EndSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/EndSubRecord.java
@@ -23,7 +23,6 @@ import java.util.function.Supplier;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 
 /**
  * ftEnd (0x0000)<p>
@@ -70,17 +69,6 @@ public final class EndSubRecord extends SubRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public EndSubRecord clone() {
-        return copy();
-    }
-
     @Override
     public EndSubRecord copy() {
         return new EndSubRecord();

diff --git a/src/java/org/apache/poi/hssf/record/FilePassRecord.java b/src/java/org/apache/poi/hssf/record/FilePassRecord.java
index 2704402f92724e9af7521767ce7ccc0e74cee9b2..a7fccea0c9aacb343a4e64589b3220d48d8aa1e3 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FilePassRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FilePassRecord.java
@@ -35,7 +35,6 @@ import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianByteArrayOutputStream;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.LittleEndianOutputStream;
-import org.apache.poi.util.Removal;
 
 /**
  * File Pass Record (0x002F) <p>
@@ -138,16 +137,6 @@ public final class FilePassRecord extends StandardRecord {
                return sid;
        }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FilePassRecord clone() {
-        return copy();
-    }
-
     @Override
        public FilePassRecord copy() {
                return new FilePassRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/FormatRecord.java b/src/java/org/apache/poi/hssf/record/FormatRecord.java
index 87600d6ed3f4d426b7819643ec9e35325dba92d5..4eb4aeb56eead0e38dba15c528ae510cd8923024 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FormatRecord.java
@@ -26,7 +26,6 @@ import org.apache.poi.util.LittleEndianConsts;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -107,16 +106,6 @@ public final class FormatRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FormatRecord clone() {
-        return copy();
-    }
-
     @Override
     public FormatRecord copy() {
         return new FormatRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/FormulaRecord.java b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
index ff556cb27de0afdf2fd2bdab12ad3639bfa8d45c..e7ec130a8c2ef1b7e65d2047d4434b17628baf46 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FormulaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
@@ -124,7 +124,7 @@ public final class FormulaRecord extends CellRecord {
         * @deprecated POI 5.0.0, will be removed in 6.0, use getCachedResultTypeEnum until switch to enum is fully done
         */
        @Deprecated
-       @Removal(version = "6.0.0XSSFScatterChartData.java")
+       @Removal(version = "6.0.0")
        public int getCachedResultType() {
                if (specialCachedValue == null) {
                        return CellType.NUMERIC.getCode();

diff --git a/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java b/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
index df65a451fe718440576fcb578901a009317d40a6..5102fd4f45a41141d9c17e504a9b53fa6d0a0f15 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
@@ -90,7 +90,6 @@ public final class FtCblsSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java b/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
index 0dd6fddab2e23eb679fe59633ad5b314314d7462..5cdb539fc1ea20a90c5ae6c37ac26f23ec69a7ee 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
@@ -26,7 +26,6 @@ import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 
 
 /**
@@ -99,17 +98,6 @@ public final class FtCfSubRecord extends SubRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FtCfSubRecord clone() {
-        return copy();
-    }
-
     @Override
     public FtCfSubRecord copy() {
         return new FtCfSubRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java b/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
index 5569f14ba189de7464e4dc56ffe61ae06258e351..c20f975a4b14826d3924df48a133b18cd3deeb3f 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
@@ -156,7 +156,6 @@ public final class FtPioGrbitSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java b/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
index f92164ff7de140c17f56de24a2d7df396ff12a03..d7fe77df8688550f9337743cceb5b01f3b239242 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
@@ -78,7 +78,6 @@ public final class GroupMarkerSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/IterationRecord.java b/src/java/org/apache/poi/hssf/record/IterationRecord.java
index ccfbe7928a18d1d4c481295ab7b29a7c1ce3a8d1..1dbb8639320aeee60b90d069ae6a90b51edea7eb 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/IterationRecord.java
+++ b/src/java/org/apache/poi/hssf/record/IterationRecord.java
@@ -24,7 +24,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;
 
 /**
  * Tells whether to iterate over formula calculations or not.
@@ -80,16 +79,6 @@ public final class IterationRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public IterationRecord clone() {
-        return copy();
-    }
-
     @Override
     public IterationRecord copy() {
         return new IterationRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java b/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
index db751b084f9e31290a9249c7c063c53414d1643d..3838f76bd2bd151e1cb6bed7f212dd317e7f7256 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
@@ -284,7 +284,6 @@ public class LbsDataSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/MulBlankRecord.java b/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
index fee9c7025c47b0696d7e5f0920818f5e3149e6ac..0f395cc272f3061db5df3b700a1bb30a677bce76 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
+++ b/src/java/org/apache/poi/hssf/record/MulBlankRecord.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;
 
 /**
  * Represents a set of columns in a row with no value but with styling.
@@ -119,17 +118,6 @@ public final class MulBlankRecord extends StandardRecord {
                return 6 + _xfs.length * 2;
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public MulBlankRecord clone() {
-               return copy();
-       }
-
        @Override
        public MulBlankRecord copy() {
                // immutable - so OK to return this

diff --git a/src/java/org/apache/poi/hssf/record/NoteRecord.java b/src/java/org/apache/poi/hssf/record/NoteRecord.java
index 2a73c545e3e3902da865c99e5a81c31e3b1d26c7..c89ac5dece3bc89ef2feead4930c6cb137231d44 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/NoteRecord.java
+++ b/src/java/org/apache/poi/hssf/record/NoteRecord.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;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -238,19 +237,9 @@ public final class NoteRecord extends StandardRecord {
         */
        public void setAuthor(String author) {
                field_6_author = author;
-      field_5_hasMultibyte = StringUtil.hasMultibyte(author);
+       field_5_hasMultibyte = StringUtil.hasMultibyte(author);
        }
 
-       /**
-        * @deprecated use {@link #copy()} instead
-        */
-       @Override
-       @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public NoteRecord clone() {
-               return copy();
-       }
 
        @Override
        public NoteRecord copy() {

diff --git a/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java b/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
index b2e2b49857b980f1a57362d9237be93ae9d54382..85c553792e7dc1450ead25dc1d49567e8b2be683 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
@@ -102,7 +102,6 @@ public final class NoteStructureSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/ProtectRecord.java b/src/java/org/apache/poi/hssf/record/ProtectRecord.java
index 0d49793fc1fec1f6edba26ddf6cbbb0484614e39..b57cbe72a990d22dadb5598593a78d372df6369a 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/ProtectRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ProtectRecord.java
@@ -24,7 +24,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 whether a sheet or workbook is protected (HSSF DOES NOT SUPPORT ENCRYPTION)<p>
@@ -84,16 +83,6 @@ public final class ProtectRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ProtectRecord clone() {
-        return copy();
-    }
-
     @Override
     public ProtectRecord copy() {
         return new ProtectRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/RKRecord.java b/src/java/org/apache/poi/hssf/record/RKRecord.java
index cd6dacc154f979ab2baf465c3bd258db10d24146..d6737ad00d4904c8fca3f344545c47d7795392ff 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/RKRecord.java
+++ b/src/java/org/apache/poi/hssf/record/RKRecord.java
@@ -23,7 +23,6 @@ import java.util.function.Supplier;
 import org.apache.poi.hssf.util.RKUtil;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * An internal 32 bit number with the two most significant bits storing the type.
@@ -94,16 +93,6 @@ public final class RKRecord extends CellRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public RKRecord clone() {
-        return copy();
-    }
-
     @Override
     public RKRecord copy() {
         return new RKRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java b/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
index 919901e5fbdefb1e099c9d5a9d084c58304267b0..e385f91becb034d80aa775df7462be9eb2eb8b58 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
+++ b/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
@@ -24,7 +24,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;
 
 /**
  * Flag whether to refresh all external data when loading a sheet.
@@ -83,16 +82,6 @@ public final class RefreshAllRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public RefreshAllRecord clone() {
-        return copy();
-    }
-
     @Override
     public RefreshAllRecord copy() {
         return new RefreshAllRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java b/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
index 8e08d6a2011bba09a55faa365e24a2815b133afa..47934d028f43efa15e072960b68480ec869e69eb 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.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;
 
 /**
  * Defines whether to recalculate before saving (set to true)
@@ -75,16 +74,6 @@ public final class SaveRecalcRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SaveRecalcRecord clone() {
-        return copy();
-    }
-
     @Override
     public SaveRecalcRecord copy() {
         return new SaveRecalcRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/SelectionRecord.java b/src/java/org/apache/poi/hssf/record/SelectionRecord.java
index 3f22c45c6628fef04dcdba24824760e8d582e595..6019a825a0c22814dcb40a0403900f2acf88917e 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/SelectionRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SelectionRecord.java
@@ -24,7 +24,6 @@ import java.util.stream.Stream;
 import org.apache.poi.hssf.util.CellRangeAddress8Bit;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Shows the user's selection on the sheet for write set num refs to 0
@@ -173,16 +172,6 @@ public final class SelectionRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SelectionRecord clone() {
-        return copy();
-    }
-
     @Override
     public SelectionRecord copy() {
         return new SelectionRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/SubRecord.java b/src/java/org/apache/poi/hssf/record/SubRecord.java
index ac56f4fed220cec08c2757691f2704c0ac282141..04292671625e806d437961de2e942a85780ef9aa 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/SubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SubRecord.java
@@ -32,7 +32,6 @@ import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.LittleEndianOutputStream;
-import org.apache.poi.util.Removal;
 
 /**
  * Subrecords are part of the OBJ class.
@@ -167,17 +166,6 @@ public abstract class SubRecord implements Duplicatable, GenericRecord {
                        out.write(_data);
                }
 
-               /**
-                * @deprecated use {@link #copy()} instead
-                */
-               @Override
-               @SuppressWarnings("squid:S2975")
-               @Deprecated
-               @Removal(version = "5.0.0")
-               public UnknownSubRecord clone() {
-                       return copy();
-               }
-
                @Override
                public UnknownSubRecord copy() {
                        return this;
@@ -197,12 +185,6 @@ public abstract class SubRecord implements Duplicatable, GenericRecord {
                }
        }
 
-       @Override
-       @SuppressWarnings("squid:S2975")
-       @Deprecated
-       @Removal(version = "5.0.0")
-       public abstract SubRecord  clone();
-
        @Override
        public abstract SubRecord copy();
 

diff --git a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java b/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
index dda12ab18aebf06d4eb5054f1ecb98368991a5ff..139c2faa1869311869c0f4ac4f5faa9de4d184b3 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
+++ b/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
@@ -26,7 +26,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;
 
 /**
  * Tells the GUI if this was written by something that can use "natural language" formulas. HSSF can't.
@@ -68,16 +67,6 @@ public final class UseSelFSRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public UseSelFSRecord clone() {
-        return copy();
-    }
-
     @Override
     public UseSelFSRecord copy() {
         return new UseSelFSRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
index 4b5df7b73735a117465431c5c4a132a0d7b235a0..368f39a66abda6bdb94c51fb67b1dc148362d76e 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
+++ b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
@@ -24,7 +24,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;
 
 /**
  * Flags whether workbook windows are protected
@@ -84,16 +83,6 @@ public final class WindowProtectRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public WindowProtectRecord clone() {
-        return copy();
-    }
-
     @Override
     public WindowProtectRecord copy() {
         return new WindowProtectRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java b/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
index 15f22d8187a96f90f1b568c9dc0f6089b9165960..2cea08e4c5706483c61da26c44834f4dce352c28 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
+++ b/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
@@ -63,7 +63,6 @@ public final class ColorGradientThreshold extends Threshold implements Duplicata
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java b/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
index ade385a46eddd494edae7340c77156cf7390b219..329f04773174012d42ae5fb02880fdce01459d8d 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
+++ b/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
@@ -42,7 +42,6 @@ public final class DataBarThreshold extends Threshold implements Duplicatable {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
index f7c2d55794cefbcc45438cd6ce7f2d77026d9e23..6ee8e8ef6957e226817e29d4daa953124f06ee49 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
+++ b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
@@ -68,7 +68,6 @@ public final class IconMultiStateThreshold extends Threshold implements Duplicat
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java b/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
index 2820fc2cf616e8855a70069f51ecf305163b86db..4bad21929725b90575d1e2755e295a9a50828ccb 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
@@ -30,7 +30,6 @@ import org.apache.poi.util.GenericRecordJsonWriter;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Pattern Formatting Block of the Conditional Formatting Rule Record.
@@ -185,16 +184,6 @@ public final class PatternFormatting implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public PatternFormatting clone()  {
-        return copy();
-    }
-
     public PatternFormatting copy()  {
         return new PatternFormatting(this);
     }

diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
index 8979d8fc88786c9b3df125057bc918bbf14c5eef..2da5fd4fe157c3c8751dee3c51e4d6cba13530f0 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisRecord.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 axis record defines the type of an axis.
@@ -78,16 +77,6 @@ public final class AxisRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public AxisRecord clone() {
-        return copy();
-    }
-
     /**
      * Get the axis type field for the Axis record.
      *

diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
index 8a45bb28c20d6e158c6445e4320984f9f8d77ab4..bd2205923281ba6c397484c99e319d4456e6df2d 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.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 number of axes used on a chart.
@@ -59,16 +58,6 @@ public final class AxisUsedRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public AxisUsedRecord clone() {
-        return copy();
-    }
-
     /**
      * Get the num axis field for the AxisUsed record.
      */

diff --git a/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
index 91bbf62ec2e7e58d8b5f1886307897ef8b05a54e..ba319f23f2c4aa5e56549a82b10c5fb49241bef8 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
@@ -27,7 +27,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 data format record is used to index into a series.
@@ -75,16 +74,6 @@ public final class DataFormatRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DataFormatRecord clone() {
-        return copy();
-    }
-
     @Override
     public DataFormatRecord copy() {
         return new DataFormatRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
index 13960ba462e24a8e093f139dd3499f2594f07a43..94d307c75218d19f664b84153c2792f35e7e5e9d 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.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;
 
 /**
  * Describes a line format record.  The line format record controls how a line on a chart appears.
@@ -101,16 +100,6 @@ public final class LineFormatRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public LineFormatRecord clone() {
-        return copy();
-    }
-
     @Override
     public LineFormatRecord copy() {
         return new LineFormatRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java b/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
index 7061c07f7e306fee2597c6e7d17110fd8736edee..0b4810bc997df1d6b0d4ccfc7b8a1ee6816c39ab 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
@@ -31,7 +31,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;
 
 /**
  * Describes a linked data record.  This record refers to the series data or text.
@@ -95,16 +94,6 @@ public final class LinkedDataRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public LinkedDataRecord clone() {
-        return copy();
-    }
-
     @Override
     public LinkedDataRecord copy() {
         return new LinkedDataRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java b/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
index d80b2c64ada0665562bc6e407a684d82e2ab19a7..8167858e24fc1e1f0d549545db855db6e9df6b6b 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.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 plot growth record specifies the scaling factors used when a font is scaled.
@@ -62,16 +61,6 @@ public final class PlotGrowthRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public PlotGrowthRecord clone() {
-        return copy();
-    }
-
     public PlotGrowthRecord copy() {
         return new PlotGrowthRecord(this);
     }

diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
index 561148828cfa9a1280766b5dd65f80869519ee6a..58e8a6c9c6939b522419d5d97e7d78b435877197 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
@@ -61,7 +61,6 @@ public final class SeriesIndexRecord extends StandardRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java b/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
index 16ce5e4ab6c91d4b30f501054d7f361e838fd86a..00158480e232005468bbc11d37739fbcdedc8d90 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.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;
 
 /**
  * Describes a chart sheet properties record. SHTPROPS (0x1044)<p>
@@ -80,17 +79,6 @@ public final class SheetPropertiesRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SheetPropertiesRecord clone() {
-        return copy();
-    }
-
     @Override
     public SheetPropertiesRecord copy() {
         return new SheetPropertiesRecord(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 252a8e5b8c06fe620a850142cb47bfe27fd3e088..9bbeae41233f4e126e9f6b0c10e82ecae8b4927d 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
@@ -156,7 +156,6 @@ public final class TextRecord extends StandardRecord {
         return sid;
     }
 
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

diff --git a/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java b/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
index 4293bb9fdecd3b1a92394b1fa2581576bb6e71dc..661e521c2f78346dde95664de146afc949b47d77 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.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 units record describes units.
@@ -59,16 +58,6 @@ public final class UnitsRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public UnitsRecord clone() {
-        return copy();
-    }
-
     @Override
     public UnitsRecord copy() {
         return new UnitsRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java b/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
index 945bd5c2b0d4786555b09dce86f49541c2b8a60e..e18ebcc1b8b65f9cf90d75f95ffe45c4040aba69 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
@@ -27,7 +27,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 value range record defines the range of the value axis.
@@ -91,16 +90,6 @@ public final class ValueRangeRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ValueRangeRecord clone() {
-        return copy();
-    }
-
     @Override
     public ValueRangeRecord copy() {
         return new ValueRangeRecord(this);

diff --git a/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java b/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
index 8c790b20c520b53e2747cb914c1f9a528d3db68a..e81cab49dae758020681508eff7374afb7b8b617 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
+++ b/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
@@ -26,8 +26,6 @@ import org.apache.poi.util.GenericRecordJsonWriter;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
-
 
 /**
  * Title: CTColor (Extended Color) record part
@@ -167,16 +165,6 @@ public final class ExtendedColor implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ExtendedColor clone() {
-        return copy();
-    }
-
     @Override
     public ExtendedColor copy()  {
         return new ExtendedColor(this);

diff --git a/src/multimodule/ooxml-lite/java9/module-info.class b/src/multimodule/ooxml-lite/java9/module-info.class
index 0eb072af3d0d9d892ac9617fcc0742f78a26fc1a..8cc8de8e16230c6b9a81cb76673c4ab07b96850b 100644 (file)
Binary files a/src/multimodule/ooxml-lite/java9/module-info.class and b/src/multimodule/ooxml-lite/java9/module-info.class differ