You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2015/07/14 22:52:07 UTC
svn commit: r1691079 -
/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
Author: nick
Date: Tue Jul 14 20:52:07 2015
New Revision: 1691079
URL: http://svn.apache.org/r1691079
Log:
#58138 Color object support for HSSF CF borders
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java?rev=1691079&r1=1691078&r2=1691079&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java Tue Jul 14 20:52:07 2015
@@ -20,6 +20,7 @@ package org.apache.poi.hssf.usermodel;
import org.apache.poi.hssf.record.CFRuleBase;
import org.apache.poi.hssf.record.cf.BorderFormatting;
import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.Color;
/**
* High level representation for Border Formatting component
@@ -72,23 +73,42 @@ public final class HSSFBorderFormatting
public short getDiagonalBorderColor() {
return (short)borderFormatting.getDiagonalBorderColor();
}
+ public HSSFColor getDiagonalBorderColorColor() {
+ return workbook.getCustomPalette().getColor(
+ borderFormatting.getDiagonalBorderColor()
+ );
+ }
public short getLeftBorderColor() {
return (short)borderFormatting.getLeftBorderColor();
}
+ public HSSFColor getLeftBorderColorColor() {
+ return workbook.getCustomPalette().getColor(
+ borderFormatting.getLeftBorderColor()
+ );
+ }
public short getRightBorderColor() {
return (short)borderFormatting.getRightBorderColor();
}
+ public HSSFColor getRightBorderColorColor() {
+ return workbook.getCustomPalette().getColor(
+ borderFormatting.getRightBorderColor()
+ );
+ }
public short getTopBorderColor() {
return (short)borderFormatting.getTopBorderColor();
}
+ public HSSFColor getTopBorderColorColor() {
+ return workbook.getCustomPalette().getColor(
+ borderFormatting.getTopBorderColor()
+ );
+ }
public boolean isBackwardDiagonalOn() {
return borderFormatting.isBackwardDiagonalOn();
}
-
public boolean isForwardDiagonalOn() {
return borderFormatting.isForwardDiagonalOn();
}
@@ -99,6 +119,12 @@ public final class HSSFBorderFormatting
cfRuleRecord.setTopLeftBottomRightBorderModified(on);
}
}
+ public void setForwardDiagonalOn(boolean on) {
+ borderFormatting.setForwardDiagonalOn(on);
+ if (on) {
+ cfRuleRecord.setBottomLeftTopRightBorderModified(on);
+ }
+ }
public void setBorderBottom(short border) {
borderFormatting.setBorderBottom(border);
@@ -155,6 +181,14 @@ public final class HSSFBorderFormatting
cfRuleRecord.setBottomBorderModified(false);
}
}
+ public void setBottomBorderColor(Color color) {
+ HSSFColor hcolor = HSSFColor.toHSSFColor(color);
+ if (hcolor == null) {
+ setBottomBorderColor((short)0);
+ } else {
+ setBottomBorderColor(hcolor.getIndex());
+ }
+ }
public void setDiagonalBorderColor(short color) {
borderFormatting.setDiagonalBorderColor(color);
@@ -166,11 +200,12 @@ public final class HSSFBorderFormatting
cfRuleRecord.setTopLeftBottomRightBorderModified(false);
}
}
-
- public void setForwardDiagonalOn(boolean on) {
- borderFormatting.setForwardDiagonalOn(on);
- if (on) {
- cfRuleRecord.setBottomLeftTopRightBorderModified(on);
+ public void setDiagonalBorderColor(Color color) {
+ HSSFColor hcolor = HSSFColor.toHSSFColor(color);
+ if (hcolor == null) {
+ setDiagonalBorderColor((short)0);
+ } else {
+ setDiagonalBorderColor(hcolor.getIndex());
}
}
@@ -182,6 +217,14 @@ public final class HSSFBorderFormatting
cfRuleRecord.setLeftBorderModified(false);
}
}
+ public void setLeftBorderColor(Color color) {
+ HSSFColor hcolor = HSSFColor.toHSSFColor(color);
+ if (hcolor == null) {
+ setLeftBorderColor((short)0);
+ } else {
+ setLeftBorderColor(hcolor.getIndex());
+ }
+ }
public void setRightBorderColor(short color) {
borderFormatting.setRightBorderColor(color);
@@ -191,6 +234,14 @@ public final class HSSFBorderFormatting
cfRuleRecord.setRightBorderModified(false);
}
}
+ public void setRightBorderColor(Color color) {
+ HSSFColor hcolor = HSSFColor.toHSSFColor(color);
+ if (hcolor == null) {
+ setRightBorderColor((short)0);
+ } else {
+ setRightBorderColor(hcolor.getIndex());
+ }
+ }
public void setTopBorderColor(short color) {
borderFormatting.setTopBorderColor(color);
@@ -200,4 +251,12 @@ public final class HSSFBorderFormatting
cfRuleRecord.setTopBorderModified(false);
}
}
+ public void setTopBorderColor(Color color) {
+ HSSFColor hcolor = HSSFColor.toHSSFColor(color);
+ if (hcolor == null) {
+ setTopBorderColor((short)0);
+ } else {
+ setTopBorderColor(hcolor.getIndex());
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org