bug 59264: move border style deprecations to POI 3.15 beta 2.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1737894 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
index a77361dd72da20c7b8c411ed18ac96f19bb0a862..e5b079aa636e2fa5047aa1f880f4398f42bfcf40 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
@@ -411,7 +411,7 @@ public final class HSSFCellStyle implements CellStyle {
      * @see #BORDER_DASH_DOT_DOT
      * @see #BORDER_MEDIUM_DASH_DOT_DOT
      * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 1
+     * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderLeft(BorderStyle)} instead.
      */
     @Override
     public void setBorderLeft(short border)
@@ -457,7 +457,7 @@ public final class HSSFCellStyle implements CellStyle {
      * @see #BORDER_DASH_DOT_DOT
      * @see #BORDER_MEDIUM_DASH_DOT_DOT
      * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 1
+     * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderRight(BorderStyle)} instead.
      */
     @Override
     public void setBorderRight(short border)
@@ -503,7 +503,7 @@ public final class HSSFCellStyle implements CellStyle {
      * @see #BORDER_DASH_DOT_DOT
      * @see #BORDER_MEDIUM_DASH_DOT_DOT
      * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 1
+     * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderTop(BorderStyle)} instead.
      */
     @Override
     public void setBorderTop(short border)
@@ -549,7 +549,7 @@ public final class HSSFCellStyle implements CellStyle {
      * @see #BORDER_DASH_DOT_DOT
      * @see #BORDER_MEDIUM_DASH_DOT_DOT
      * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 1
+     * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderBottom(BorderStyle)} instead.
      */
     @Override
     public void setBorderBottom(short border)

diff --git a/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java b/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
index 044d34487934517b281d8d26be85a3c70031d5c3..6ee56629cc4248a66a348def429022dd3da4946b 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
+++ b/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
@@ -25,73 +25,73 @@ package org.apache.poi.ss.usermodel;
  */\r
 public interface BorderFormatting {\r
     /** No border\r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#NONE}\r
      */\r
     short BORDER_NONE                = 0x0;\r
     \r
     /** Thin border\r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THIN}\r
      */\r
     short BORDER_THIN                = 0x1;\r
     \r
     /** Medium border\r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM}\r
      */\r
     short BORDER_MEDIUM              = 0x2;\r
     \r
     /** dash border\r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASHED}\r
      */\r
     short BORDER_DASHED              = 0x3;\r
     \r
     /** dot border \r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOTTED}\r
      */\r
     short BORDER_DOTTED              = 0x4;\r
     \r
     /** Thick border \r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THICK}\r
      */\r
     short BORDER_THICK               = 0x5;\r
     \r
     /** double-line border \r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOUBLE}\r
      */\r
     short BORDER_DOUBLE              = 0x6;\r
     \r
     /** hair-line border \r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#HAIR}\r
      */\r
     short BORDER_HAIR                = 0x7;\r
     \r
     /** Medium dashed border \r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASHED}\r
      */\r
     short BORDER_MEDIUM_DASHED       = 0x8;\r
     \r
     \r
     /** dash-dot border\r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT}\r
      */\r
     short BORDER_DASH_DOT            = 0x9;\r
     \r
     /** medium dash-dot border \r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT}\r
      */\r
     short BORDER_MEDIUM_DASH_DOT     = 0xA;\r
     \r
     /** dash-dot-dot border \r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT_DOT}\r
      */\r
     short BORDER_DASH_DOT_DOT        = 0xB;\r
     \r
     /** medium dash-dot-dot border \r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT_DOT}\r
      */\r
     short BORDER_MEDIUM_DASH_DOT_DOT = 0xC;\r
     \r
     /** slanted dash-dot border \r
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle}\r
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#SLANTED_DASH_DOT}\r
      */\r
     short BORDER_SLANTED_DASH_DOT    = 0xD;\r
 \r
@@ -124,7 +124,7 @@ public interface BorderFormatting {
      * Set bottom border.\r
      *\r
      * @param border  MUST be a BORDER_* constant\r
-     * @deprecated 3.15 beta 1\r
+     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderBottom(BorderStyle)}\r
      */\r
     void setBorderBottom(short border);\r
 \r
@@ -139,7 +139,7 @@ public interface BorderFormatting {
      * Set diagonal border.\r
      *\r
      * @param border  MUST be a BORDER_* constant\r
-     * @deprecated 3.15 beta 1\r
+     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderDiagonal(BorderStyle)}\r
      */\r
     void setBorderDiagonal(short border);\r
     \r
@@ -154,7 +154,7 @@ public interface BorderFormatting {
      * Set left border.\r
      *\r
      * @param border  MUST be a BORDER_* constant\r
-     * @deprecated 3.15 beta 1\r
+     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderLeftBorderStyle)}\r
      */\r
     void setBorderLeft(short border);\r
     \r
@@ -169,7 +169,7 @@ public interface BorderFormatting {
      * Set right border.\r
      *\r
      * @param border  MUST be a BORDER_* constant\r
-     * @deprecated 3.15 beta 1\r
+     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderRight(BorderStyle)}\r
      */\r
     void setBorderRight(short border);\r
     \r
