You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2022/12/30 08:11:38 UTC
svn commit: r1906276 - in /poi/trunk: poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java poi/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java
Author: centic
Date: Fri Dec 30 08:11:38 2022
New Revision: 1906276
URL: http://svn.apache.org/viewvc?rev=1906276&view=rev
Log:
Rename method for color from "RBG" to "RGB"
It's a protected method that is not intended to be used
outside anyway.
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java?rev=1906276&r1=1906275&r2=1906276&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java Fri Dec 30 08:11:38 2022
@@ -217,7 +217,7 @@ public class XSSFColor extends ExtendedC
}
@Override
- protected byte[] getStoredRBG() {
+ protected byte[] getStoredRGB() {
return ctColor.getRgb();
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java?rev=1906276&r1=1906275&r2=1906276&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java Fri Dec 30 08:11:38 2022
@@ -28,16 +28,16 @@ import org.apache.poi.ss.usermodel.Exten
/**
* The HSSF file format normally stores Color information in the
* Palette (see PaletteRecord), but for a few cases (eg Conditional
- * Formatting, Sheet Extensions), this XSSF-style color record
+ * Formatting, Sheet Extensions), this XSSF-style color record
* can be used.
*/
public class HSSFExtendedColor extends ExtendedColor {
private org.apache.poi.hssf.record.common.ExtendedColor color;
-
+
public HSSFExtendedColor(org.apache.poi.hssf.record.common.ExtendedColor color) {
this.color = color;
}
-
+
protected org.apache.poi.hssf.record.common.ExtendedColor getExtendedColor() {
return color;
}
@@ -80,7 +80,7 @@ public class HSSFExtendedColor extends E
return argb;
}
- protected byte[] getStoredRBG() {
+ protected byte[] getStoredRGB() {
return getARGB();
}
@@ -108,7 +108,7 @@ public class HSSFExtendedColor extends E
public void setTint(double tint) {
color.setTint(tint);
}
-
+
protected byte[] getIndexedRGB() {
if (isIndexed() && getIndex() > 0) {
int indexNum = getIndex();
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java?rev=1906276&r1=1906275&r2=1906276&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java Fri Dec 30 08:11:38 2022
@@ -21,7 +21,7 @@ import java.util.Locale;
/**
* Represents a XSSF-style color (based on either a
* {@link org.apache.poi.xssf.usermodel.XSSFColor} or a
- * {@link org.apache.poi.hssf.record.common.ExtendedColor}
+ * {@link org.apache.poi.hssf.record.common.ExtendedColor}
*/
public abstract class ExtendedColor implements Color {
@@ -47,17 +47,17 @@ public abstract class ExtendedColor impl
* @return true if the color is RGB / ARGB
*/
public abstract boolean isRGB();
-
+
/**
* @return true if the color is from a Theme
*/
public abstract boolean isThemed();
-
+
/**
* @return Indexed Color index value, if {@link #isIndexed()} is true
*/
public abstract short getIndex();
-
+
/**
* @return Index of Theme color, if {@link #isThemed()} is true
*/
@@ -77,8 +77,8 @@ public abstract class ExtendedColor impl
/**
* @return RGB or ARGB bytes or null
*/
- protected abstract byte[] getStoredRBG();
-
+ protected abstract byte[] getStoredRGB();
+
/**
* Sets the Red Green Blue or Alpha Red Green Blue
* @param rgb bytes
@@ -97,9 +97,9 @@ public abstract class ExtendedColor impl
}
// Grab the colour
- return getStoredRBG();
+ return getStoredRGB();
}
-
+
/**
* @return index color RGB bytes, if {@link #isIndexed()} == true, null if not indexed or index is invalid
*/
@@ -110,7 +110,7 @@ public abstract class ExtendedColor impl
* Alpha values are ignored.
*/
public byte[] getRGBWithTint() {
- byte[] rgb = getStoredRBG();
+ byte[] rgb = getStoredRGB();
if (rgb != null) {
if(rgb.length == 4) {
byte[] tmp = new byte[3];
@@ -146,7 +146,7 @@ public abstract class ExtendedColor impl
}
return sb.toString().toUpperCase(Locale.ROOT);
}
-
+
/**
* Sets the ARGB value from hex format, eg FF0077FF.
* Only works for regular (non-indexed) colours
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org