moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1737894 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-04-05 23:30:37 +00:00
parent e2399abbe9
commit fe13debb84
6 changed files with 55 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
View File

@ -411,7 +411,7 @@ public final class HSSFCellStyle implements CellStyle {
* @see #BORDER_DASH_DOT_DOT * @see #BORDER_DASH_DOT_DOT
* @see #BORDER_MEDIUM_DASH_DOT_DOT * @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT * @see #BORDER_SLANTED_DASH_DOT
* @deprecated 3.15 beta 1 * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderLeft(BorderStyle)} instead.
*/ */
@Override @Override
public void setBorderLeft(short border) public void setBorderLeft(short border)
@ -457,7 +457,7 @@ public final class HSSFCellStyle implements CellStyle {
* @see #BORDER_DASH_DOT_DOT * @see #BORDER_DASH_DOT_DOT
* @see #BORDER_MEDIUM_DASH_DOT_DOT * @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT * @see #BORDER_SLANTED_DASH_DOT
* @deprecated 3.15 beta 1 * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderRight(BorderStyle)} instead.
*/ */
@Override @Override
public void setBorderRight(short border) public void setBorderRight(short border)
@ -503,7 +503,7 @@ public final class HSSFCellStyle implements CellStyle {
* @see #BORDER_DASH_DOT_DOT * @see #BORDER_DASH_DOT_DOT
* @see #BORDER_MEDIUM_DASH_DOT_DOT * @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT * @see #BORDER_SLANTED_DASH_DOT
* @deprecated 3.15 beta 1 * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderTop(BorderStyle)} instead.
*/ */
@Override @Override
public void setBorderTop(short border) public void setBorderTop(short border)
@ -549,7 +549,7 @@ public final class HSSFCellStyle implements CellStyle {
* @see #BORDER_DASH_DOT_DOT * @see #BORDER_DASH_DOT_DOT
* @see #BORDER_MEDIUM_DASH_DOT_DOT * @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT * @see #BORDER_SLANTED_DASH_DOT
* @deprecated 3.15 beta 1 * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderBottom(BorderStyle)} instead.
*/ */
@Override @Override
public void setBorderBottom(short border) public void setBorderBottom(short border)

38
src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
View File

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

50
src/java/org/apache/poi/ss/usermodel/CellStyle.java
View File

