From 451e47021b10c0700b123f98b8e7b02096523072 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 9 Dec 2020 00:18:22 +0000 Subject: [PATCH] remove some deprecated code git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884227 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/hssf/record/DBCellRecord.java | 11 ----------- .../apache/poi/hssf/record/FileSharingRecord.java | 11 ----------- .../org/apache/poi/hssf/record/HCenterRecord.java | 11 ----------- src/java/org/apache/poi/hssf/record/IndexRecord.java | 11 ----------- .../org/apache/poi/hssf/record/LabelSSTRecord.java | 11 ----------- .../poi/hssf/record/ScenarioProtectRecord.java | 11 ----------- .../poi/hssf/record/cf/IconMultiStateThreshold.java | 11 ----------- .../poi/hssf/record/chart/AxisLineFormatRecord.java | 11 ----------- .../poi/hssf/record/chart/ChartStartBlockRecord.java | 12 ------------ 9 files changed, 100 deletions(-) diff --git a/src/java/org/apache/poi/hssf/record/DBCellRecord.java b/src/java/org/apache/poi/hssf/record/DBCellRecord.java index f041d4dd96..15938de26b 100644 --- a/src/java/org/apache/poi/hssf/record/DBCellRecord.java +++ b/src/java/org/apache/poi/hssf/record/DBCellRecord.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; /** * Used by Excel and other MS apps to quickly find rows in the sheets. @@ -67,16 +66,6 @@ public final class DBCellRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public DBCellRecord clone() { - return copy(); - } - @Override public DBCellRecord copy() { // safe because immutable diff --git a/src/java/org/apache/poi/hssf/record/FileSharingRecord.java b/src/java/org/apache/poi/hssf/record/FileSharingRecord.java index d534e7167d..4249e72a83 100644 --- a/src/java/org/apache/poi/hssf/record/FileSharingRecord.java +++ b/src/java/org/apache/poi/hssf/record/FileSharingRecord.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; /** @@ -133,16 +132,6 @@ public final class FileSharingRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public FileSharingRecord clone() { - return copy(); - } - @Override public FileSharingRecord copy() { return new FileSharingRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/HCenterRecord.java b/src/java/org/apache/poi/hssf/record/HCenterRecord.java index 2bb7193942..37ee0ff63f 100644 --- a/src/java/org/apache/poi/hssf/record/HCenterRecord.java +++ b/src/java/org/apache/poi/hssf/record/HCenterRecord.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 center between horizontal margins @@ -73,16 +72,6 @@ public final class HCenterRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public HCenterRecord clone() { - return copy(); - } - @Override public HCenterRecord copy() { return new HCenterRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/IndexRecord.java b/src/java/org/apache/poi/hssf/record/IndexRecord.java index 7ebe0ac7e6..dd7772c845 100644 --- a/src/java/org/apache/poi/hssf/record/IndexRecord.java +++ b/src/java/org/apache/poi/hssf/record/IndexRecord.java @@ -24,7 +24,6 @@ import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.IntList; import org.apache.poi.util.LittleEndianOutput; import org.apache.poi.util.RecordFormatException; -import org.apache.poi.util.Removal; /** * Occurs right after BOF, tells you where the DBCELL records are for a sheet Important for locating cells @@ -141,16 +140,6 @@ public final class IndexRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public IndexRecord clone() { - return copy(); - } - @Override public IndexRecord copy() { return new IndexRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java b/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java index 50889ce706..1872845f8e 100644 --- a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java +++ b/src/java/org/apache/poi/hssf/record/LabelSSTRecord.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; /** * Refers to a string in the shared string table and is a column value. @@ -84,16 +83,6 @@ public final class LabelSSTRecord extends CellRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public LabelSSTRecord clone() { - return copy(); - } - @Override public LabelSSTRecord copy() { return new LabelSSTRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java b/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java index 0a63b88d6c..8e718cc1d3 100644 --- a/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java +++ b/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.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; /** * I have no idea what a Scenario is or why on would want to protect it with the lamest "security" ever invented. @@ -86,16 +85,6 @@ public final class ScenarioProtectRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public ScenarioProtectRecord clone() { - return copy(); - } - public ScenarioProtectRecord copy() { return new ScenarioProtectRecord(this); } 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 6ee8e8ef69..3b1c8f87c8 100644 --- a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java +++ b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java @@ -20,7 +20,6 @@ package org.apache.poi.hssf.record.cf; import org.apache.poi.common.Duplicatable; import org.apache.poi.util.LittleEndianInput; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Icon / Multi-State specific Threshold / value (CFVO), @@ -65,16 +64,6 @@ public final class IconMultiStateThreshold extends Threshold implements Duplicat return super.getDataLength() + 5; } - /** - * @deprecated use {@link #copy()} instead - */ - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public IconMultiStateThreshold clone() { - return copy(); - } - @Override public IconMultiStateThreshold copy() { return new IconMultiStateThreshold(this); diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java index 9d5a359206..26e669d46f 100644 --- a/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.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 line format record defines the axis type details. @@ -63,16 +62,6 @@ public final class AxisLineFormatRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public AxisLineFormatRecord clone() { - return copy(); - } - /** * Get the axis type field for the AxisLineFormat record. * diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java b/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java index f03ad4d7b9..6e9601e09a 100644 --- a/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.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; /** * STARTBLOCK - Chart Future Record Type Start Block (0x0852) @@ -81,17 +80,6 @@ public final class ChartStartBlockRecord extends StandardRecord { out.writeShort(iObjectInstance2); } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public ChartStartBlockRecord clone() { - return copy(); - } - @Override public ChartStartBlockRecord copy() { return new ChartStartBlockRecord(this);