remove deprecated methods on XSSFColor

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

1 files changed, 1 insertions, 44 deletions

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
index 5233bbd5b3..327099acb2 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
@@ -41,44 +41,12 @@ public class XSSFColor extends ExtendedColor {
         return color == null ? null : new XSSFColor(color, map);
     }
 
-    /**
-     * Create an instance of XSSFColor from the supplied XML bean, with default color indexes
-     * @param color The {@link CTColor} to use as color-value.
-     * @deprecated 3.17 beta 1 - pass the workbook styles indexed color map, if any
-     */
-    @Deprecated
-    @Removal(version="4.2")
-    public XSSFColor(CTColor color) {
-        this(color, new DefaultIndexedColorMap());
-    }
-
-    /**
-     * Create an instance of XSSFColor from the supplied XML bean, with the given color indexes
-     * @param color The {@link CTColor} to use as color-value.
-     * @param map The IndexedColorMap to use instead of the default one
-     * @deprecated 4.0.0 - use the factory {@link #from(CTColor, IndexedColorMap)} method instead to check for null CTColor instances.  Make private eventually
-     */
-    @Deprecated
-    @Removal(version = "4.2")
-    public XSSFColor(CTColor color, IndexedColorMap map) {
+    private XSSFColor(CTColor color, IndexedColorMap map) {
         this.ctColor = color;
         this.indexedColorMap = map;
     }
 
     /**
-     * Create an new instance of XSSFColor, without knowledge of any custom indexed colors.
-     * This is OK for just transiently setting indexes, etc. but is discouraged in read/get uses
-     * @deprecated as of 4.0.0, we want to have the indexed map, and all calling contexts have access to it.
-     * @see #XSSFColor(IndexedColorMap)
-     * @see #from(CTColor, IndexedColorMap)
-     */
-    @Deprecated
-    @Removal(version="4.2")
-    public XSSFColor() {
-        this(CTColor.Factory.newInstance(), new DefaultIndexedColorMap());
-    }
-
-    /**
      * new color with the given indexed color map
      * @param colorMap The IndexedColorMap to use instead of the default one
      */
@@ -87,17 +55,6 @@ public class XSSFColor extends ExtendedColor {
     }
 
     /**
-     * Create an instance of XSSFColor from the awt Color
-     * @param clr awt Color
-     * @deprecated 3.17 beta 1 - pass the workbook styles indexed color map, if any
-     */
-    @Deprecated
-    @Removal(version="4.2")
-    public XSSFColor(java.awt.Color clr) {
-        this(clr, new DefaultIndexedColorMap());
-    }
-
-    /**
      * TEST ONLY
      * @param clr awt Color
      * @param map The IndexedColorMap to use instead of the default one