You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by on...@apache.org on 2016/04/05 23:38:55 UTC
svn commit: r1737886 -
/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
Author: onealj
Date: Tue Apr 5 21:38:55 2016
New Revision: 1737886
URL: http://svn.apache.org/viewvc?rev=1737886&view=rev
Log:
bug 59264: type safety: check if border code is a valid BorderStyle enum for setBorderX(short)
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java?rev=1737886&r1=1737885&r2=1737886&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java Tue Apr 5 21:38:55 2016
@@ -790,33 +790,11 @@ public class XSSFCellStyle implements Ce
* Set the type of border to use for the bottom border of the cell
*
* @param border the type of border to use
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_NONE
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_THIN
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASHED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DOTTED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_THICK
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DOUBLE
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_HAIR
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASHED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASH_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASH_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASH_DOT_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASH_DOT_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 1
+ * @deprecated 3.15 beta 1. Use {@link #setBorderBottom(BorderStyle)}
*/
@Override
public void setBorderBottom(short border) {
- CTBorder ct = getCTBorder();
- CTBorderPr pr = ct.isSetBottom() ? ct.getBottom() : ct.addNewBottom();
- if(border == BORDER_NONE) ct.unsetBottom();
- else pr.setStyle(STBorderStyle.Enum.forInt(border + 1));
-
- int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
- _cellXf.setBorderId(idx);
- _cellXf.setApplyBorder(true);
+ setBorderBottom(BorderStyle.valueOf(border));
}
/**
@@ -827,39 +805,25 @@ public class XSSFCellStyle implements Ce
*/
@Override
public void setBorderBottom(BorderStyle border) {
- setBorderBottom(border.getCode());
+ CTBorder ct = getCTBorder();
+ CTBorderPr pr = ct.isSetBottom() ? ct.getBottom() : ct.addNewBottom();
+ if(border == BorderStyle.NONE) ct.unsetBottom();
+ else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
+
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
+
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
* Set the type of border to use for the left border of the cell
* @param border the type of border to use
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_NONE
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_THIN
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASHED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DOTTED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_THICK
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DOUBLE
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_HAIR
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASHED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASH_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASH_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASH_DOT_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASH_DOT_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 1
+ * @deprecated 3.15 beta 1. Use {@link #setBorderLeft(BorderStyle)}
*/
@Override
public void setBorderLeft(short border) {
- CTBorder ct = getCTBorder();
- CTBorderPr pr = ct.isSetLeft() ? ct.getLeft() : ct.addNewLeft();
- if(border == BORDER_NONE) ct.unsetLeft();
- else pr.setStyle(STBorderStyle.Enum.forInt(border + 1));
-
- int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
- _cellXf.setBorderId(idx);
- _cellXf.setApplyBorder(true);
+ setBorderLeft(BorderStyle.valueOf(border));
}
/**
@@ -869,40 +833,26 @@ public class XSSFCellStyle implements Ce
*/
@Override
public void setBorderLeft(BorderStyle border) {
- setBorderLeft(border.getCode());
+ CTBorder ct = getCTBorder();
+ CTBorderPr pr = ct.isSetLeft() ? ct.getLeft() : ct.addNewLeft();
+ if(border == BorderStyle.NONE) ct.unsetLeft();
+ else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
+
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
+
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
* Set the type of border to use for the right border of the cell
*
* @param border the type of border to use
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_NONE
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_THIN
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASHED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DOTTED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_THICK
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DOUBLE
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_HAIR
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASHED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASH_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASH_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASH_DOT_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASH_DOT_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 1
+ * @deprecated 3.15 beta 1. Use {@link #setBorderRight(BorderStyle)}
*/
@Override
public void setBorderRight(short border) {
- CTBorder ct = getCTBorder();
- CTBorderPr pr = ct.isSetRight() ? ct.getRight() : ct.addNewRight();
- if(border == BORDER_NONE) ct.unsetRight();
- else pr.setStyle(STBorderStyle.Enum.forInt(border + 1));
-
- int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
- _cellXf.setBorderId(idx);
- _cellXf.setApplyBorder(true);
+ setBorderRight(BorderStyle.valueOf(border));
}
/**
@@ -912,40 +862,26 @@ public class XSSFCellStyle implements Ce
*/
@Override
public void setBorderRight(BorderStyle border) {
- setBorderRight(border.getCode());
+ CTBorder ct = getCTBorder();
+ CTBorderPr pr = ct.isSetRight() ? ct.getRight() : ct.addNewRight();
+ if(border == BorderStyle.NONE) ct.unsetRight();
+ else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
+
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
+
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
* Set the type of border to use for the top border of the cell
*
* @param border the type of border to use
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_NONE
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_THIN
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASHED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DOTTED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_THICK
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DOUBLE
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_HAIR
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASHED
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASH_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASH_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_DASH_DOT_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_MEDIUM_DASH_DOT_DOT
- * @see org.apache.poi.ss.usermodel.CellStyle#BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 1
+ * @deprecated 3.15 beta 1. Use {@link #setBorderTop(BorderStyle)}
*/
@Override
public void setBorderTop(short border) {
- CTBorder ct = getCTBorder();
- CTBorderPr pr = ct.isSetTop() ? ct.getTop() : ct.addNewTop();
- if(border == BORDER_NONE) ct.unsetTop();
- else pr.setStyle(STBorderStyle.Enum.forInt(border + 1));
-
- int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
- _cellXf.setBorderId(idx);
- _cellXf.setApplyBorder(true);
+ setBorderTop(BorderStyle.valueOf(border));
}
/**
@@ -955,7 +891,15 @@ public class XSSFCellStyle implements Ce
*/
@Override
public void setBorderTop(BorderStyle border) {
- setBorderTop(border.getCode());
+ CTBorder ct = getCTBorder();
+ CTBorderPr pr = ct.isSetTop() ? ct.getTop() : ct.addNewTop();
+ if(border == BorderStyle.NONE) ct.unsetTop();
+ else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
+
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
+
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org