You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2020/12/09 16:12:33 UTC

svn commit: r1884256 - in /poi/trunk/src: java/org/apache/poi/hssf/record/ java/org/apache/poi/hssf/record/aggregates/ java/org/apache/poi/hssf/record/cf/ java/org/apache/poi/hssf/record/chart/ java/org/apache/poi/ss/format/ java/org/apache/poi/ss/form...

Author: fanningpj
Date: Wed Dec  9 16:12:33 2020
New Revision: 1884256

URL: http://svn.apache.org/viewvc?rev=1884256&view=rev
Log:
remove more deprecated code

Modified:
    poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/UserSViewBegin.java
    poi/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
    poi/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
    poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
    poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
    poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
    poi/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
    poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
    poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
    poi/trunk/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java Wed Dec  9 16:12:33 2020
@@ -24,8 +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;
-
 
 /**
  * Record for the bottom margin.
@@ -74,16 +72,6 @@ public final class BottomMarginRecord ex
         this.field_1_margin = field_1_margin;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public BottomMarginRecord clone() {
-        return copy();
-    }
-
     @Override
     public BottomMarginRecord copy() {
         return new BottomMarginRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java Wed Dec  9 16:12:33 2020
@@ -26,8 +26,6 @@ import org.apache.poi.util.GenericRecord
 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 image display properties.
@@ -153,16 +151,6 @@ public final class FtPioGrbitSubRecord e
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FtPioGrbitSubRecord clone() {
-        return copy();
-    }
-
     @Override
     public FtPioGrbitSubRecord copy() {
         return new FtPioGrbitSubRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java Wed Dec  9 16:12:33 2020
@@ -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;
 
 /**
  * Stores the encrypted password for a sheet or workbook (HSSF doesn't support encryption)
@@ -78,16 +77,6 @@ public final class PasswordRecord extend
     }
 
     /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public PasswordRecord clone() {
-        return copy();
-    }
-
-    /**
      * Clone this record.
      */
     public PasswordRecord copy() {

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java Wed Dec  9 16:12:33 2020
@@ -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;
 
 /**
  * Describes which reference mode to use
@@ -86,16 +85,6 @@ public final class RefModeRecord extends
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public RefModeRecord clone() {
-        return copy();
-    }
-
     @Override
     public RefModeRecord copy() {
         return new RefModeRecord();

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java Wed Dec  9 16:12:33 2020
@@ -27,7 +27,6 @@ import java.util.function.Supplier;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Stores the row information for the sheet.
@@ -44,7 +43,7 @@ public final class RowRecord extends Sta
 
     private static final BitField outlineLevel  = BitFieldFactory.getInstance(0x07);
     // bit 3 reserved
-    private static final BitField colapsed      = BitFieldFactory.getInstance(0x10);
+    private static final BitField collapsed     = BitFieldFactory.getInstance(0x10);
     private static final BitField zeroHeight    = BitFieldFactory.getInstance(0x20);
     private static final BitField badFontHeight = BitFieldFactory.getInstance(0x40);
     private static final BitField formatted     = BitFieldFactory.getInstance(0x80);
@@ -52,7 +51,7 @@ public final class RowRecord extends Sta
     private static final BitField xfIndex       = BitFieldFactory.getInstance(0xFFF);
     private static final BitField topBorder     = BitFieldFactory.getInstance(0x1000);
     private static final BitField bottomBorder  = BitFieldFactory.getInstance(0x2000);
-    private static final BitField phoeneticGuide  = BitFieldFactory.getInstance(0x4000);
+    private static final BitField phoneticGuide = BitFieldFactory.getInstance(0x4000);
     // bit 15 is unused
 
     private int field_1_row_number;
@@ -175,7 +174,7 @@ public final class RowRecord extends Sta
      * @param c - collapse or not
      */
     public void setColapsed(boolean c) {
-        field_7_option_flags = colapsed.setBoolean(field_7_option_flags, c);
+        field_7_option_flags = collapsed.setBoolean(field_7_option_flags, c);
     }
 
     /**
@@ -238,7 +237,7 @@ public final class RowRecord extends Sta
      * @param f use phoenetic guide
      */
     public void setPhoeneticGuide(boolean f) {
-    	field_8_option_flags = phoeneticGuide.setBoolean(field_8_option_flags, f);
+    	field_8_option_flags = phoneticGuide.setBoolean(field_8_option_flags, f);
     }
 
     /**
@@ -307,7 +306,7 @@ public final class RowRecord extends Sta
      * @see #getOptionFlags()
      */
     public boolean getColapsed() {
-        return (colapsed.isSet(field_7_option_flags));
+        return (collapsed.isSet(field_7_option_flags));
     }
 
     /**
@@ -381,7 +380,7 @@ public final class RowRecord extends Sta
      * @return has phoentic guide
      */
     public boolean getPhoeneticGuide() {
-    	return phoeneticGuide.isSet(field_8_option_flags);
+    	return phoneticGuide.isSet(field_8_option_flags);
     }
 
     public void serialize(LittleEndianOutput out) {
@@ -403,16 +402,6 @@ public final class RowRecord extends Sta
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public RowRecord clone() {
-        return copy();
-    }
-
     @Override
     public RowRecord copy() {
       return new RowRecord(this);
@@ -433,11 +422,11 @@ public final class RowRecord extends Sta
         m.put("optimized", this::getOptimize);
         m.put("reserved", () -> field_6_reserved);
         m.put("options", getBitsAsString(this::getOptionFlags,
-            new BitField[]{colapsed,zeroHeight,badFontHeight,formatted},
+            new BitField[]{collapsed,zeroHeight,badFontHeight,formatted},
             new String[]{"COLAPSED","ZERO_HEIGHT","BAD_FONT_HEIGHT","FORMATTED"}));
         m.put("outlineLevel", this::getOutlineLevel);
         m.put("optionFlags2", getBitsAsString(this::getOptionFlags2,
-            new BitField[]{topBorder, bottomBorder, phoeneticGuide},
+            new BitField[]{topBorder, bottomBorder, phoneticGuide},
             new String[]{"TOP_BORDER","BOTTOM_BORDER","PHOENETIC_GUIDE"}));
         m.put("xfIndex", this::getXFIndex);
         return Collections.unmodifiableMap(m);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java Wed Dec  9 16:12:33 2020
@@ -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 window's zoom magnification.<p>
@@ -64,16 +63,6 @@ public final class SCLRecord extends Sta
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SCLRecord clone() {
-        return copy();
-    }
-
     @Override
     public SCLRecord copy() {
         return new SCLRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java Wed Dec  9 16:12:33 2020
@@ -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;
 
 /**
  * Record for the top margin.
@@ -67,16 +66,6 @@ public final class TopMarginRecord exten
     public void setMargin( double field_1_margin )
     {        this.field_1_margin = field_1_margin;    }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public TopMarginRecord clone() {
-        return copy();
-    }
-
     @Override
     public TopMarginRecord copy() {
         return new TopMarginRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java Wed Dec  9 16:12:33 2020
@@ -24,7 +24,6 @@ import java.util.function.Supplier;
 import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Unknown record just tells you the sid so you can figure out what records you are missing.
@@ -265,16 +264,6 @@ public final class UnknownRecord extends
         return false;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public UnknownRecord clone() {
-        return copy();
-    }
-
     @Override
     public UnknownRecord copy() {
         // immutable - OK to return this

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/UserSViewBegin.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/UserSViewBegin.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/UserSViewBegin.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/UserSViewBegin.java Wed Dec  9 16:12:33 2020
@@ -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;
 
 /**
  * The UserSViewBegin record specifies settings for a custom view associated with the sheet.
@@ -78,16 +77,6 @@ public final class UserSViewBegin extend
         return Arrays.copyOf(_rawData, 16);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public UserSViewBegin clone() {
-        return copy();
-    }
-
     @Override
     public UserSViewBegin copy() {
         return new UserSViewBegin(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java Wed Dec  9 16:12:33 2020
@@ -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;
 
 /**
  * Sheet window settings
@@ -461,16 +460,6 @@ public final class WindowTwoRecord exten
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public WindowTwoRecord clone() {
-        return copy();
-    }
-
     @Override
     public WindowTwoRecord copy() {
         return new WindowTwoRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java Wed Dec  9 16:12:33 2020
@@ -23,7 +23,6 @@ import java.util.List;
 import org.apache.poi.common.Duplicatable;
 import org.apache.poi.hssf.model.RecordStream;
 import org.apache.poi.hssf.record.ColumnInfoRecord;
-import org.apache.poi.util.Removal;
 
 public final class ColumnInfoRecordsAggregate extends RecordAggregate implements Duplicatable {
 	/**
@@ -61,17 +60,6 @@ public final class ColumnInfoRecordsAggr
 		}
 	}
 
-	/**
-	 * @deprecated use {@link #copy()} instead
-	 */
-	@Override
-	@SuppressWarnings("squid:S2975")
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public ColumnInfoRecordsAggregate clone() {
-		return copy();
-	}
-
 	@Override
 	public ColumnInfoRecordsAggregate copy() {
 		return new ColumnInfoRecordsAggregate(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java Wed Dec  9 16:12:33 2020
@@ -30,7 +30,6 @@ import org.apache.poi.util.GenericRecord
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Border Formatting Block of the Conditional Formatting Rule Record.
@@ -463,16 +462,6 @@ public final class BorderFormatting impl
         return GenericRecordJsonWriter.marshal(this);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public BorderFormatting clone() {
-        return copy();
-    }
-
     public BorderFormatting copy() {
       return new BorderFormatting(this);
     }

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java Wed Dec  9 16:12:33 2020
@@ -32,7 +32,6 @@ import org.apache.poi.util.LittleEndianI
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Color Gradient / Color Scale Conditional Formatting Rule Record.
@@ -151,16 +150,6 @@ public final class ColorGradientFormatti
         return GenericRecordJsonWriter.marshal(this);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ColorGradientFormatting clone() {
-        return copy();
-    }
-
     public ColorGradientFormatting copy()  {
         return new ColorGradientFormatting(this);
     }

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java Wed Dec  9 16:12:33 2020
@@ -25,7 +25,6 @@ import org.apache.poi.common.usermodel.G
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Color Gradient / Color Scale specific Threshold / value (CFVO),
@@ -60,16 +59,6 @@ public final class ColorGradientThreshol
         return super.getDataLength() + 8;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ColorGradientThreshold clone() {
-        return copy();
-    }
-
     @Override
     public ColorGradientThreshold copy() {
       return new ColorGradientThreshold(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java Wed Dec  9 16:12:33 2020
@@ -19,7 +19,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.Removal;
 
 /**
  * Data Bar specific Threshold / value (CFVO),
@@ -39,16 +38,6 @@ public final class DataBarThreshold exte
         super(in);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DataBarThreshold clone() {
-        return copy();
-    }
-
     @Override
     public DataBarThreshold copy() {
       return new DataBarThreshold(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java Wed Dec  9 16:12:33 2020
@@ -33,7 +33,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordJsonWriter;
 import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.Removal;
 
 /**
  * Font Formatting Block of the Conditional Formatting Rule Record.
@@ -66,71 +65,6 @@ public final class FontFormatting implem
     private static final BitField SHADOW = BitFieldFactory.getInstance(0x00000010);
     private static final BitField CANCELLATION = BitFieldFactory.getInstance(0x00000080);
 
-    /**
-     * Escapement type - None
-     *
-     * @deprecated use {@link org.apache.poi.ss.usermodel.Font#SS_NONE}
-     */
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public static final short SS_NONE  = 0;
-    /**
-     * Escapement type - Superscript
-     *
-     * @deprecated use {@link org.apache.poi.ss.usermodel.Font#SS_SUPER}
-     */
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public static final short SS_SUPER = 1;
-    /**
-     * Escapement type - Subscript
-     *
-     * @deprecated use {@link org.apache.poi.ss.usermodel.Font#SS_SUB}
-     */
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public static final short SS_SUB   = 2;
-    /**
-     * Underline type - None
-     *
-     * @deprecated use {@link org.apache.poi.ss.usermodel.Font#U_NONE}
-     */
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public static final byte U_NONE               = 0;
-    /**
-     * Underline type - Single
-     *
-     * @deprecated use {@link org.apache.poi.ss.usermodel.Font#U_SINGLE}
-     */
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public static final byte U_SINGLE             = 1;
-    /**
-     * Underline type - Double
-     *
-     * @deprecated use {@link org.apache.poi.ss.usermodel.Font#U_DOUBLE}
-     */
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public static final byte U_DOUBLE             = 2;
-    /**
-     * Underline type - Single Accounting
-     *
-     * @deprecated use {@link org.apache.poi.ss.usermodel.Font#U_SINGLE_ACCOUNTING}
-     */
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public static final byte U_SINGLE_ACCOUNTING  = 0x21;
-    /**
-     * Underline type - Double Accounting
-     *
-     * @deprecated use {@link org.apache.poi.ss.usermodel.Font#U_DOUBLE_ACCOUNTING}
-     */
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public static final byte U_DOUBLE_ACCOUNTING  = 0x22;
-
     /** Normal boldness (not bold) */
     private static final short FONT_WEIGHT_NORMAL = 0x190;
 

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java Wed Dec  9 16:12:33 2020
@@ -32,7 +32,6 @@ import org.apache.poi.util.LittleEndianI
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Icon / Multi-State Conditional Formatting Rule Record.
@@ -121,16 +120,6 @@ public final class IconMultiStateFormatt
         return GenericRecordJsonWriter.marshal(this);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public IconMultiStateFormatting clone()  {
-        return copy();
-    }
-
     @Override
     public IconMultiStateFormatting copy()  {
         return new IconMultiStateFormatting(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java Wed Dec  9 16:12:33 2020
@@ -28,7 +28,6 @@ import org.apache.poi.hssf.record.Standa
 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 area format record is used to define the colours and patterns for an area.
@@ -87,16 +86,6 @@ public final class AreaFormatRecord exte
     }
 
     /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public AreaFormatRecord clone() {
-        return copy();
-    }
-
-    /**
      * Get the foreground color field for the AreaFormat record.
      */
     public int getForegroundColor()

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java Wed Dec  9 16:12:33 2020
@@ -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 area record is used to define a area chart.
@@ -66,16 +65,6 @@ public final class AreaRecord extends St
     }
 
     /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public AreaRecord clone() {
-        return copy();
-    }
-
-    /**
      * Get the format flags field for the Area record.
      */
     public short getFormatFlags()

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java Wed Dec  9 16:12:33 2020
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.Record
 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 size and location
@@ -80,16 +79,6 @@ public final class AxisParentRecord exte
     }
 
     /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public AxisParentRecord clone() {
-        return copy();
-    }
-
-    /**
      * Get the axis type field for the AxisParent record.
      *
      * @return  One of

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java Wed Dec  9 16:12:33 2020
@@ -28,7 +28,6 @@ import org.apache.poi.hssf.record.Standa
 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 bar record is used to define a bar chart.
@@ -77,16 +76,6 @@ public final class BarRecord extends Sta
     }
 
     /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public BarRecord clone() {
-        return copy();
-    }
-
-    /**
      * Get the bar space field for the Bar record.
      */
     public short getBarSpace()

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java Wed Dec  9 16:12:33 2020
@@ -24,7 +24,6 @@ import org.apache.poi.hssf.record.HSSFRe
 import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The begin record defines the start of a block of records for a (graphing
@@ -58,16 +57,6 @@ public final class BeginRecord extends S
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public BeginRecord clone() {
-        return copy();
-    }
-
     @Override
     public BeginRecord copy() {
         return new BeginRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java Wed Dec  9 16:12:33 2020
@@ -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;
 
 /**
  * This record refers to a category or series axis and is used to specify label/tickmark frequency.
@@ -79,16 +78,6 @@ public final class CategorySeriesAxisRec
     }
 
     /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public CategorySeriesAxisRecord clone() {
-        return copy();
-    }
-
-    /**
      * Get the crossing point field for the CategorySeriesAxis record.
      */
     public short getCrossingPoint()

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java Wed Dec  9 16:12:33 2020
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.Record
 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;
 
 /**
  * ENDBLOCK - Chart Future Record Type End Block (0x0853)
@@ -81,17 +80,6 @@ public final class ChartEndBlockRecord e
 		out.write(unused);
 	}
 
-	/**
-	 * @deprecated use {@link #copy()} instead
-	 */
-	@Override
-	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public ChartEndBlockRecord clone() {
-		return copy();
-	}
-
 	@Override
 	public ChartEndBlockRecord copy() {
 		return new ChartEndBlockRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java Wed Dec  9 16:12:33 2020
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.Record
 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;
 
 /**
  * CHART (0x1002)<p>
@@ -84,16 +83,6 @@ public final class ChartRecord extends S
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ChartRecord clone() {
-        return copy();
-    }
-
     @Override
     public ChartRecord copy() {
         return new ChartRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java Wed Dec  9 16:12:33 2020
@@ -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 dat record is used to store options for the chart.
@@ -66,16 +65,6 @@ public final class DatRecord extends Sta
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DatRecord clone() {
-        return copy();
-    }
-
     @Override
     public DatRecord copy() {
         return new DatRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java Wed Dec  9 16:12:33 2020
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.Record
 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 default data label text properties record identifies the text characteristics of the preceding text record.
@@ -62,16 +61,6 @@ public final class DefaultDataLabelTextP
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DefaultDataLabelTextPropertiesRecord clone() {
-        return copy();
-    }
-
     @Override
     public DefaultDataLabelTextPropertiesRecord copy() {
         return new DefaultDataLabelTextPropertiesRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java Wed Dec  9 16:12:33 2020
@@ -24,7 +24,6 @@ import org.apache.poi.hssf.record.HSSFRe
 import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The end record defines the end of a block of records for a (Graphing)
@@ -56,16 +55,6 @@ public final class EndRecord extends Sta
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public EndRecord clone() {
-        return copy();
-    }
-
     @Override
     public EndRecord copy() {
         // No data so nothing to copy

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java Wed Dec  9 16:12:33 2020
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.Record
 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 font basis record stores various font metrics. */
 public final class FontBasisRecord extends StandardRecord {
@@ -74,16 +73,6 @@ public final class FontBasisRecord exten
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FontBasisRecord clone() {
-        return copy();
-    }
-
     @Override
     public FontBasisRecord copy() {
         return new FontBasisRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java Wed Dec  9 16:12:33 2020
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.Record
 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 font index record indexes into the font table for the text record. */
 public final class FontIndexRecord extends StandardRecord {
@@ -56,24 +55,12 @@ public final class FontIndexRecord exten
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FontIndexRecord clone() {
-        return copy();
-    }
-
     @Override
     public FontIndexRecord copy() {
         return new FontIndexRecord(this);
     }
 
 
-
-
     /**
      * Get the font index field for the FontIndex record.
      */

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java Wed Dec  9 16:12:33 2020
@@ -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 frame record indicates whether there is a border around the displayed text of a chart.
@@ -71,16 +70,6 @@ public final class FrameRecord extends S
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FrameRecord clone() {
-        return copy();
-    }
-
     @Override
     public FrameRecord copy() {
         return new FrameRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java Wed Dec  9 16:12:33 2020
@@ -27,7 +27,6 @@ import org.apache.poi.hssf.record.Record
 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;
 
 /**
  * Links text to an object on the chart or identifies it as the title.
@@ -75,16 +74,6 @@ public final class ObjectLinkRecord exte
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ObjectLinkRecord clone() {
-        return copy();
-    }
-
     @Override
     public ObjectLinkRecord copy() {
         return new ObjectLinkRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java Wed Dec  9 16:12:33 2020
@@ -24,7 +24,6 @@ import org.apache.poi.hssf.record.HSSFRe
 import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * preceeds and identifies a frame as belonging to the plot area.
@@ -51,16 +50,6 @@ public final class PlotAreaRecord extend
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public PlotAreaRecord clone() {
-        return copy();
-    }
-
     @Override
     public PlotAreaRecord copy() {
         return new PlotAreaRecord();

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java Wed Dec  9 16:12:33 2020
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.Record
 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;
 
 /**
  * links a series to its position in the series list.
@@ -58,16 +57,6 @@ public final class SeriesIndexRecord ext
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SeriesIndexRecord clone() {
-        return copy();
-    }
-
     @Override
     public SeriesIndexRecord copy() {
         return new SeriesIndexRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java Wed Dec  9 16:12:33 2020
@@ -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 series label record defines the type of label associated with the data format record.
@@ -70,16 +69,6 @@ public final class SeriesLabelsRecord ex
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SeriesLabelsRecord clone() {
-        return copy();
-    }
-
     @Override
     public SeriesLabelsRecord copy() {
         return new SeriesLabelsRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java Wed Dec  9 16:12:33 2020
@@ -37,7 +37,6 @@ import org.apache.poi.ss.usermodel.DataF
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.ss.util.DateFormatConverter;
 import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.Removal;
 
 /**
  * Format a value according to the standard Excel behavior.  This "standard" is
@@ -448,24 +447,6 @@ public class CellFormat {
     }
 
     /**
-     * Returns the ultimate cell type, following the results of formulas.  If
-     * the cell is a {@link CellType#FORMULA}, this returns the result of
-     * {@link Cell#getCachedFormulaResultType()}.  Otherwise this returns the
-     * result of {@link Cell#getCellType()}.
-     *
-     * @param cell The cell.
-     *
-     * @return The ultimate type of this cell.
-     * @since POI 3.15 beta 3
-     * @deprecated use <code>ultimateType</code> instead
-     */
-    @Deprecated
-    @Removal(version = "4.2")
-    public static CellType ultimateTypeEnum(Cell cell) {
-        return ultimateType(cell);
-    }
-
-    /**
      * Returns <tt>true</tt> if the other object is a {@link CellFormat} object
      * with the same format.
      *

Modified: poi/trunk/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java Wed Dec  9 16:12:33 2020
@@ -23,7 +23,6 @@ import java.util.regex.Pattern;
 
 import org.apache.poi.ss.util.CellReference;
 import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.util.Removal;
 
 /**
  * Formats sheet names for use in formula expressions.
@@ -55,40 +54,6 @@ public final class SheetNameFormatter {
 	}
 
     /**
-     * @deprecated Only kept for binary compatibility, will be replaced by the version with Appendable as parameter
-     */
-    @Deprecated
-    @Removal(version="5.0.0")
-    public static void appendFormat(StringBuffer out, String rawSheetName) {
-        appendFormat((Appendable)out, rawSheetName);
-    }
-
-    /**
-     * @deprecated Only kept for binary compatibility, will be replaced by the version with Appendable as parameter
-     */
-    @Deprecated
-    @Removal(version="5.0.0")
-    public static void appendFormat(StringBuffer out, String workbookName, String rawSheetName) {
-        appendFormat((Appendable)out, workbookName, rawSheetName);
-    }
-
-    /**
-     * Only kept for binary compatibility, will be replaced by the version with Appendable as parameter
-     */
-    @Removal(version="5.0.0")
-    public static void appendFormat(StringBuilder out, String rawSheetName) {
-        appendFormat((Appendable)out, rawSheetName);
-    }
-
-    /**
-     * Only kept for binary compatibility, will be replaced by the version with Appendable as parameter
-     */
-    @Removal(version="5.0.0")
-    public static void appendFormat(StringBuilder out, String workbookName, String rawSheetName) {
-        appendFormat((Appendable)out, workbookName, rawSheetName);
-    }
-
-    /**
      * Convenience method for ({@link #format(String)}) when a StringBuffer is already available.
      *
      * @param out - sheet name will be appended here possibly with delimiting quotes

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java Wed Dec  9 16:12:33 2020
@@ -25,7 +25,6 @@ import java.util.function.Supplier;
 import org.apache.poi.common.Duplicatable;
 import org.apache.poi.common.usermodel.GenericRecord;
 import org.apache.poi.util.GenericRecordUtil;
-import org.apache.poi.util.Removal;
 
 /**
  * Definition of a property of some text, or its paragraph. Defines
@@ -96,14 +95,6 @@ public class TextProp implements Duplica
 	 */
 	public void setValue(int val) { dataValue = val; }
 
-	@Override
-	@SuppressWarnings("squid:S2975")
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public TextProp clone() {
-		return copy();
-	}
-
 	/**
 	 * Clone, eg when you want to actually make use of one of these.
 	 */

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java?rev=1884256&r1=1884255&r2=1884256&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java Wed Dec  9 16:12:33 2020
@@ -32,7 +32,6 @@ import org.apache.poi.hwpf.sprm.TableSpr
 import org.apache.poi.util.Internal;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 public class Paragraph extends Range implements Duplicatable {
     private static final POILogger log = POILogFactory.getLogger( Paragraph.class );
@@ -593,14 +592,6 @@ public class Paragraph extends Range imp
     }
 
     @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public Paragraph clone() {
-        return copy();
-    }
-
-    @Override
     public Paragraph copy() {
         return new Paragraph(this);
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org