put back XSSFColor(java.awt.Color clr) constructor

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1846701 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2018-11-16 07:57:49 +00:00
parent 218a7190ba
commit 46f6c45f6c
1 changed files with 15 additions and 3 deletions

View File

@ -47,7 +47,7 @@ public class XSSFColor extends ExtendedColor {
* @deprecated 3.17 beta 1 - pass the workbook styles indexed color map, if any * @deprecated 3.17 beta 1 - pass the workbook styles indexed color map, if any
*/ */
@Deprecated @Deprecated
@Removal(version="3.19") @Removal(version="4.2")
public XSSFColor(CTColor color) { public XSSFColor(CTColor color) {
this(color, new DefaultIndexedColorMap()); this(color, new DefaultIndexedColorMap());
} }
@ -59,6 +59,7 @@ public class XSSFColor extends ExtendedColor {
* @deprecated 4.0.0 - use the factory {@link #from(CTColor, IndexedColorMap)} method instead to check for null CTColor instances. Make private eventually * @deprecated 4.0.0 - use the factory {@link #from(CTColor, IndexedColorMap)} method instead to check for null CTColor instances. Make private eventually
*/ */
@Deprecated @Deprecated
@Removal(version = "4.2")
public XSSFColor(CTColor color, IndexedColorMap map) { public XSSFColor(CTColor color, IndexedColorMap map) {
this.ctColor = color; this.ctColor = color;
this.indexedColorMap = map; this.indexedColorMap = map;
@ -72,7 +73,7 @@ public class XSSFColor extends ExtendedColor {
* @see #from(CTColor, IndexedColorMap) * @see #from(CTColor, IndexedColorMap)
*/ */
@Deprecated @Deprecated
@Removal(version="4.1") @Removal(version="4.2")
public XSSFColor() { public XSSFColor() {
this(CTColor.Factory.newInstance(), new DefaultIndexedColorMap()); this(CTColor.Factory.newInstance(), new DefaultIndexedColorMap());
} }
@ -84,7 +85,18 @@ public class XSSFColor extends ExtendedColor {
public XSSFColor(IndexedColorMap colorMap) { public XSSFColor(IndexedColorMap colorMap) {
this(CTColor.Factory.newInstance(), colorMap); this(CTColor.Factory.newInstance(), colorMap);
} }
/**
* 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 * TEST ONLY
* @param clr awt Color * @param clr awt Color