remove some deprecated code

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

3 files changed, 0 insertions, 106 deletions

diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java b/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
index 9c90f349de..b6c286fa6b 100644
--- a/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
@@ -33,7 +33,6 @@ import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Data Bar Conditional Formatting Rule Record.
@@ -154,16 +153,6 @@ public final class DataBarFormatting implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DataBarFormatting clone()  {
-        return copy();
-    }
-
     public DataBarFormatting copy()  {
       return new DataBarFormatting(this);
     }
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
index eb4be956d3..e97e6555f2 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
@@ -294,12 +294,6 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
         return HorizontalAlignment.forInt(_format.getAlignment());
     }
 
-    @Override
-    public HorizontalAlignment getAlignmentEnum()
-    {
-        return getAlignment();
-    }
-
     /**
      * set whether the text should be wrapped
      * @param wrapped  wrap text or not
@@ -336,11 +330,6 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
         return VerticalAlignment.forInt(_format.getVerticalAlignment());
     }
 
-    @Override
-    public VerticalAlignment getVerticalAlignmentEnum() {
-        return getVerticalAlignment();
-    }
-
     /**
      * set the degree of rotation for the text in the cell
      *
@@ -430,9 +419,6 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
         return BorderStyle.valueOf(_format.getBorderLeft());
     }
 
-    @Override
-    public BorderStyle getBorderLeftEnum() { return getBorderLeft(); }
-
     /**
      * set the type of border to use for the right border of the cell
      * @param border type
@@ -451,9 +437,6 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
         return BorderStyle.valueOf(_format.getBorderRight());
     }
 
-    @Override
-    public BorderStyle getBorderRightEnum() { return getBorderRight(); }
-
     /**
      * set the type of border to use for the top border of the cell
      * @param border type
@@ -472,9 +455,6 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
         return BorderStyle.valueOf(_format.getBorderTop());
     }
 
-    @Override
-    public BorderStyle getBorderTopEnum() { return getBorderTop(); }
-
     /**
      * set the type of border to use for the bottom border of the cell
      * @param border type
@@ -493,9 +473,6 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
         return BorderStyle.valueOf(_format.getBorderBottom());
     }
 
-    @Override
-    public BorderStyle getBorderBottomEnum() { return getBorderBottom(); }
-
     /**
      * set the color to use for the left border
      * @param color The index of the color definition
@@ -598,9 +575,6 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
         return FillPatternType.forInt(_format.getAdtlFillPattern());
     }
 
-    @Override
-    public FillPatternType getFillPatternEnum() { return getFillPattern(); }
-
     /**
      * Checks if the background and foreground fills are set correctly when one
      * or the other is set to the default color.
diff --git a/src/java/org/apache/poi/ss/usermodel/CellStyle.java b/src/java/org/apache/poi/ss/usermodel/CellStyle.java
index a809458af0..57395c6bc6 100644
--- a/src/java/org/apache/poi/ss/usermodel/CellStyle.java
+++ b/src/java/org/apache/poi/ss/usermodel/CellStyle.java
@@ -121,15 +121,6 @@ public interface CellStyle {
     HorizontalAlignment getAlignment();
 
     /**
-     * get the type of horizontal alignment for the cell
-     * @return align - the type of alignment
-     * @deprecated use <code>getAlignment()</code> instead
-     */
-    @Removal(version = "4.2")
-    @Deprecated
-    HorizontalAlignment getAlignmentEnum();
-
-    /**
      * Set whether the text should be wrapped.
      * Setting this flag to <code>true</code> make all content visible
      * within a cell by displaying it on multiple lines
@@ -157,15 +148,6 @@ public interface CellStyle {
     VerticalAlignment getVerticalAlignment();
 
     /**
-     * get the type of vertical alignment for the cell
-     * @return align the type of alignment
-     * @deprecated use <code>getVerticalAlignment()</code> instead
-     */
-    @Removal(version = "4.2")
-    @Deprecated
-    VerticalAlignment getVerticalAlignmentEnum();
-
-    /**
      * set the degree of rotation for the text in the cell.
      *
      * Note: HSSF uses values from -90 to 90 degrees, whereas XSSF 
@@ -215,16 +197,6 @@ public interface CellStyle {
     BorderStyle getBorderLeft();
 
     /**
-     * get the type of border to use for the left border of the cell
-     * @return border type
-     * @since POI 3.15
-     * @deprecated use <code>getBorderLeft()</code> instead
-     */
-    @Removal(version = "4.2")
-    @Deprecated
-    BorderStyle getBorderLeftEnum();
-
-    /**
      * set the type of border to use for the right border of the cell
      * @param border type
      * @since POI 3.15
@@ -239,16 +211,6 @@ public interface CellStyle {
     BorderStyle getBorderRight();
 
     /**
-     * get the type of border to use for the right border of the cell
-     * @return border type
-     * @since POI 3.15
-     * @deprecated use <code>getBorderRight()</code> instead
-     */
-    @Removal(version = "4.2")
-    @Deprecated
-    BorderStyle getBorderRightEnum();
-
-    /**
      * set the type of border to use for the top border of the cell
      * @param border type
      * @since POI 3.15
@@ -263,16 +225,6 @@ public interface CellStyle {
     BorderStyle getBorderTop();
 
     /**
-     * get the type of border to use for the top border of the cell
-     * @return border type
-     * @since POI 3.15
-     * @deprecated use <code>getBorderTop()</code> instead
-     */
-    @Removal(version = "4.2")
-    @Deprecated
-    BorderStyle getBorderTopEnum();
-
-    /**
      * set the type of border to use for the bottom border of the cell
      * @param border type
      * @since POI 3.15
@@ -287,16 +239,6 @@ public interface CellStyle {
     BorderStyle getBorderBottom();
 
     /**
-     * get the type of border to use for the bottom border of the cell
-     * @return border type
-     * @since POI 3.15
-     * @deprecated use <code>getBorderBottom()</code> instead
-     */
-    @Removal(version = "4.2")
-    @Deprecated
-    BorderStyle getBorderBottomEnum();
-
-    /**
      * set the color to use for the left border
      * @param color The index of the color definition
      */
@@ -361,17 +303,6 @@ public interface CellStyle {
     FillPatternType getFillPattern();
 
     /**
-     * Get the fill pattern
-     *
-     * @return the fill pattern, default value is {@link FillPatternType#NO_FILL}
-     * @since POI 3.15 beta 3
-     * @deprecated use <code>getFillPattern()</code> instead
-     */
-    @Removal(version = "4.2")
-    @Deprecated
-    FillPatternType getFillPatternEnum();
-
-    /**
      * set the background fill color.
      *
      * @param bg  color