Remove more deprecated code (BorderFormatting constants)

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

3 files changed, 1 insertions, 137 deletions

diff --git a/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java b/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
index 8e438c9669..ba63c25c39 100644
--- a/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
+++ b/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
@@ -60,13 +60,6 @@ final class OperandClassTransformer {
 
 	private final FormulaType _formulaType;
 
-	/**
-	 * @deprecated POI 3.15 beta 3. Use {@code OperandClassTransformer(FormulaType)} instead.
-	 */
-	@Removal(version="3.17")
-	public OperandClassTransformer(int formulaType) {
-		this(FormulaType.forInt(formulaType));
-	}
 	public OperandClassTransformer(FormulaType formulaType) {
 		_formulaType = formulaType;
 	}
diff --git a/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java b/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
index 030a33d5a9..3e53865ed2 100644
--- a/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
+++ b/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
@@ -19,96 +19,11 @@
 
 package org.apache.poi.ss.usermodel;
 
-import org.apache.poi.util.Removal;
-
 /**
  * High level representation for Border Formatting component
  * of Conditional Formatting settings
  */
 public interface BorderFormatting {
-    /** No border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#NONE}
-     */
-    @Removal(version="3.17")
-    short BORDER_NONE                = 0x0;
-    
-    /** Thin border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THIN}
-     */
-    @Removal(version="3.17")
-    short BORDER_THIN                = 0x1;
-    
-    /** Medium border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM}
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM              = 0x2;
-    
-    /** dash border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASHED}
-     */
-    @Removal(version="3.17")
-    short BORDER_DASHED              = 0x3;
-    
-    /** dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOTTED}
-     */
-    @Removal(version="3.17")
-    short BORDER_DOTTED              = 0x4;
-    
-    /** Thick border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THICK}
-     */
-    @Removal(version="3.17")
-    short BORDER_THICK               = 0x5;
-    
-    /** double-line border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOUBLE}
-     */
-    @Removal(version="3.17")
-    short BORDER_DOUBLE              = 0x6;
-    
-    /** hair-line border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#HAIR}
-     */
-    @Removal(version="3.17")
-    short BORDER_HAIR                = 0x7;
-    
-    /** Medium dashed border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASHED}
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM_DASHED       = 0x8;
-    
-    /** dash-dot border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_DASH_DOT            = 0x9;
-    
-    /** medium dash-dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM_DASH_DOT     = 0xA;
-    
-    /** dash-dot-dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_DASH_DOT_DOT        = 0xB;
-    
-    /** medium dash-dot-dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM_DASH_DOT_DOT = 0xC;
-    
-    /** slanted dash-dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#SLANTED_DASH_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_SLANTED_DASH_DOT    = 0xD;
 
     /**
      * @deprecated POI 3.15. Use {@link #getBorderBottomEnum()}.
diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java
index 7c54cff814..855c284469 100644
--- a/src/java/org/apache/poi/ss/util/CellUtil.java
+++ b/src/java/org/apache/poi/ss/util/CellUtil.java
@@ -37,7 +37,6 @@ import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Various utility functions that make working with a cells and rows easier. The various methods
@@ -228,22 +227,6 @@ public final class CellUtil {
     /**
      * Take a cell, and apply a font to it
      *
-     * @param cell the cell to set the alignment for 
-     * @param workbook The workbook that is being worked with.
-     * @param font The Font that you want to set.
-     * @throws IllegalArgumentException if <tt>font</tt> and <tt>cell</tt> do not belong to the same workbook
-     *
-     * @deprecated 3.15-beta2. Use {@link #setFont(Cell, Font)} instead.
-     */
-    @Deprecated
-    @Removal(version="3.17")
-    public static void setFont(Cell cell, Workbook workbook, Font font) {
-        setFont(cell, font);
-    }
-    
-    /**
-     * Take a cell, and apply a font to it
-     *
      * @param cell the cell to set the alignment for
      * @param font The Font that you want to set.
      * @throws IllegalArgumentException if <tt>font</tt> and <tt>cell</tt> do not belong to the same workbook
@@ -273,7 +256,7 @@ public final class CellUtil {
      * <p>This is necessary because Excel has an upper limit on the number of styles that it supports.</p>
      * 
      * <p>This function is more efficient than multiple calls to
-     * {@link #setCellStyleProperty(org.apache.poi.ss.usermodel.Cell, org.apache.poi.ss.usermodel.Workbook, String, Object)}
+     * {@link #setCellStyleProperty(org.apache.poi.ss.usermodel.Cell, String, Object)}
      * if adding multiple cell styles.</p>
      * 
      * <p>For performance reasons, if this is the only cell in a workbook that uses a cell style,
@@ -321,33 +304,6 @@ public final class CellUtil {
     /**
      * <p>This method attempts to find an existing CellStyle that matches the <code>cell</code>'s
      * current style plus a single style property <code>propertyName</code> with value
-     * <code>propertyValue<code>.
-     * A new style is created if the workbook does not contain a matching style.</p>
-     * 
-     * <p>Modifies the cell style of <code>cell</code> without affecting other cells that use the
-     * same style.</p>
-     * 
-     * <p>If setting more than one cell style property on a cell, use
-     * {@link #setCellStyleProperties(org.apache.poi.ss.usermodel.Cell, Map)},
-     * which is faster and does not add unnecessary intermediate CellStyles to the workbook.</p>
-     * 
-     * @param cell The cell that is to be changed.
-     * @param workbook The workbook that is being worked with.
-     * @param propertyName The name of the property that is to be changed.
-     * @param propertyValue The value of the property that is to be changed.
-     * 
-     * @deprecated 3.15-beta2. Use {@link #setCellStyleProperty(Cell, String, Object)} instead.
-     */
-    @Deprecated
-    @Removal(version="3.17")
-    public static void setCellStyleProperty(Cell cell, Workbook workbook, String propertyName,
-            Object propertyValue) {
-        setCellStyleProperty(cell, propertyName, propertyValue);
-    }
-
-    /**
-     * <p>This method attempts to find an existing CellStyle that matches the <code>cell</code>'s
-     * current style plus a single style property <code>propertyName</code> with value
      * <code>propertyValue</code>.
      * A new style is created if the workbook does not contain a matching style.</p>
      *