svn commit: r1761376 [3/4] - in /poi/branches/hssf_cryptoapi: ./ sonar/ sonar/examples/ sonar/excelant/ sonar/main/ sonar/ooxml-schema-encryption/ sonar/ooxml-schema-security/ sonar/ooxml-schema/ sona
Modified:
poi/branches/hssf_cryptoapi/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
URL:
http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java?rev=1761376=1761375=1761376=diff
==
---
poi/branches/hssf_cryptoapi/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
(original)
+++
poi/branches/hssf_cryptoapi/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
Mon Sep 19 00:20:44 2016
@@ -35,32 +35,87 @@ public class XSSFBorderFormatting implem
_border = border;
}
+/**
+ * @deprecated POI 3.15. Use {@link #getBorderBottomEnum()}.
+ * This method will return an BorderStyle enum in the future.
+ */
@Override
-public BorderStyle getBorderBottom() {
+public short getBorderBottom() {
+return getBorderBottomEnum().getCode();
+}
+/**
+ * @since POI 3.15
+ */
+@Override
+public BorderStyle getBorderBottomEnum() {
STBorderStyle.Enum ptrn = _border.isSetBottom() ?
_border.getBottom().getStyle() : null;
return ptrn == null ? BorderStyle.NONE :
BorderStyle.valueOf((short)(ptrn.intValue() - 1));
}
+/**
+ * @deprecated POI 3.15. Use {@link #getBorderDiagonalEnum()}.
+ * This method will return an BorderStyle enum in the future.
+ */
@Override
-public BorderStyle getBorderDiagonal() {
+public short getBorderDiagonal() {
+return getBorderDiagonalEnum().getCode();
+}
+/**
+ * @since POI 3.15
+ */
+@Override
+public BorderStyle getBorderDiagonalEnum() {
STBorderStyle.Enum ptrn = _border.isSetDiagonal() ?
_border.getDiagonal().getStyle() : null;
return ptrn == null ? BorderStyle.NONE :
BorderStyle.valueOf((short)(ptrn.intValue() - 1));
}
+/**
+ * @deprecated POI 3.15. Use {@link #getBorderLeftEnum()}.
+ * This method will return an BorderStyle enum in the future.
+ */
+@Override
+public short getBorderLeft() {
+return getBorderLeftEnum().getCode();
+}
+/**
+ * @since POI 3.15
+ */
@Override
-public BorderStyle getBorderLeft() {
+public BorderStyle getBorderLeftEnum() {
STBorderStyle.Enum ptrn = _border.isSetLeft() ?
_border.getLeft().getStyle() : null;
return ptrn == null ? BorderStyle.NONE :
BorderStyle.valueOf((short)(ptrn.intValue() - 1));
}
+/**
+ * @deprecated POI 3.15. Use {@link #getBorderRightEnum()}.
+ * This method will return an BorderStyle enum in the future.
+ */
+@Override
+public short getBorderRight() {
+return getBorderRightEnum().getCode();
+}
+/**
+ * @since POI 3.15
+ */
@Override
-public BorderStyle getBorderRight() {
+public BorderStyle getBorderRightEnum() {
STBorderStyle.Enum ptrn = _border.isSetRight() ?
_border.getRight().getStyle() : null;
return ptrn == null ? BorderStyle.NONE :
BorderStyle.valueOf((short)(ptrn.intValue() - 1));
}
+/**
+ * @deprecated POI 3.15. Use {@link #getBorderTopEnum()}.
+ * This method will return an BorderStyle enum in the future.
+ */
+@Override
+public short getBorderTop() {
+return getBorderTopEnum().getCode();
+}
+/**
+ * @since POI 3.15
+ */
@Override
-public BorderStyle getBorderTop() {
+public BorderStyle getBorderTopEnum() {
STBorderStyle.Enum ptrn = _border.isSetTop() ?
_border.getTop().getStyle() : null;
return ptrn == null ? BorderStyle.NONE :
BorderStyle.valueOf((short)(ptrn.intValue() - 1));
}
Modified:
poi/branches/hssf_cryptoapi/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java?rev=1761376=1761375=1761376=diff
==
---
poi/branches/hssf_cryptoapi/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
(original)
+++
poi/branches/hssf_cryptoapi/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
Mon Sep 19 00:20:44 2016
@@ -668,6 +668,7 @@ public final class XSSFCell implements C
* For forwards compatibility, do not hard-code cell type literals in your
code.
*
* @return the cell type
+ * @deprecated 3.15. Will return a {@link CellType} enum in the future.
*/
@Override
public int getCellType() {
@@ -699,6 +700,7 @@ public final class XSSFCell implements C
* @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
* {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
* on the cached value of the formula
+ * @deprecated 3.15. Will return a {@link CellType} enum in the future.
*/
@Override
svn commit: r1761376 [1/4] - in /poi/branches/hssf_cryptoapi: ./ sonar/ sonar/examples/ sonar/excelant/ sonar/main/ sonar/ooxml-schema-encryption/ sonar/ooxml-schema-security/ sonar/ooxml-schema/ sona
Author: kiwiwings Date: Mon Sep 19 00:20:44 2016 New Revision: 1761376 URL: http://svn.apache.org/viewvc?rev=1761376=rev Log: merge trunk to branch Added: poi/branches/hssf_cryptoapi/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java - copied unchanged from r1761374, poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java poi/branches/hssf_cryptoapi/src/testcases/org/apache/poi/util/NullOutputStream.java - copied unchanged from r1761374, poi/trunk/src/testcases/org/apache/poi/util/NullOutputStream.java poi/branches/hssf_cryptoapi/test-data/openxml4j/invalid.xlsx - copied unchanged from r1761374, poi/trunk/test-data/openxml4j/invalid.xlsx poi/branches/hssf_cryptoapi/test-data/slideshow/60003.ppt (with props) poi/branches/hssf_cryptoapi/test-data/spreadsheet/52425.xlsx - copied unchanged from r1761374, poi/trunk/test-data/spreadsheet/52425.xlsx Modified: poi/branches/hssf_cryptoapi/ (props changed) poi/branches/hssf_cryptoapi/KEYS poi/branches/hssf_cryptoapi/build.xml poi/branches/hssf_cryptoapi/sonar/examples/pom.xml poi/branches/hssf_cryptoapi/sonar/excelant/pom.xml poi/branches/hssf_cryptoapi/sonar/main/pom.xml poi/branches/hssf_cryptoapi/sonar/ooxml-schema-encryption/pom.xml poi/branches/hssf_cryptoapi/sonar/ooxml-schema-security/pom.xml poi/branches/hssf_cryptoapi/sonar/ooxml-schema/pom.xml poi/branches/hssf_cryptoapi/sonar/ooxml/pom.xml poi/branches/hssf_cryptoapi/sonar/pom.xml poi/branches/hssf_cryptoapi/sonar/scratchpad/pom.xml poi/branches/hssf_cryptoapi/src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java poi/branches/hssf_cryptoapi/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java poi/branches/hssf_cryptoapi/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java poi/branches/hssf_cryptoapi/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreatePivotTable.java poi/branches/hssf_cryptoapi/src/examples/src/org/apache/poi/xssf/usermodel/examples/FillsAndColors.java poi/branches/hssf_cryptoapi/src/integrationtest/org/apache/poi/TestAllFiles.java poi/branches/hssf_cryptoapi/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/common/usermodel/Hyperlink.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/sl/usermodel/SlideShow.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/format/CellFormat.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/formula/EvaluationCell.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/formula/functions/DGet.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/Cell.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/CellStyle.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/CellValue.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/CreationHelper.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/DataFormatter.java poi/branches/hssf_cryptoapi/src/java/org/apache/poi/ss/usermodel/FormulaError.java
