From 783ebda7f302e2ba4ef8221ee00641cb59668bb5 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 11 May 2025 09:56:45 +0000 Subject: [PATCH] reformat git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1925495 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/xssf/usermodel/XSSFColor.java | 139 ++++++++++-------- 1 file changed, 74 insertions(+), 65 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 d7324431ba..849235a11d 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 @@ -33,7 +33,7 @@ public class XSSFColor extends ExtendedColor { /** * @param color The ooxml color object to use - * @param map The IndexedColorMap to use instead of the default one (can be null) + * @param map The IndexedColorMap to use instead of the default one (can be null) * @return null if color is null, new instance otherwise */ public static XSSFColor from(CTColor color, IndexedColorMap map) { @@ -63,6 +63,7 @@ public class XSSFColor extends ExtendedColor { /** * new color with the given indexed color map + * * @param colorMap The IndexedColorMap to use instead of the default one (can be null) */ public XSSFColor(IndexedColorMap colorMap) { @@ -71,6 +72,7 @@ public class XSSFColor extends ExtendedColor { /** * TEST ONLY + * * @param clr awt Color * @param map The IndexedColorMap to use instead of the default one (can be null) */ @@ -80,7 +82,7 @@ public class XSSFColor extends ExtendedColor { } /** - * @param rgb The RGB-byte-values for the Color + * @param rgb The RGB-byte-values for the Color * @param colorMap The IndexedColorMap to use instead of the default one (can be null) */ public XSSFColor(byte[] rgb, IndexedColorMap colorMap) { @@ -98,7 +100,7 @@ public class XSSFColor extends ExtendedColor { /** * @param indexedColor color index (Enum named for default colors) - * @param colorMap The IndexedColorMap to use instead of the default one + * @param colorMap The IndexedColorMap to use instead of the default one */ public XSSFColor(IndexedColors indexedColor, IndexedColorMap colorMap) { this(CTColor.Factory.newInstance(), colorMap); @@ -163,8 +165,9 @@ public class XSSFColor extends ExtendedColor { */ @Override public short getIndex() { - return (short)ctColor.getIndexed(); + return (short) ctColor.getIndexed(); } + /** * @return Indexed ctColor value. Only used for backwards compatibility. References a ctColor in indexedColors. */ @@ -174,82 +177,84 @@ public class XSSFColor extends ExtendedColor { /** * Indexed ctColor value. Only used for backwards compatibility. References a ctColor in indexedColors. + * * @param indexed color index */ public void setIndexed(int indexed) { ctColor.setIndexed(indexed); } - /** - * Standard Red Green Blue ctColor value (RGB). - * If there was an A (Alpha) value, it will be stripped. - */ - @Override - public byte[] getRGB() { - byte[] rgb = getRGBOrARGB(); - if(rgb == null) { - return null; - } + /** + * Standard Red Green Blue ctColor value (RGB). + * If there was an A (Alpha) value, it will be stripped. + */ + @Override + public byte[] getRGB() { + byte[] rgb = getRGBOrARGB(); + if (rgb == null) { + return null; + } - // Need to trim off the alpha - return rgb.length == 4 ? Arrays.copyOfRange(rgb, 1, 4) : rgb; - } - - /** - * Standard Alpha Red Green Blue ctColor value (ARGB). - */ - @Override - public byte[] getARGB() { - byte[] rgb = getRGBOrARGB(); - if(rgb == null) { - return null; - } - - if(rgb.length == 3) { - // Pad with the default Alpha - byte[] tmp = new byte[4]; - tmp[0] = -1; - System.arraycopy(rgb, 0, tmp, 1, 3); - return tmp; - } else { - return rgb; - } - } - - @Override - protected byte[] getStoredRGB() { - return ctColor.getRgb(); - } - - @Override - protected byte[] getIndexedRGB() { - if (isIndexed()) { - if (indexedColorMap != null) return indexedColorMap.getRGB(getIndex()); - return DefaultIndexedColorMap.getDefaultRGB(getIndex()); - } - return null; - } + // Need to trim off the alpha + return rgb.length == 4 ? Arrays.copyOfRange(rgb, 1, 4) : rgb; + } /** * Standard Alpha Red Green Blue ctColor value (ARGB). */ - @Override - public void setRGB(byte[] rgb) { - ctColor.setRgb(rgb); + @Override + public byte[] getARGB() { + byte[] rgb = getRGBOrARGB(); + if (rgb == null) { + return null; + } + + if (rgb.length == 3) { + // Pad with the default Alpha + byte[] tmp = new byte[4]; + tmp[0] = -1; + System.arraycopy(rgb, 0, tmp, 1, 3); + return tmp; + } else { + return rgb; + } + } + + @Override + protected byte[] getStoredRGB() { + return ctColor.getRgb(); + } + + @Override + protected byte[] getIndexedRGB() { + if (isIndexed()) { + if (indexedColorMap != null) return indexedColorMap.getRGB(getIndex()); + return DefaultIndexedColorMap.getDefaultRGB(getIndex()); + } + return null; } /** - * Index into the {@code clrScheme} collection, referencing a particular {@code sysClr} or + * Standard Alpha Red Green Blue ctColor value (ARGB). + */ + @Override + public void setRGB(byte[] rgb) { + ctColor.setRgb(rgb); + } + + /** + * Index into the {@code cslrScheme} collection, referencing a particular {@code sysClr} or * {@code srgbClr} value expressed in the Theme part. */ - @Override - public int getTheme() { - return (int)ctColor.getTheme(); + @Override + public int getTheme() { + return (int) ctColor.getTheme(); } /** * Index into the {@code clrScheme} collection, referencing a particular {@code sysClr} or * {@code srgbClr} value expressed in the Theme part. + * * @param theme index */ public void setTheme(int theme) { @@ -354,7 +359,7 @@ public class XSSFColor extends ExtendedColor { * @return the underlying XML bean */ @Internal - public CTColor getCTColor(){ + public CTColor getCTColor() { return ctColor; } @@ -372,11 +377,11 @@ public class XSSFColor extends ExtendedColor { if (color != null && !(color instanceof XSSFColor)) { throw new IllegalArgumentException("Only XSSFColor objects are supported, but had " + color.getClass()); } - return (XSSFColor)color; + return (XSSFColor) color; } @Override - public int hashCode(){ + public int hashCode() { return ctColor.toString().hashCode(); } @@ -387,35 +392,39 @@ public class XSSFColor extends ExtendedColor { } return false; } + private boolean sameARGB(XSSFColor other) { if (isRGB() == other.isRGB()) { return !isRGB() || Arrays.equals(getARGB(), other.getARGB()); } return false; } + private boolean sameTheme(XSSFColor other) { if (isThemed() == other.isThemed()) { return !isThemed() || getTheme() == other.getTheme(); } return false; } + private boolean sameTint(XSSFColor other) { if (hasTint() == other.hasTint()) { return !hasTint() || getTint() == other.getTint(); } return false; } + private boolean sameAuto(XSSFColor other) { return isAuto() == other.isAuto(); } @Override - public boolean equals(Object o){ - if(!(o instanceof XSSFColor)) { + public boolean equals(Object o) { + if (!(o instanceof XSSFColor)) { return false; } - XSSFColor other = (XSSFColor)o; + XSSFColor other = (XSSFColor) o; // Compare each field in ctColor. // Cannot compare ctColor's XML string representation because equivalent