@ -87,100 +87,86 @@ public interface CellStyle {
/** /**
* No border * 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; short BORDER_NONE = 0x0;
/** /**
* Thin border * 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; short BORDER_THIN = 0x1;
/** /**
* Medium border * 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; short BORDER_MEDIUM = 0x2;
/** /**
* dash border * 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; short BORDER_DASHED = 0x3;
/** /**
* dot border * 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; short BORDER_DOTTED = 0x4;
/** /**
* Thick border * 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; short BORDER_THICK = 0x5;
/** /**
* double-line border * 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; short BORDER_DOUBLE = 0x6;
/** /**
* hair-line border * 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; short BORDER_HAIR = 0x7;
/** /**
* Medium dashed border * 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; short BORDER_MEDIUM_DASHED = 0x8;
/** /**
* dash-dot border * 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; short BORDER_DASH_DOT = 0x9;
/** /**
* medium dash-dot border * 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; short BORDER_MEDIUM_DASH_DOT = 0xA;
/** /**
* dash-dot-dot border * 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; short BORDER_DASH_DOT_DOT = 0xB;
/** /**
* medium dash-dot-dot border * 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; short BORDER_MEDIUM_DASH_DOT_DOT = 0xC;
/** /**
* slanted dash-dot border * 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; short BORDER_SLANTED_DASH_DOT = 0xD;
/** No background */ /** No background */
@ -430,7 +416,7 @@ public interface CellStyle {
* @see #BORDER_DASH_DOT_DOT * @see #BORDER_DASH_DOT_DOT
* @see #BORDER_MEDIUM_DASH_DOT_DOT * @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_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); void setBorderLeft(short border);
@ -463,7 +449,7 @@ public interface CellStyle {
* @see #BORDER_DASH_DOT_DOT * @see #BORDER_DASH_DOT_DOT
* @see #BORDER_MEDIUM_DASH_DOT_DOT * @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_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); void setBorderRight(short border);
@ -496,7 +482,7 @@ public interface CellStyle {
* @see #BORDER_DASH_DOT_DOT * @see #BORDER_DASH_DOT_DOT
* @see #BORDER_MEDIUM_DASH_DOT_DOT * @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_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); void setBorderTop(short border);
@ -529,7 +515,7 @@ public interface CellStyle {
* @see #BORDER_DASH_DOT_DOT * @see #BORDER_DASH_DOT_DOT
* @see #BORDER_MEDIUM_DASH_DOT_DOT * @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_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); void setBorderBottom(short border);

2
src/java/org/apache/poi/ss/util/CellUtil.java
View File

@ -360,7 +360,7 @@ public final class CellUtil {
if (value instanceof BorderStyle) { if (value instanceof BorderStyle) {
border = (BorderStyle) value; 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) { else if (value instanceof Short) {
short code = Short.valueOf((Short) value); short code = Short.valueOf((Short) value);
border = BorderStyle.valueOf(code); border = BorderStyle.valueOf(code);

10
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
View File

@ -136,7 +136,7 @@ public class XSSFBorderFormatting implements BorderFormatting {
} }
/** /**
* @deprecated 3.15 beta 1. Use {@link #setBorderBottom(BorderStyle)} * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle)}
*/ */
@Override @Override
public void setBorderBottom(short border) { public void setBorderBottom(short border) {
@ -150,7 +150,7 @@ public class XSSFBorderFormatting implements BorderFormatting {
} }
/** /**
* @deprecated 3.15 beta 1. Use {@link #setBorderDiagonal(BorderStyle)} * @deprecated 3.15 beta 2. Use {@link #setBorderDiagonal(BorderStyle)}
*/ */
@Override @Override
public void setBorderDiagonal(short border) { public void setBorderDiagonal(short border) {
@ -164,7 +164,7 @@ public class XSSFBorderFormatting implements BorderFormatting {
} }
/** /**
* @deprecated 3.15 beta 1. Use {@link #setBorderLeft(BorderStyle)} * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle)}
*/ */
@Override @Override
public void setBorderLeft(short border) { public void setBorderLeft(short border) {
@ -178,7 +178,7 @@ public class XSSFBorderFormatting implements BorderFormatting {
} }
/** /**
* @deprecated 3.15 beta 1. Use {@link #setBorderRight(BorderStyle)} * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle)}
*/ */
@Override @Override
public void setBorderRight(short border) { public void setBorderRight(short border) {
@ -192,7 +192,7 @@ public class XSSFBorderFormatting implements BorderFormatting {
} }
/** /**
* @deprecated 3.15 beta 1. Use {@link #setBorderTop(BorderStyle)} * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle)}
*/ */
@Override @Override
public void setBorderTop(short border) { public void setBorderTop(short border) {

16
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
View File

@ -270,7 +270,7 @@ public class XSSFCellStyle implements CellStyle {
* Get the type of border to use for the bottom border of the cell * Get the type of border to use for the bottom border of the cell
* *
* @return border type as Java enum * @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() { public BorderStyle getBorderBottomEnum() {
return getBorderBottom(); 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 * 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} * @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() { public BorderStyle getBorderLeftEnum() {
return getBorderLeft(); 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 * 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} * @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() { public BorderStyle getBorderRightEnum() {
return getBorderRight(); 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 * 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} * @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() { public BorderStyle getBorderTopEnum() {
return getBorderTop(); 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 * Set the type of border to use for the bottom border of the cell
* *
* @param border the type of border to use * @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 @Override
public void setBorderBottom(short border) { 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 * Set the type of border to use for the left border of the cell
* @param border the type of border to use * @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 @Override
public void setBorderLeft(short border) { 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 * Set the type of border to use for the right border of the cell
* *
* @param border the type of border to use * @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 @Override
public void setBorderRight(short border) { 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 * Set the type of border to use for the top border of the cell
* *
* @param border the type of border to use * @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 @Override
public void setBorderTop(short border) { public void setBorderTop(short border) {