You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2020/12/09 18:04:56 UTC
svn commit: r1884263 - in /poi/trunk/src: java/org/apache/poi/ddf/
java/org/apache/poi/hpsf/wellknown/ java/org/apache/poi/hssf/usermodel/
java/org/apache/poi/ss/usermodel/ java/org/apache/poi/ss/util/
ooxml/java/org/apache/poi/xssf/usermodel/ ooxml/te...
Author: fanningpj
Date: Wed Dec 9 18:04:56 2020
New Revision: 1884263
URL: http://svn.apache.org/viewvc?rev=1884263&view=rev
Log:
remove more deprecated code
Removed:
poi/trunk/src/java/org/apache/poi/ddf/EscherProperties.java
poi/trunk/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
Modified:
poi/trunk/src/java/org/apache/poi/ddf/EscherRecord.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/Font.java
poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherRecord.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherRecord.java Wed Dec 9 18:04:56 2020
@@ -33,7 +33,6 @@ import org.apache.poi.util.GenericRecord
import org.apache.poi.util.GenericRecordXmlWriter;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.Removal;
/**
* The base abstract record from which all escher records are defined. Subclasses will need
@@ -237,20 +236,6 @@ public abstract class EscherRecord imple
}
/**
- * Escher records may need to be clonable in the future.
- *
- * @return the cloned object
- * @deprecated use {@link #copy()}
- */
- @Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public final EscherRecord clone() {
- return copy();
- }
-
- /**
* Returns the indexed child record.
*
* @param index the index of the child within the child records
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java Wed Dec 9 18:04:56 2020
@@ -22,6 +22,7 @@ import java.util.Objects;
import org.apache.poi.hssf.record.FontRecord;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.util.Removal;
/**
* Represents a Font used in a workbook.
@@ -75,26 +76,17 @@ public final class HSSFFont implements F
* @return String representing the name of the font to use
* @see #FONT_ARIAL
*/
-
public String getFontName()
{
return font.getFontName();
}
- /**
- * get the index within the HSSFWorkbook (sequence within the collection of Font objects)
- * @return unique index number of the underlying record this Font represents (probably you don't care
- * unless you're comparing which one is which)
- */
-
- public short getIndex() { return (short)index; }
-
- /**
- * get the index within the HSSFWorkbook (sequence within the collection of Font objects)
- * @return unique index number of the underlying record this Font represents (probably you don't care
- * unless you're comparing which one is which)
- */
+ @Override
+ public int getIndex() { return index; }
+ @Deprecated
+ @Removal(version = "6.0.0")
+ @Override
public int getIndexAsInt()
{
return index;
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java Wed Dec 9 18:04:56 2020
@@ -168,7 +168,7 @@ public final class HSSFRichTextString im
* @param font The index of the font to use.
*/
public void applyFont(int startIndex, int endIndex, Font font) {
- applyFont(startIndex, endIndex, font.getIndex());
+ applyFont(startIndex, endIndex, (short)font.getIndex());
}
/**
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/Font.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/Font.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/Font.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/Font.java Wed Dec 9 18:04:56 2020
@@ -263,22 +263,24 @@ public interface Font {
void setCharSet(int charset);
/**
- * Get the index within the XSSFWorkbook (sequence within the collection of Font objects)
+ * get the index within the XSSFWorkbook (sequence within the collection of Font objects)
*
* @return unique index number of the underlying record this Font represents (probably you don't care
* unless you're comparing which one is which)
- * @deprecated use <code>getIndexAsInt()</code> instead
+ * @since 5.0.0 (used to return a short)
*/
- @Removal(version = "4.2")
- short getIndex();
+ int getIndex();
/**
* get the index within the XSSFWorkbook (sequence within the collection of Font objects)
*
+ * @deprecated use {@link #getIndex()} instead
* @return unique index number of the underlying record this Font represents (probably you don't care
* unless you're comparing which one is which)
* @since 4.0.0
*/
+ @Deprecated
+ @Removal(version = "6.0.0")
int getIndexAsInt();
void setBold(boolean bold);
Modified: poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java Wed Dec 9 18:04:56 2020
@@ -40,7 +40,6 @@ import org.apache.poi.ss.usermodel.Sheet
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
import org.apache.poi.util.Units;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -48,13 +47,6 @@ import org.w3c.dom.NodeList;
public final class ImageUtils {
private static final POILogger logger = POILogFactory.getLogger(ImageUtils.class);
- /**
- * @deprecated use {@link Units#PIXEL_DPI}
- */
- @Deprecated
- @Removal(version = "5.0.0")
- public static final int PIXEL_DPI = 96;
-
private static final int WIDTH_UNITS = 1024;
private static final int HEIGHT_UNITS = 256;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java Wed Dec 9 18:04:56 2020
@@ -18,14 +18,15 @@ package org.apache.poi.xssf.usermodel;
import java.util.Objects;
+import org.apache.poi.common.usermodel.fonts.FontCharset;
import org.apache.poi.ooxml.POIXMLException;
import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.FontCharset;
import org.apache.poi.ss.usermodel.FontFamily;
import org.apache.poi.ss.usermodel.FontScheme;
import org.apache.poi.ss.usermodel.FontUnderline;
import org.apache.poi.ss.usermodel.IndexedColors;
import org.apache.poi.util.Internal;
+import org.apache.poi.util.Removal;
import org.apache.poi.xssf.model.StylesTable;
import org.apache.poi.xssf.model.ThemesTable;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBooleanProperty;
@@ -126,7 +127,8 @@ public class XSSFFont implements Font {
*/
public int getCharSet() {
CTIntProperty charset = _ctFont.sizeOfCharsetArray() == 0 ? null : _ctFont.getCharsetArray(0);
- return charset == null ? FontCharset.ANSI.getValue() : FontCharset.valueOf(charset.getVal()).getValue();
+ return charset == null ? org.apache.poi.ss.usermodel.FontCharset.ANSI.getValue() :
+ org.apache.poi.ss.usermodel.FontCharset.valueOf(charset.getVal()).getValue();
}
@@ -311,20 +313,21 @@ public class XSSFFont implements Font {
* set character-set to use.
*
* @param charset - charset
- * @see FontCharset
+ * @see org.apache.poi.ss.usermodel.FontCharset
*/
public void setCharSet(byte charset) {
int cs = charset & 0xff;
setCharSet(cs);
}
+
/**
* set character-set to use.
*
* @param charset - charset
- * @see FontCharset
+ * @see org.apache.poi.ss.usermodel.FontCharset
*/
public void setCharSet(int charset) {
- FontCharset fontCharset = FontCharset.valueOf(charset);
+ org.apache.poi.ss.usermodel.FontCharset fontCharset = org.apache.poi.ss.usermodel.FontCharset.valueOf(charset);
if(fontCharset != null) {
setCharSet(fontCharset);
} else {
@@ -337,7 +340,7 @@ public class XSSFFont implements Font {
*
* @param charSet
*/
- public void setCharSet(FontCharset charSet) {
+ public void setCharSet(org.apache.poi.ss.usermodel.FontCharset charSet) {
CTIntProperty charsetProperty;
if(_ctFont.sizeOfCharsetArray() == 0) {
charsetProperty = _ctFont.addNewCharset();
@@ -350,6 +353,24 @@ public class XSSFFont implements Font {
}
/**
+ * set character-set to use.
+ *
+ * @param charSet
+ * @since 5.0.0
+ */
+ public void setCharSet(FontCharset charSet) {
+ CTIntProperty charsetProperty;
+ if(_ctFont.sizeOfCharsetArray() == 0) {
+ charsetProperty = _ctFont.addNewCharset();
+ } else {
+ charsetProperty = _ctFont.getCharsetArray(0);
+ }
+ // We know that FontCharset only has valid entries in it,
+ // so we can just set the int value from it
+ charsetProperty.setVal( charSet.getNativeId() );
+ }
+
+ /**
* set the indexed color for the font
*
* @param color - color to use
@@ -624,11 +645,12 @@ public class XSSFFont implements Font {
}
@Override
- @Deprecated
- public short getIndex() {
- return (short)getIndexAsInt();
+ public int getIndex() {
+ return _index;
}
+ @Deprecated
+ @Removal(version = "6.0.0")
@Override
public int getIndexAsInt()
{
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java Wed Dec 9 18:04:56 2020
@@ -384,7 +384,7 @@ public final class TestXSSFFont extends
XSSFFont nf = wb.createFont();
assertEquals(2, wb.getNumberOfFonts());
- assertEquals(1, nf.getIndexAsInt());
+ assertEquals(1, nf.getIndex());
assertEquals(nf, wb.getFontAt(1));
nf.setBold(false);
@@ -422,7 +422,7 @@ public final class TestXSSFFont extends
assertNotNull(font);
assertEquals(
1,
- font.getIndexAsInt()
+ font.getIndex()
);
assertEquals(nf,
wb.findFont(
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java Wed Dec 9 18:04:56 2020
@@ -25,7 +25,6 @@ import java.util.function.Supplier;
import org.apache.poi.util.GenericRecordUtil;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
/**
* Definition of a special kind of property of some text, or its
@@ -185,14 +184,6 @@ public abstract class BitMaskTextProp ex
super.setValue(newVal);
}
- @Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public BitMaskTextProp clone() {
- return copy();
- }
-
/**
* @return an identical copy of this, i.e. also the subPropMatches are copied
*/
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java Wed Dec 9 18:04:56 2020
@@ -26,7 +26,6 @@ import org.apache.poi.common.usermodel.G
import org.apache.poi.sl.usermodel.TabStop;
import org.apache.poi.util.GenericRecordUtil;
import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
import org.apache.poi.util.Units;
@Internal
@@ -87,14 +86,6 @@ public class HSLFTabStop implements TabS
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public HSLFTabStop clone() {
- return copy();
- }
-
- @Override
public HSLFTabStop copy() {
return new HSLFTabStop(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java Wed Dec 9 18:04:56 2020
@@ -32,7 +32,6 @@ import org.apache.poi.util.LittleEndianC
import org.apache.poi.util.LittleEndianInput;
import org.apache.poi.util.LittleEndianOutput;
import org.apache.poi.util.LittleEndianOutputStream;
-import org.apache.poi.util.Removal;
/**
* Container for tabstop lists
@@ -110,14 +109,6 @@ public class HSLFTabStopPropCollection e
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public HSLFTabStopPropCollection clone() {
- return copy();
- }
-
- @Override
public HSLFTabStopPropCollection copy() {
return new HSLFTabStopPropCollection(this);
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java Wed Dec 9 18:04:56 2020
@@ -32,7 +32,6 @@ import org.junit.runners.Suite;
TestMovieShape.class,
TestOleEmbedding.class,
TestPPFont.class,
- TestPPGraphics2D.class,
TestSetBoldItalic.class,
TestShapes.class,
TestSheet.class,
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java Wed Dec 9 18:04:56 2020
@@ -312,7 +312,7 @@ public abstract class BaseTestCell {
cs = c.getCellStyle();
assertNotNull("Formula Cell Style", cs);
- assertEquals("Font Index Matches", f.getIndexAsInt(), cs.getFontIndex());
+ assertEquals("Font Index Matches", f.getIndex(), cs.getFontIndex());
assertEquals("Top Border", BorderStyle.THIN, cs.getBorderTop());
assertEquals("Left Border", BorderStyle.THIN, cs.getBorderLeft());
assertEquals("Right Border", BorderStyle.THIN, cs.getBorderRight());
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java Wed Dec 9 18:04:56 2020
@@ -68,17 +68,17 @@ public abstract class BaseTestFont {
Font f1=wb.createFont();
f1.setBold(true);
- short idx1 = f1.getIndex();
+ int idx1 = f1.getIndex();
wb.createCellStyle().setFont(f1);
Font f2=wb.createFont();
f2.setUnderline(Font.U_DOUBLE);
- short idx2 = f2.getIndex();
+ int idx2 = f2.getIndex();
wb.createCellStyle().setFont(f2);
Font f3=wb.createFont();
f3.setFontHeightInPoints((short)23);
- short idx3 = f3.getIndex();
+ int idx3 = f3.getIndex();
wb.createCellStyle().setFont(f3);
assertEquals(num0 + 3,wb.getNumberOfFonts());
@@ -107,7 +107,7 @@ public abstract class BaseTestFont {
font.setStrikeout(true);
font.setColor(IndexedColors.YELLOW.getIndex());
font.setFontName("Courier");
- int font1Idx = font.getIndexAsInt();
+ int font1Idx = font.getIndex();
wb1.createCellStyle().setFont(font);
assertEquals(num0 + 1, wb1.getNumberOfFonts());
@@ -131,7 +131,7 @@ public abstract class BaseTestFont {
Font font2 = wb2.createFont();
font2.setItalic(true);
font2.setFontHeightInPoints((short)15);
- int font2Idx = font2.getIndexAsInt();
+ int font2Idx = font2.getIndex();
wb2.createCellStyle().setFont(font2);
assertEquals(num0 + 2, wb2.getNumberOfFonts());
@@ -183,7 +183,7 @@ public abstract class BaseTestFont {
);
Font nf = wb.createFont();
- int nfIdx = nf.getIndexAsInt();
+ int nfIdx = nf.getIndex();
assertEquals(num0 + 1, wb.getNumberOfFonts());
assertSame(nf, wb.getFontAt(nfIdx));
Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java?rev=1884263&r1=1884262&r2=1884263&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java Wed Dec 9 18:04:56 2020
@@ -305,7 +305,7 @@ public abstract class BaseTestCellUtil {
final int defaultFontIndex = 0;
Font font = wb.createFont();
font.setItalic(true);
- final int customFontIndex = font.getIndexAsInt();
+ final int customFontIndex = font.getIndex();
// Assumptions
assertNotEquals(defaultFontIndex, customFontIndex);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org