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 20:42:19 UTC
svn commit: r1884269 - in /poi/trunk/src:
ooxml/java/org/apache/poi/xssf/usermodel/
ooxml/testcases/org/apache/poi/xssf/usermodel/
scratchpad/src/org/apache/poi/hsmf/datatypes/
scratchpad/src/org/apache/poi/hwpf/model/
scratchpad/src/org/apache/poi/hwp...
Author: fanningpj
Date: Wed Dec 9 20:42:19 2020
New Revision: 1884269
URL: http://svn.apache.org/viewvc?rev=1884269&view=rev
Log:
remove more deprecated code
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Wed Dec 9 20:42:19 2020
@@ -4070,19 +4070,6 @@ public class XSSFSheet extends POIXMLDoc
}
/**
- * Creates a new Table, and associates it with this Sheet. The table does
- * not yet have an area defined and needs to be initialized by calling
- * {@link XSSFTable#setArea(AreaReference)}.
- *
- * @deprecated Use {@link #createTable(AreaReference))} instead
- */
- @Deprecated
- @Removal(version = "4.2.0")
- public XSSFTable createTable() {
- return createTable(null);
- }
-
- /**
* Creates a new Table, and associates it with this Sheet.
* <p>
* The table is assigned a default display name (since 4.1.1) which can be overridden
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java Wed Dec 9 20:42:19 2020
@@ -220,18 +220,11 @@ public class XSSFTable extends POIXMLDoc
}
return tableColumns;
}
-
+
/**
- * Note this list is static - once read, it does not notice later changes to the underlying column structures
- * To clear the cache, call {@link #updateHeaders}
- *
- * @deprecated Use {@link XSSFTableColumn#getXmlColumnPr()} instead.
- *
- * @return List of XSSFXmlColumnPr
+ * Use {@link XSSFTableColumn#getXmlColumnPr()} instead.
*/
- @Deprecated
- @Removal(version="4.2.0")
- public List<XSSFXmlColumnPr> getXmlColumnPrs() {
+ private List<XSSFXmlColumnPr> getXmlColumnPrs() {
if (xmlColumnPrs == null) {
xmlColumnPrs = new ArrayList<>();
for (XSSFTableColumn column: getColumns()) {
@@ -439,17 +432,6 @@ public class XSSFTable extends POIXMLDoc
}
/**
- * @deprecated Use {@link #getColumnCount()} instead.
- *
- * @return the number of mapped table columns (see Open Office XML Part 4: chapter 3.5.1.4)
- */
- @Deprecated
- @Removal(version = "4.2.0")
- public long getNumberOfMappedColumns() {
- return ctTable.getTableColumns().getCount();
- }
-
- /**
* Get the area reference for the cells which this table covers. The area
* includes header rows and totals rows.
*
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java Wed Dec 9 20:42:19 2020
@@ -89,7 +89,7 @@ public final class TestXSSFTable {
XSSFSheet sheet = outputWorkbook.createSheet();
//Create
- XSSFTable outputTable = sheet.createTable();
+ XSSFTable outputTable = sheet.createTable(null);
outputTable.setDisplayName("Test");
CTTable outputCTTable = outputTable.getCTTable();
@@ -224,15 +224,6 @@ public final class TestXSSFTable {
}
@Test
- public void getNumberOfMappedColumns() throws IOException {
- try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx")) {
- XSSFTable table = wb.getTable("\\_Prime.1");
- //noinspection deprecation
- assertEquals(3, table.getNumberOfMappedColumns());
- }
- }
-
- @Test
public void getColumnCount() throws IOException {
try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx")) {
XSSFTable table = wb.getTable("\\_Prime.1");
@@ -258,7 +249,7 @@ public final class TestXSSFTable {
// can be synchronized with the underlying CTTable
try (XSSFWorkbook wb = new XSSFWorkbook()) {
XSSFSheet sh = wb.createSheet();
- XSSFTable table = sh.createTable();
+ XSSFTable table = sh.createTable(null);
assertNotNull(table.getDisplayName());
assertNotNull(table.getCTTable().getDisplayName());
CTTable ctTable = table.getCTTable();
@@ -289,7 +280,7 @@ public final class TestXSSFTable {
public void getRowCount() throws IOException {
try (XSSFWorkbook wb = new XSSFWorkbook()) {
XSSFSheet sh = wb.createSheet();
- XSSFTable table = sh.createTable();
+ XSSFTable table = sh.createTable(null);
CTTable ctTable = table.getCTTable();
assertEquals(0, table.getRowCount());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java Wed Dec 9 20:42:19 2020
@@ -1102,7 +1102,7 @@ public final class TestXSSFWorkbook ext
// If a table is added after getTable is called it should still be reachable by XSSFWorkbook.getTable
// This test makes sure that if any caching is done that getTable never uses a stale cache
- XSSFTable table2 = wb.getSheet("Foglio2").createTable();
+ XSSFTable table2 = wb.getSheet("Foglio2").createTable(null);
table2.setName("Table2");
assertSame("Did not find Table2", table2, wb.getTable("Table2"));
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java Wed Dec 9 20:42:19 2020
@@ -49,18 +49,6 @@ public class DirectoryChunk extends Chun
* Treats the directory as an embedded MAPIMessage (it normally is one), and
* returns a MAPIMessage object to process it with.
*
- * @deprecated use {@link #getAsEmbeddedMessage()} instead
- */
- @Removal(version = "4.3")
- @Deprecated
- public MAPIMessage getAsEmbededMessage() throws IOException {
- return getAsEmbeddedMessage();
- }
-
- /**
- * Treats the directory as an embedded MAPIMessage (it normally is one), and
- * returns a MAPIMessage object to process it with.
- *
* @since 4.1.1
*/
public MAPIMessage getAsEmbeddedMessage() throws IOException {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java Wed Dec 9 20:42:19 2020
@@ -21,7 +21,6 @@ import java.util.Objects;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.types.BKFAbstractType;
import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
@Internal
public final class BookmarkFirstDescriptor extends BKFAbstractType implements Duplicatable {
@@ -36,14 +35,6 @@ public final class BookmarkFirstDescript
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- protected BookmarkFirstDescriptor clone() {
- return copy();
- }
-
- @Override
public BookmarkFirstDescriptor copy() {
return new BookmarkFirstDescriptor(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java Wed Dec 9 20:42:19 2020
@@ -156,7 +156,7 @@ public class CHPBinTable
if ( hasChp )
{
- SprmBuffer newSprmBuffer = sprmBuffer.clone();
+ SprmBuffer newSprmBuffer = sprmBuffer.copy();
CHPX chpx = new CHPX( textPiece.getStart(),
textPiece.getEnd(), newSprmBuffer );
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java Wed Dec 9 20:42:19 2020
@@ -19,7 +19,6 @@ package org.apache.poi.hwpf.model;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.Removal;
/**
* 24-bit color structure
@@ -88,14 +87,6 @@ public class Colorref implements Duplica
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public Colorref clone() {
- return copy();
- }
-
- @Override
public Colorref copy() {
return new Colorref(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java Wed Dec 9 20:42:19 2020
@@ -21,7 +21,6 @@ import java.util.Objects;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.types.FRDAbstractType;
import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
@Internal
public final class FootnoteReferenceDescriptor extends FRDAbstractType implements Duplicatable {
@@ -36,14 +35,6 @@ public final class FootnoteReferenceDesc
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- protected FootnoteReferenceDescriptor clone() {
- return copy();
- }
-
- @Override
public FootnoteReferenceDescriptor copy() {
return new FootnoteReferenceDescriptor(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java Wed Dec 9 20:42:19 2020
@@ -24,7 +24,6 @@ import org.apache.poi.hwpf.model.types.H
import org.apache.poi.hwpf.usermodel.CharacterProperties;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.Removal;
/**
* Hyphenation. Substructure of the {@link CharacterProperties}.
@@ -44,14 +43,6 @@ public final class Hyphenation extends H
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public Hyphenation clone() {
- return copy();
- }
-
- @Override
public Hyphenation copy() {
return new Hyphenation(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java Wed Dec 9 20:42:19 2020
@@ -21,7 +21,6 @@ import java.util.Objects;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.util.BitField;
import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
@Internal
public final class PropertyModifier implements Duplicatable {
@@ -56,14 +55,6 @@ public final class PropertyModifier impl
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- protected PropertyModifier clone() {
- return copy();
- }
-
- @Override
public PropertyModifier copy() {
return new PropertyModifier(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java Wed Dec 9 20:42:19 2020
@@ -25,7 +25,6 @@ import org.apache.poi.common.Duplicatabl
import org.apache.poi.util.Internal;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
/**
* Represents a lightweight node in the Trees used to store content
@@ -153,14 +152,6 @@ public abstract class PropertyNode<T ext
}
@Override
- @Deprecated
- @Removal(version = "5.0.0")
- @SuppressWarnings({"unchecked","squid:S2975"})
- public T clone() {
- return (T) copy();
- }
-
- @Override
public abstract PropertyNode<?> copy();
/**
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java Wed Dec 9 20:42:19 2020
@@ -45,7 +45,7 @@ public final class CharacterSprmUncompre
public static CharacterProperties uncompressCHP(
CharacterProperties parent, byte[] grpprl, int offset )
{
- CharacterProperties newProperties = parent.clone();
+ CharacterProperties newProperties = parent.copy();
applySprms( parent, grpprl, offset, true, newProperties );
return newProperties;
}
@@ -61,7 +61,7 @@ public final class CharacterSprmUncompre
}
else
{
- newProperties = parStyle.clone();
+ newProperties = parStyle.copy();
}
/*
@@ -84,7 +84,7 @@ public final class CharacterSprmUncompre
}
CharacterProperties styleProperties = newProperties;
- newProperties = styleProperties.clone();
+ newProperties = styleProperties.copy();
try
{
@@ -329,7 +329,7 @@ public final class CharacterSprmUncompre
case 0x33:
// preserve the fSpec setting from the original CHP
boolean fSpec = newCHP.isFSpec();
- newCHP = oldCHP.clone();
+ newCHP = oldCHP.copy();
newCHP.setFSpec( fSpec );
return;
case 0x34:
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java Wed Dec 9 20:42:19 2020
@@ -24,7 +24,6 @@ import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.Removal;
@Internal
public final class SprmBuffer implements Duplicatable {
@@ -108,14 +107,6 @@ public final class SprmBuffer implements
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public SprmBuffer clone() {
- return copy();
- }
-
- @Override
public SprmBuffer copy() {
return new SprmBuffer(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java Wed Dec 9 20:42:19 2020
@@ -22,7 +22,6 @@ import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.Removal;
/**
* Mapping class for BRC80 structure (Border Code for Word 97)
@@ -89,14 +88,6 @@ public final class BorderCode implements
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public BorderCode clone() {
- return copy();
- }
-
- @Override
public BorderCode copy() {
return new BorderCode(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java Wed Dec 9 20:42:19 2020
@@ -20,7 +20,6 @@ package org.apache.poi.hwpf.usermodel;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.Colorref;
import org.apache.poi.hwpf.model.types.CHPAbstractType;
-import org.apache.poi.util.Removal;
@SuppressWarnings("unused")
public final class CharacterProperties extends CHPAbstractType implements Duplicatable {
@@ -372,14 +371,6 @@ public final class CharacterProperties e
}
@Override
- @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
- @Deprecated
- @Removal(version = "5.0.0")
- public CharacterProperties clone() {
- return copy();
- }
-
- @Override
public CharacterProperties copy() {
return new CharacterProperties(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java Wed Dec 9 20:42:19 2020
@@ -26,7 +26,6 @@ import org.apache.poi.hwpf.model.Ffn;
import org.apache.poi.hwpf.model.NilPICFAndBinData;
import org.apache.poi.hwpf.model.StyleSheet;
import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.util.Removal;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -567,19 +566,6 @@ public final class CharacterRun extends
_props.setIco24(colour24);
}
- /**
- * Used to create a deep copy of this object.
- *
- * @return A deep copy.
- */
- @Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public CharacterRun clone() {
- return copy();
- }
-
@Override
public CharacterRun copy() {
return new CharacterRun(this);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java Wed Dec 9 20:42:19 2020
@@ -17,15 +17,10 @@
package org.apache.poi.hwpf.usermodel;
-import java.util.Calendar;
-
import org.apache.poi.common.Duplicatable;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.Removal;
+import org.apache.poi.util.*;
+
+import java.util.Calendar;
/**
* This class is used to represent a date and time in a Word document.
@@ -42,7 +37,8 @@ public final class DateAndTime implement
private short _info;
private short _info2;
- public DateAndTime() {}
+ public DateAndTime() {
+ }
public DateAndTime(DateAndTime other) {
_info = other._info;
@@ -54,60 +50,49 @@ public final class DateAndTime implement
_info2 = LittleEndian.getShort(buf, offset + LittleEndianConsts.SHORT_SIZE);
}
- public Calendar getDate() {
- // TODO Discover if the timezone is stored somewhere else or not
- return LocaleUtil.getLocaleCalendar(
- _years.getValue(_info2)+1900,
- _months.getValue(_info2)-1,
- _dom.getValue(_info),
- _hours.getValue(_info),
- _minutes.getValue(_info),
- 0
- );
- }
-
- public void serialize(byte[] buf, int offset)
- {
- LittleEndian.putShort(buf, offset, _info);
- LittleEndian.putShort(buf, offset + LittleEndianConsts.SHORT_SIZE, _info2);
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (!(o instanceof DateAndTime)) return false;
- DateAndTime dttm = (DateAndTime)o;
- return _info == dttm._info && _info2 == dttm._info2;
- }
-
- @Override
- public int hashCode() {
- assert false : "hashCode not designed";
- return 42; // any arbitrary constant will do
- }
+ public Calendar getDate() {
+ // TODO Discover if the timezone is stored somewhere else or not
+ return LocaleUtil.getLocaleCalendar(
+ _years.getValue(_info2) + 1900,
+ _months.getValue(_info2) - 1,
+ _dom.getValue(_info),
+ _hours.getValue(_info),
+ _minutes.getValue(_info),
+ 0
+ );
+ }
+
+ public void serialize(byte[] buf, int offset) {
+ LittleEndian.putShort(buf, offset, _info);
+ LittleEndian.putShort(buf, offset + LittleEndianConsts.SHORT_SIZE, _info2);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof DateAndTime)) return false;
+ DateAndTime dttm = (DateAndTime) o;
+ return _info == dttm._info && _info2 == dttm._info2;
+ }
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public DateAndTime clone() {
- return copy();
+ public int hashCode() {
+ assert false : "hashCode not designed";
+ return 42; // any arbitrary constant will do
}
+
@Override
public DateAndTime copy() {
return new DateAndTime(this);
}
- public boolean isEmpty()
- {
+ public boolean isEmpty() {
return _info == 0 && _info2 == 0;
}
@Override
- public String toString()
- {
- if ( isEmpty() )
+ public String toString() {
+ if (isEmpty())
return "[DTTM] EMPTY";
return "[DTTM] " + getDate();
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java Wed Dec 9 20:42:19 2020
@@ -21,7 +21,6 @@ import org.apache.poi.common.Duplicatabl
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.Removal;
/**
* This data structure is used by a paragraph to determine how it should drop
@@ -51,14 +50,6 @@ public final class DropCapSpecifier impl
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public DropCapSpecifier clone() {
- return copy();
- }
-
- @Override
public DropCapSpecifier copy() {
return new DropCapSpecifier(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java Wed Dec 9 20:42:19 2020
@@ -20,7 +20,6 @@ package org.apache.poi.hwpf.usermodel;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.Removal;
/**
* This class is used to determine line spacing for a paragraph.
@@ -46,14 +45,6 @@ public final class LineSpacingDescriptor
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public LineSpacingDescriptor clone() {
- return copy();
- }
-
- @Override
public LineSpacingDescriptor copy() {
return new LineSpacingDescriptor(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java Wed Dec 9 20:42:19 2020
@@ -19,7 +19,6 @@ package org.apache.poi.hwpf.usermodel;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.types.PAPAbstractType;
-import org.apache.poi.util.Removal;
@SuppressWarnings("unused")
public final class ParagraphProperties extends PAPAbstractType implements Duplicatable {
@@ -37,14 +36,6 @@ public final class ParagraphProperties e
}
@Override
- @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
- @Deprecated
- @Removal(version = "5.0.0")
- public ParagraphProperties clone() {
- return copy();
- }
-
- @Override
public ParagraphProperties copy() {
return new ParagraphProperties(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java Wed Dec 9 20:42:19 2020
@@ -20,7 +20,6 @@ package org.apache.poi.hwpf.usermodel;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.HWPFOldDocument;
import org.apache.poi.hwpf.model.SEPX;
-import org.apache.poi.util.Removal;
public final class Section extends Range implements Duplicatable {
private final SectionProperties _props;
@@ -41,14 +40,6 @@ public final class Section extends Range
}
@Override
- @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
- @Deprecated
- @Removal(version = "5.0.0")
- public Section clone() {
- return copy();
- }
-
- @Override
public Section copy() {
return new Section(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java Wed Dec 9 20:42:19 2020
@@ -19,7 +19,6 @@ package org.apache.poi.hwpf.usermodel;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.types.SEPAbstractType;
-import org.apache.poi.util.Removal;
public final class SectionProperties extends SEPAbstractType implements Duplicatable {
private short field_60_rncftn;
@@ -51,14 +50,6 @@ public final class SectionProperties ext
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public SectionProperties clone() {
- return copy();
- }
-
- @Override
public SectionProperties copy() {
return new SectionProperties(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java Wed Dec 9 20:42:19 2020
@@ -19,7 +19,6 @@ package org.apache.poi.hwpf.usermodel;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.types.SHDAbstractType;
-import org.apache.poi.util.Removal;
/**
* The SHD is a substructure of the CHP, PAP, and TC for Word 2000.
@@ -37,14 +36,6 @@ public final class ShadingDescriptor ext
}
@Override
- @SuppressWarnings("squid:S2975")
- @Deprecated
- @Removal(version = "5.0.0")
- public ShadingDescriptor clone() {
- return copy();
- }
-
- @Override
public ShadingDescriptor copy() {
return new ShadingDescriptor(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java Wed Dec 9 20:42:19 2020
@@ -20,7 +20,6 @@ package org.apache.poi.hwpf.usermodel;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.Colorref;
import org.apache.poi.hwpf.model.types.SHD80AbstractType;
-import org.apache.poi.util.Removal;
/**
* The SHD80 is a substructure of the CHP and PAP, and TC for Word 97.
@@ -43,14 +42,6 @@ public final class ShadingDescriptor80 e
}
@Override
- @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
- @Deprecated
- @Removal(version = "5.0.0")
- public ShadingDescriptor80 clone() {
- return copy();
- }
-
- @Override
public ShadingDescriptor80 copy() {
return new ShadingDescriptor80(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java Wed Dec 9 20:42:19 2020
@@ -20,7 +20,6 @@ import java.util.Objects;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.types.TLPAbstractType;
-import org.apache.poi.util.Removal;
public class TableAutoformatLookSpecifier extends TLPAbstractType implements Duplicatable {
public static final int SIZE = 4;
@@ -36,14 +35,6 @@ public class TableAutoformatLookSpecifie
}
@Override
- @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
- @Deprecated
- @Removal(version = "5.0.0")
- public TableAutoformatLookSpecifier clone() {
- return copy();
- }
-
- @Override
public TableAutoformatLookSpecifier copy() {
return new TableAutoformatLookSpecifier(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java Wed Dec 9 20:42:19 2020
@@ -20,7 +20,6 @@ package org.apache.poi.hwpf.usermodel;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.types.TCAbstractType;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.Removal;
public final class TableCellDescriptor extends TCAbstractType implements Duplicatable {
public static final int SIZE = 20;
@@ -52,14 +51,6 @@ public final class TableCellDescriptor e
}
@Override
- @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
- @Deprecated
- @Removal(version = "5.0.0")
- public TableCellDescriptor clone() {
- return copy();
- }
-
- @Override
public TableCellDescriptor copy() {
return new TableCellDescriptor(this);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java?rev=1884269&r1=1884268&r2=1884269&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java Wed Dec 9 20:42:19 2020
@@ -19,7 +19,6 @@ package org.apache.poi.hwpf.usermodel;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.hwpf.model.types.TAPAbstractType;
-import org.apache.poi.util.Removal;
public final class TableProperties extends TAPAbstractType implements Duplicatable {
@@ -65,14 +64,6 @@ public final class TableProperties exten
}
@Override
- @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
- @Deprecated
- @Removal(version = "5.0.0")
- public TableProperties clone() {
- return copy();
- }
-
- @Override
public TableProperties copy() {
return new TableProperties(this);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org