@@ -184,7 +184,7 @@ public interface BorderFormatting {
      * Set top border.\r
      *\r
      * @param border  MUST be a BORDER_* constant\r
-     * @deprecated 3.15 beta 1\r
+     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderTop(BorderStyle)}\r
      */\r
     void setBorderTop(short border);\r
     \r

diff --git a/src/java/org/apache/poi/ss/usermodel/CellStyle.java b/src/java/org/apache/poi/ss/usermodel/CellStyle.java
index 526024fda27f67bcd001ad4dcdb23896a58ac270..518003944efa9a44906a211c58a8f750be488b89 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/CellStyle.java
+++ b/src/java/org/apache/poi/ss/usermodel/CellStyle.java
@@ -87,100 +87,86 @@ public interface CellStyle {
 
     /**
      * No border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#NONE} instead.
      */
-
     short BORDER_NONE = 0x0;
 
     /**
      * Thin border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THIN} instead.
      */
-
     short BORDER_THIN = 0x1;
 
     /**
      * Medium border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM} instead.
      */
-
     short BORDER_MEDIUM = 0x2;
 
     /**
      * dash border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASHED} instead.
      */
-
     short BORDER_DASHED = 0x3;
 
     /**
      * dot border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOTTED} instead.
      */
-
     short BORDER_DOTTED = 0x4;
 
     /**
      * Thick border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THICK} instead.
      */
-
     short BORDER_THICK = 0x5;
 
     /**
      * double-line border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOUBLE} instead.
      */
-
     short BORDER_DOUBLE = 0x6;
 
     /**
      * hair-line border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#HAIR} instead.
      */
-
     short BORDER_HAIR = 0x7;
 
     /**
      * Medium dashed border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASHED} instead.
      */
-
     short BORDER_MEDIUM_DASHED = 0x8;
 
     /**
      * dash-dot border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT} instead.
      */
-
     short BORDER_DASH_DOT = 0x9;
 
     /**
      * medium dash-dot border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT} instead.
      */
-
     short BORDER_MEDIUM_DASH_DOT = 0xA;
 
     /**
      * dash-dot-dot border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT_DOT} instead.
      */
-
     short BORDER_DASH_DOT_DOT = 0xB;
 
     /**
      * medium dash-dot-dot border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT_DOT} instead.
      */
-
     short BORDER_MEDIUM_DASH_DOT_DOT = 0xC;
 
     /**
      * slanted dash-dot border
-     * @deprecated 3.15 beta 1. Use {@link BorderStyle} instead.
+     * @deprecated 3.15 beta 2. Use {@link BorderStyle#SLANTED_DASH_DOT} instead.
      */
-
     short BORDER_SLANTED_DASH_DOT = 0xD;
 
     /**  No background */
@@ -430,7 +416,7 @@ public interface CellStyle {
      * @see #BORDER_DASH_DOT_DOT
      * @see #BORDER_MEDIUM_DASH_DOT_DOT
      * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 1
+     * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle)} instead
      */
     void setBorderLeft(short border);
     
@@ -463,7 +449,7 @@ public interface CellStyle {
      * @see #BORDER_DASH_DOT_DOT
      * @see #BORDER_MEDIUM_DASH_DOT_DOT
      * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 1
+     * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle)} instead
      */
     void setBorderRight(short border);
     
@@ -496,7 +482,7 @@ public interface CellStyle {
      * @see #BORDER_DASH_DOT_DOT
      * @see #BORDER_MEDIUM_DASH_DOT_DOT
      * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 1
+     * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle)} instead
      */
     void setBorderTop(short border);
     
@@ -529,7 +515,7 @@ public interface CellStyle {
      * @see #BORDER_DASH_DOT_DOT
      * @see #BORDER_MEDIUM_DASH_DOT_DOT
      * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 1
+     * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle)} instead.
      */
     void setBorderBottom(short border);
     

diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java
index 3cc16dd63c562bddd0d0ac2d741c792d1d9cbb4b..9ae26e4734bade3ccb7eee1f4b5ffa18994ee03e 100644 (file)
--- a/src/java/org/apache/poi/ss/util/CellUtil.java
+++ b/src/java/org/apache/poi/ss/util/CellUtil.java
@@ -360,7 +360,7 @@ public final class CellUtil {
                if (value instanceof BorderStyle) {
                        border = (BorderStyle) value;
                }
-               // @deprecated 3.15 beta 1. getBorderStyle will only work on BorderStyle enums instead of codes in the future.
+               // @deprecated 3.15 beta 2. getBorderStyle will only work on BorderStyle enums instead of codes in the future.
                else if (value instanceof Short) {
                        short code = Short.valueOf((Short) value);
                        border = BorderStyle.valueOf(code);

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
index 72329cf20374b59d3f90b9c665e3c35946932556..e48fe948e96d6dc5b66af188d72bc68f704136cd 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
@@ -136,7 +136,7 @@ public class XSSFBorderFormatting implements BorderFormatting  {
     }\r
 \r
     /**\r
-     * @deprecated 3.15 beta 1. Use {@link #setBorderBottom(BorderStyle)}\r
+     * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle)}\r
      */\r
     @Override\r
     public void setBorderBottom(short border) {\r
@@ -150,7 +150,7 @@ public class XSSFBorderFormatting implements BorderFormatting  {
     }\r
 \r
     /**\r
-     * @deprecated 3.15 beta 1. Use {@link #setBorderDiagonal(BorderStyle)}\r
+     * @deprecated 3.15 beta 2. Use {@link #setBorderDiagonal(BorderStyle)}\r
      */\r
     @Override\r
     public void setBorderDiagonal(short border) {\r
@@ -164,7 +164,7 @@ public class XSSFBorderFormatting implements BorderFormatting  {
     }\r
 \r
     /**\r
-     * @deprecated 3.15 beta 1. Use {@link #setBorderLeft(BorderStyle)}\r
+     * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle)}\r
      */\r
     @Override\r
     public void setBorderLeft(short border) {\r
@@ -178,7 +178,7 @@ public class XSSFBorderFormatting implements BorderFormatting  {
     }\r
 \r
     /**\r
-     * @deprecated 3.15 beta 1. Use {@link #setBorderRight(BorderStyle)}\r
+     * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle)}\r
      */\r
     @Override\r
     public void setBorderRight(short border) {\r
@@ -192,7 +192,7 @@ public class XSSFBorderFormatting implements BorderFormatting  {
     }\r
 \r
     /**\r
-     * @deprecated 3.15 beta 1. Use {@link #setBorderTop(BorderStyle)}\r
+     * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle)}\r
      */\r
     @Override\r
     public void setBorderTop(short border) {\r

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
index c91ac6522b6b5bd13e0d96a965b146ec6e25dcd6..b6636868f64d21c39df9648ab4821155faf8a907 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
@@ -270,7 +270,7 @@ public class XSSFCellStyle implements CellStyle {
      * Get the type of border to use for the bottom border of the cell
      *
      * @return border type as Java enum
-     * @deprecated 3.15 beta 1. Use {@link #getBorderBottom}
+     * @deprecated 3.15 beta 2. Use {@link #getBorderBottom}
      */
     public BorderStyle getBorderBottomEnum() {
         return getBorderBottom();
@@ -298,7 +298,7 @@ public class XSSFCellStyle implements CellStyle {
      * Get the type of border to use for the left border of the cell
      *
      * @return border type, default value is {@link org.apache.poi.ss.usermodel.BorderStyle#NONE}
-     * @deprecated 3.15 beta 1. Use {@link #getBorderLeft}
+     * @deprecated 3.15 beta 2. Use {@link #getBorderLeft}
      */
     public BorderStyle getBorderLeftEnum() {
         return getBorderLeft();
@@ -326,7 +326,7 @@ public class XSSFCellStyle implements CellStyle {
      * Get the type of border to use for the right border of the cell
      *
      * @return border type, default value is {@link org.apache.poi.ss.usermodel.BorderStyle#NONE}
-     * @deprecated 3.15 beta 1. Use {@link #getBorderRight}
+     * @deprecated 3.15 beta 2. Use {@link #getBorderRight}
      */
     public BorderStyle getBorderRightEnum() {
         return getBorderRight();
@@ -354,7 +354,7 @@ public class XSSFCellStyle implements CellStyle {
      * Get the type of border to use for the top border of the cell
      *
      * @return border type, default value is {@link org.apache.poi.ss.usermodel.BorderStyle#NONE}
-     * @deprecated 3.15 beta 1. Use {@link #getBorderTop}
+     * @deprecated 3.15 beta 2. Use {@link #getBorderTop}
      */
     public BorderStyle getBorderTopEnum() {
          return getBorderTop();
@@ -790,7 +790,7 @@ public class XSSFCellStyle implements CellStyle {
      * Set the type of border to use for the bottom border of the cell
      *
      * @param border the type of border to use
-     * @deprecated 3.15 beta 1. Use {@link #setBorderBottom(BorderStyle)}
+     * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle)}
      */
     @Override
     public void setBorderBottom(short border) {
@@ -819,7 +819,7 @@ public class XSSFCellStyle implements CellStyle {
     /**
      * Set the type of border to use for the left border of the cell
      * @param border the type of border to use
-     * @deprecated 3.15 beta 1. Use {@link #setBorderLeft(BorderStyle)}
+     * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle)}
      */
     @Override
     public void setBorderLeft(short border) {
@@ -848,7 +848,7 @@ public class XSSFCellStyle implements CellStyle {
      * Set the type of border to use for the right border of the cell
      *
      * @param border the type of border to use
-     * @deprecated 3.15 beta 1. Use {@link #setBorderRight(BorderStyle)}
+     * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle)}
      */
     @Override
     public void setBorderRight(short border) {
@@ -877,7 +877,7 @@ public class XSSFCellStyle implements CellStyle {
      * Set the type of border to use for the top border of the cell
      *
      * @param border the type of border to use
-     * @deprecated 3.15 beta 1. Use {@link #setBorderTop(BorderStyle)}
+     * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle)}
      */
     @Override
     public void setBorderTop(short border) {