Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reduce use of deprecated code in XSSFFont 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884266 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2020-12-09 18:20:00 +00:00
parent 5aef414f2a
commit ea59cc2bc9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/poi/ss/usermodel/FontCharset.java
View File

@ -25,7 +25,7 @@ import org.apache.poi.util.Removal;
*
* @deprecated enum will be replaced by common version org.apache.poi.common.usermodel.FontCharset
*/
@Removal(version="4.0")
@Removal(version="6.0.0")
@Deprecated
public enum FontCharset {

14
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
View File

@ -127,8 +127,7 @@ public class XSSFFont implements Font {
*/
public int getCharSet() {
CTIntProperty charset = _ctFont.sizeOfCharsetArray() == 0 ? null : _ctFont.getCharsetArray(0);
return charset == null ? org.apache.poi.ss.usermodel.FontCharset.ANSI.getValue() :
org.apache.poi.ss.usermodel.FontCharset.valueOf(charset.getVal()).getValue();
return charset == null ? FontCharset.ANSI.getNativeId() : FontCharset.valueOf(charset.getVal()).getNativeId();
}
@ -313,7 +312,7 @@ public class XSSFFont implements Font {
* set character-set to use.
*
* @param charset - charset
* @see org.apache.poi.ss.usermodel.FontCharset
* @see FontCharset
*/
public void setCharSet(byte charset) {
int cs = charset & 0xff;
@ -324,14 +323,14 @@ public class XSSFFont implements Font {
* set character-set to use.
*
* @param charset - charset
* @see org.apache.poi.ss.usermodel.FontCharset
* @see FontCharset
*/
public void setCharSet(int charset) {
org.apache.poi.ss.usermodel.FontCharset fontCharset = org.apache.poi.ss.usermodel.FontCharset.valueOf(charset);
FontCharset fontCharset = FontCharset.valueOf(charset);
if(fontCharset != null) {
setCharSet(fontCharset);
} else {
throw new POIXMLException("Attention: an attempt to set a type of unknow charset and charset");
throw new POIXMLException("Attention: an attempt to set a type of unknown charset and charset");
}
}
@ -339,7 +338,10 @@ public class XSSFFont implements Font {
* set character-set to use.
*
* @param charSet
* @deprecated use {@link #setCharSet(FontCharset)} instead
*/
@Deprecated
@Removal(version = "6.0.0")
public void setCharSet(org.apache.poi.ss.usermodel.FontCharset charSet) {
CTIntProperty charsetProperty;
if(_ctFont.sizeOfCharsetArray() == 0) {