You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2016/12/03 00:49:09 UTC
svn commit: r1772424 - in /poi: site/src/documentation/content/xdocs/
trunk/src/ooxml/java/org/apache/poi/
trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/
trunk/src/ooxml/java/org/apache/poi/xdgf/xml/
trunk/src/ooxml/java/org/apache/poi/xslf/usermo...
Author: kiwiwings
Date: Sat Dec 3 00:49:08 2016
New Revision: 1772424
URL: http://svn.apache.org/viewvc?rev=1772424&view=rev
Log:
#60331 - Remove deprecated classes - remove constructors with PackageRelationship argument
Modified:
poi/site/src/documentation/content/xdocs/status.xml
poi/trunk/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java
poi/trunk/src/ooxml/java/org/apache/poi/POIXMLFactory.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
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/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
poi/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
Modified: poi/site/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/status.xml?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/status.xml (original)
+++ poi/site/src/documentation/content/xdocs/status.xml Sat Dec 3 00:49:08 2016
@@ -61,9 +61,9 @@
<summary-item>The third-party jar for commons-collections4 is now required for handling of OLE2 properties</summary-item>
</summary>
<actions>
+ <action dev="PD" type="remove" fixes-bug="60331" breaks-compatibility="true" module="OOXML">Remove deprecated classes - remove constructors with PackageRelationship argument</action>
<action dev="PD" type="fix" fixes-bug="60329" module="XWPF">Added try/catch block to swallow NPE</action>
<action dev="PD" type="fix" fixes-bug="60370" module="XSSF">Encode some special characters when setting title/text for validation text-boxes</action>
- <action dev="PD" type="fix" fixes-bug="60331" module="HPSF">Remove deprecated classes - deprecate Mutable* property classes</action>
<action dev="PD" type="fix" fixes-bug="60427" module="XSLF">Creating pictures in PowerPoint slides requires scratchpad-jar for adding WMF images</action>
<action dev="PD" type="remove" fixes-bug="60331" module="HPSF">Remove deprecated classes - deprecate Mutable* property classes</action>
<action dev="PD" type="fix" fixes-bug="59200" module="SS Common">Check for actual Excel limits on data validation title/text</action>
Modified: poi/trunk/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java Sat Dec 3 00:49:08 2016
@@ -166,37 +166,6 @@ public class POIXMLDocumentPart {
}
/**
- * Creates an POIXMLDocumentPart representing the given package part and relationship.
- * Called by {@link #read(POIXMLFactory, java.util.Map)} when reading in an existing file.
- *
- * @param part - The package part that holds xml data representing this sheet.
- * @param rel - the relationship of the given package part
- * @see #read(POIXMLFactory, java.util.Map)
- *
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public POIXMLDocumentPart(PackagePart part, PackageRelationship rel){
- this(null, part);
- }
-
- /**
- * Creates an POIXMLDocumentPart representing the given package part, relationship and parent
- * Called by {@link #read(POIXMLFactory, java.util.Map)} when reading in an exisiting file.
- *
- * @param parent - Parent part
- * @param part - The package part that holds xml data represenring this sheet.
- * @param rel - the relationship of the given package part
- * @see #read(POIXMLFactory, java.util.Map)
- *
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public POIXMLDocumentPart(POIXMLDocumentPart parent, PackagePart part, PackageRelationship rel){
- this(parent, part);
- }
-
- /**
* When you open something like a theme, call this to
* re-base the XML Document onto the core child of the
* current core document
@@ -228,34 +197,6 @@ public class POIXMLDocumentPart {
}
/**
- * Provides access to the PackageRelationship that identifies this POIXMLDocumentPart
- *
- * @return the PackageRelationship that identifies this POIXMLDocumentPart
- *
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- @SuppressWarnings("resource")
- public final PackageRelationship getPackageRelationship() {
- if (this.parent != null) {
- for (RelationPart rp : parent.getRelationParts()) {
- if (rp.getDocumentPart() == this) {
- return rp.getRelationship();
- }
- }
- } else {
- OPCPackage pkg = getPackagePart().getPackage();
- String partName = getPackagePart().getPartName().getName();
- for (PackageRelationship rel : pkg.getRelationships()) {
- if (rel.getTargetURI().toASCIIString().equals(partName)) {
- return rel;
- }
- }
- }
- return null;
- }
-
- /**
* Returns the list of child relations for this POIXMLDocumentPart
*
* @return child relations
@@ -316,20 +257,6 @@ public class POIXMLDocumentPart {
}
/**
- * Add a new child POIXMLDocumentPart
- *
- * @param id the id of an existing child to replace
- * @param part the child to add
- *
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public final void addRelation(String id, POIXMLDocumentPart part) {
- PackageRelationship pr = part.getPackagePart().getRelationship(id);
- addRelation(pr, part);
- }
-
- /**
* Add a new child POIXMLDocumentPart
*
* @param relId the preferred relation id, when null the next free relation id will be used
Modified: poi/trunk/src/ooxml/java/org/apache/poi/POIXMLFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/POIXMLFactory.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/POIXMLFactory.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/POIXMLFactory.java Sat Dec 3 00:49:08 2016
@@ -92,22 +92,6 @@ public abstract class POIXMLFactory {
* @since POI 3.14-Beta1
*/
protected abstract POIXMLRelation getDescriptor(String relationshipType);
-
- /**
- * Create a POIXMLDocumentPart from existing package part and relation. This method is called
- * from {@link POIXMLDocument#load(POIXMLFactory)} when parsing a document
- *
- * @param parent parent part
- * @param rel the package part relationship
- * @param part the PackagePart representing the created instance
- * @return A new instance of a POIXMLDocumentPart.
- *
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public final POIXMLDocumentPart createDocumentPart(POIXMLDocumentPart parent, PackageRelationship rel, PackagePart part) {
- return createDocumentPart(parent, part);
- }
/**
* Create a new POIXMLDocumentPart using the supplied descriptor. This method is used when adding new parts
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java Sat Dec 3 00:49:08 2016
@@ -59,14 +59,6 @@ public class XDGFBaseContents extends XD
public XDGFBaseContents(PackagePart part, XDGFDocument document) {
super(part, document);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XDGFBaseContents(PackagePart part, PackageRelationship rel, XDGFDocument document) {
- this(part, document);
- }
@Internal
public PageContentsType getXmlObject() {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java Sat Dec 3 00:49:08 2016
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.xdgf.exceptions.XDGFException;
import org.apache.xmlbeans.XmlException;
@@ -40,15 +39,6 @@ public class XDGFMasterContents extends
public XDGFMasterContents(PackagePart part, XDGFDocument document) {
super(part, document);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XDGFMasterContents(PackagePart part, PackageRelationship rel, XDGFDocument document) {
- this(part, document);
- }
-
@Override
protected void onDocumentRead() {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java Sat Dec 3 00:49:08 2016
@@ -26,7 +26,6 @@ import java.util.Map;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Internal;
import org.apache.poi.xdgf.exceptions.XDGFException;
import org.apache.poi.xdgf.xml.XDGFXMLDocumentPart;
@@ -52,14 +51,6 @@ public class XDGFMasters extends XDGFXML
public XDGFMasters(PackagePart part, XDGFDocument document) {
super(part, document);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XDGFMasters(PackagePart part, PackageRelationship rel, XDGFDocument document) {
- this(part, document);
- }
@Internal
protected MastersType getXmlObject() {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java Sat Dec 3 00:49:08 2016
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.xdgf.exceptions.XDGFException;
import org.apache.xmlbeans.XmlException;
@@ -41,14 +40,6 @@ public class XDGFPageContents extends XD
public XDGFPageContents(PackagePart part, XDGFDocument document) {
super(part, document);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XDGFPageContents(PackagePart part, PackageRelationship rel, XDGFDocument document) {
- this(part, document);
- }
@Override
protected void onDocumentRead() {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java Sat Dec 3 00:49:08 2016
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Internal;
import org.apache.poi.xdgf.exceptions.XDGFException;
import org.apache.poi.xdgf.xml.XDGFXMLDocumentPart;
@@ -51,14 +50,6 @@ public class XDGFPages extends XDGFXMLDo
public XDGFPages(PackagePart part, XDGFDocument document) {
super(part, document);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XDGFPages(PackagePart part, PackageRelationship rel, XDGFDocument document) {
- this(part, document);
- }
@Internal
PagesType getXmlObject() {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java Sat Dec 3 00:49:08 2016
@@ -18,7 +18,6 @@ package org.apache.poi.xdgf.xml;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.xdgf.usermodel.XDGFDocument;
public class XDGFXMLDocumentPart extends POIXMLDocumentPart {
@@ -32,13 +31,4 @@ public class XDGFXMLDocumentPart extends
super(part);
_document = document;
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XDGFXMLDocumentPart(PackagePart part, PackageRelationship rel, XDGFDocument document) {
- this(part, document);
- }
-
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java Sat Dec 3 00:49:08 2016
@@ -28,7 +28,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Beta;
import org.apache.poi.util.Internal;
import org.apache.xmlbeans.XmlException;
@@ -70,21 +69,6 @@ public final class XSLFChart extends POI
chart = chartSpace.getChart();
}
- /**
- * Construct a chart from a package part.
- *
- * @param part the package part holding the chart data,
- * the content type must be <code>application/vnd.openxmlformats-officedocument.drawingml.chart+xml</code>
- * @param rel the package relationship holding this chart,
- * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart
- *
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSLFChart(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
-
/**
* Return the underlying CTChartSpace bean, the root element of the Chart part.
*
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java Sat Dec 3 00:49:08 2016
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.presentationml.x2006.main.CTCommentAuthor;
@@ -57,21 +56,6 @@ public class XSLFCommentAuthors extends
CmAuthorLstDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
_authors = doc.getCmAuthorLst();
}
-
- /**
- * Construct a SpreadsheetML slide authors from a package part
- *
- * @param part the package part holding the comment authors data,
- * the content type must be <code>application/vnd.openxmlformats-officedocument.commentAuthors+xml</code>
- * @param rel the package relationship holding this comment authors,
- * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors
- *
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- XSLFCommentAuthors(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
public CTCommentAuthorList getCTCommentAuthorsList() {
return _authors;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java Sat Dec 3 00:49:08 2016
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.presentationml.x2006.main.CTComment;
@@ -59,21 +58,6 @@ public class XSLFComments extends POIXML
_comments = doc.getCmLst();
}
- /**
- * Construct a SpreadsheetML slide comments from a package part
- *
- * @param part the package part holding the comments data,
- * the content type must be <code>application/vnd.openxmlformats-officedocument.comments+xml</code>
- * @param rel the package relationship holding this comments,
- * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments
- *
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- XSLFComments(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
-
public CTCommentList getCTCommentsList() {
return _comments;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java Sat Dec 3 00:49:08 2016
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.sl.usermodel.Notes;
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlException;
@@ -65,14 +64,6 @@ implements Notes<XSLFShape,XSLFTextParag
setCommonSlideData(_notes.getCSld());
}
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- XSLFNotes(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
-
private static CTNotesSlide prototype(){
CTNotesSlide ctNotes = CTNotesSlide.Factory.newInstance();
CTCommonSlideData cSld = ctNotes.addNewCSld();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java Sat Dec 3 00:49:08 2016
@@ -24,7 +24,6 @@ import java.io.InputStream;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.sl.usermodel.MasterSheet;
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlException;
@@ -69,14 +68,6 @@ import org.openxmlformats.schemas.presen
_slide = doc.getNotesMaster();
setCommonSlideData(_slide.getCSld());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSLFNotesMaster(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
private static CTNotesMaster prototype() {
InputStream is = XSLFNotesMaster.class.getResourceAsStream("notesMaster.xml");
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java Sat Dec 3 00:49:08 2016
@@ -27,7 +27,6 @@ import java.io.OutputStream;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.sl.image.ImageHeaderBitmap;
import org.apache.poi.sl.image.ImageHeaderEMF;
import org.apache.poi.sl.image.ImageHeaderPICT;
@@ -67,19 +66,6 @@ public final class XSLFPictureData exten
public XSLFPictureData(PackagePart part) {
super(part);
}
-
- /**
- * Construct XSLFPictureData from a package part
- *
- * @param part the package part holding the drawing data,
- * @param rel the package relationship holding this drawing,
- * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/image
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XSLFPictureData(PackagePart part, PackageRelationship rel) {
- this(part);
- }
/**
* An InputStream to read the picture data directly
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java Sat Dec 3 00:49:08 2016
@@ -82,14 +82,6 @@ implements XSLFShapeContainer, Sheet<XSL
}
/**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XSLFSheet(PackagePart part, PackageRelationship rel){
- this(part);
- }
-
- /**
* @return the XMLSlideShow this sheet belongs to
*/
@Override
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java Sat Dec 3 00:49:08 2016
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.sl.draw.DrawFactory;
import org.apache.poi.sl.draw.Drawable;
import org.apache.poi.sl.usermodel.Notes;
@@ -33,7 +32,6 @@ import org.apache.poi.util.Beta;
import org.apache.poi.util.DocumentHelper;
import org.apache.poi.util.NotImplemented;
import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlip;
import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupShapeProperties;
import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupTransform2D;
import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
@@ -87,15 +85,6 @@ implements Slide<XSLFShape,XSLFTextParag
_slide = doc.getSld();
setCommonSlideData(_slide.getCSld());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- XSLFSlide(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
-
private static CTSlide prototype(){
CTSlide ctSlide = CTSlide.Factory.newInstance();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java Sat Dec 3 00:49:08 2016
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.sl.usermodel.MasterSheet;
import org.apache.poi.sl.usermodel.Placeholder;
import org.apache.poi.util.Beta;
@@ -55,14 +54,6 @@ implements MasterSheet<XSLFShape,XSLFTex
setCommonSlideData(_layout.getCSld());
}
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XSLFSlideLayout(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
-
public String getName() {
return _layout.getCSld().getName();
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java Sat Dec 3 00:49:08 2016
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.sl.usermodel.MasterSheet;
import org.apache.poi.sl.usermodel.Placeholder;
import org.apache.poi.util.Beta;
@@ -79,14 +78,6 @@ import org.openxmlformats.schemas.presen
_slide = doc.getSldMaster();
setCommonSlideData(_slide.getCSld());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSLFSlideMaster(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
@Override
public CTSlideMaster getXmlObject() {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java Sat Dec 3 00:49:08 2016
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTableStyle;
@@ -57,14 +56,6 @@ public class XSLFTableStyles extends POI
_styles.add(new XSLFTableStyle(c));
}
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XSLFTableStyles(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
public CTTableStyleList getXmlObject(){
return _tblStyleLst;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java Sat Dec 3 00:49:08 2016
@@ -27,7 +27,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Beta;
import org.apache.poi.util.Internal;
import org.apache.xmlbeans.XmlException;
@@ -66,14 +65,6 @@ public class XSLFTheme extends POIXMLDoc
_theme = doc.getTheme();
initialize();
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XSLFTheme(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
public void importTheme(XSLFTheme theme) {
_theme = theme.getXmlObject();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java Sat Dec 3 00:49:08 2016
@@ -28,7 +28,6 @@ import javax.xml.parsers.ParserConfigura
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.SAXHelper;
import org.apache.poi.xssf.usermodel.XSSFRelation;
import org.xml.sax.Attributes;
@@ -122,15 +121,6 @@ public class ReadOnlySharedStringsTable
public ReadOnlySharedStringsTable(PackagePart part) throws IOException, SAXException {
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public ReadOnlySharedStringsTable(PackagePart part, PackageRelationship rel_ignored)
- throws IOException, SAXException {
- this(part);
- }
/**
* Read this shared strings table from an XML file.
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java Sat Dec 3 00:49:08 2016
@@ -47,7 +47,6 @@ import org.apache.poi.xssf.usermodel.XSS
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheet;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STSheetState;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.WorkbookDocument;
/**
@@ -94,7 +93,7 @@ public class XSSFReader {
*/
public SharedStringsTable getSharedStringsTable() throws IOException, InvalidFormatException {
ArrayList<PackagePart> parts = pkg.getPartsByContentType( XSSFRelation.SHARED_STRINGS.getContentType());
- return parts.size() == 0 ? null : new SharedStringsTable(parts.get(0), null);
+ return parts.size() == 0 ? null : new SharedStringsTable(parts.get(0));
}
/**
@@ -106,10 +105,10 @@ public class XSSFReader {
if(parts.size() == 0) return null;
// Create the Styles Table, and associate the Themes if present
- StylesTable styles = new StylesTable(parts.get(0), null);
+ StylesTable styles = new StylesTable(parts.get(0));
parts = pkg.getPartsByContentType( XSSFRelation.THEME.getContentType());
if(parts.size() != 0) {
- styles.setTheme(new ThemesTable(parts.get(0), null));
+ styles.setTheme(new ThemesTable(parts.get(0)));
}
return styles;
}
@@ -295,7 +294,7 @@ public class XSSFReader {
PackageRelationship comments = commentsList.getRelationship(0);
PackagePartName commentsName = PackagingURIHelper.createPartName(comments.getTargetURI());
PackagePart commentsPart = sheetPkg.getPackage().getPart(commentsName);
- return new CommentsTable(commentsPart, comments);
+ return new CommentsTable(commentsPart);
}
} catch (InvalidFormatException e) {
return null;
@@ -319,7 +318,7 @@ public class XSSFReader {
PackageRelationship drawings = drawingsList.getRelationship(i);
PackagePartName drawingsName = PackagingURIHelper.createPartName(drawings.getTargetURI());
PackagePart drawingsPart = sheetPkg.getPackage().getPart(drawingsName);
- XSSFDrawing drawing = new XSSFDrawing(drawingsPart, drawings);
+ XSSFDrawing drawing = new XSSFDrawing(drawingsPart);
for (XSSFShape shape : drawing.getShapes()){
shapes.add(shape);
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java Sat Dec 3 00:49:08 2016
@@ -24,7 +24,6 @@ import java.io.OutputStream;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcCell;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcChain;
@@ -51,14 +50,6 @@ public class CalculationChain extends PO
super(part);
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public CalculationChain(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
public void readFrom(InputStream is) throws IOException {
try {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java Sat Dec 3 00:49:08 2016
@@ -28,7 +28,6 @@ import java.util.TreeMap;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.util.Internal;
import org.apache.poi.xssf.usermodel.XSSFComment;
@@ -67,14 +66,6 @@ public class CommentsTable extends POIXM
super(part);
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public CommentsTable(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
public void readFrom(InputStream is) throws IOException {
try {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java Sat Dec 3 00:49:08 2016
@@ -56,14 +56,6 @@ public class ExternalLinksTable extends
super(part);
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public ExternalLinksTable(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
public void readFrom(InputStream is) throws IOException {
try {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java Sat Dec 3 00:49:08 2016
@@ -28,7 +28,6 @@ import java.util.Map;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.xssf.usermodel.XSSFMap;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.xmlbeans.XmlException;
@@ -69,13 +68,6 @@ public class MapInfo extends POIXMLDocum
readFrom(part.getInputStream());
}
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- public MapInfo(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
-
public void readFrom(InputStream is) throws IOException {
try {
MapInfoDocument doc = MapInfoDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java Sat Dec 3 00:49:08 2016
@@ -31,7 +31,6 @@ import java.util.Map;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
@@ -109,13 +108,6 @@ public class SharedStringsTable extends
}
/**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- public SharedStringsTable(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
-
- /**
* Read this shared strings table from an XML file.
*
* @param is The input stream containing the XML document.
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java Sat Dec 3 00:49:08 2016
@@ -27,7 +27,6 @@ import java.util.Vector;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.helpers.XSSFSingleXmlCell;
import org.apache.xmlbeans.XmlException;
@@ -63,14 +62,6 @@ public class SingleXmlCells extends POIX
readFrom(part.getInputStream());
}
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public SingleXmlCells(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
-
public void readFrom(InputStream is) throws IOException {
try {
SingleXmlCellsDocument doc = SingleXmlCellsDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java Sat Dec 3 00:49:08 2016
@@ -33,7 +33,6 @@ import java.util.TreeMap;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.BuiltinFormats;
import org.apache.poi.ss.usermodel.FontFamily;
@@ -145,14 +144,6 @@ public class StylesTable extends POIXMLD
super(part);
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public StylesTable(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
public void setWorkbook(XSSFWorkbook wb) {
this.workbook = wb;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java Sat Dec 3 00:49:08 2016
@@ -23,7 +23,6 @@ import java.io.OutputStream;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.xssf.usermodel.XSSFColor;
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.drawingml.x2006.main.CTColor;
@@ -87,14 +86,6 @@ public class ThemesTable extends POIXMLD
throw new IOException(e.getLocalizedMessage(), e);
}
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public ThemesTable(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
/**
* Construct a ThemesTable from an existing ThemeDocument.
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java Sat Dec 3 00:49:08 2016
@@ -28,7 +28,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.ss.usermodel.Chart;
import org.apache.poi.ss.usermodel.charts.AxisPosition;
import org.apache.poi.ss.usermodel.charts.ChartAxis;
@@ -105,15 +104,6 @@ public final class XSSFChart extends POI
chartSpace = ChartSpaceDocument.Factory.parse(part.getInputStream(), DEFAULT_XML_OPTIONS).getChartSpace();
chart = chartSpace.getChart();
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFChart(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
-
/**
* Construct a new CTChartSpace bean.
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java Sat Dec 3 00:49:08 2016
@@ -29,7 +29,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTChartsheet;
@@ -57,14 +56,6 @@ public class XSSFChartSheet extends XSSF
protected XSSFChartSheet(PackagePart part) {
super(part);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFChartSheet(PackagePart part, PackageRelationship rel) {
- this(part);
- }
protected void read(InputStream is) throws IOException {
//initialize the supeclass with a blank worksheet
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java Sat Dec 3 00:49:08 2016
@@ -17,7 +17,6 @@
package org.apache.poi.xssf.usermodel;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.ss.usermodel.Sheet;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDialogsheet;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
@@ -34,8 +33,8 @@ import org.openxmlformats.schemas.spread
public class XSSFDialogsheet extends XSSFSheet implements Sheet{
protected CTDialogsheet dialogsheet;
- protected XSSFDialogsheet(XSSFSheet sheet, PackageRelationship rel) {
- super(sheet.getPackagePart(), rel);
+ protected XSSFDialogsheet(XSSFSheet sheet) {
+ super(sheet.getPackagePart());
this.dialogsheet = CTDialogsheet.Factory.newInstance();
this.worksheet = CTWorksheet.Factory.newInstance();
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java Sat Dec 3 00:49:08 2016
@@ -88,14 +88,6 @@ public final class XSSFDrawing extends P
options.setLoadReplaceDocumentElement(null);
drawing = CTDrawing.Factory.parse(part.getInputStream(),options);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XSSFDrawing(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
/**
* Construct a new CTDrawing bean. By default, it's just an empty placeholder for drawing objects
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java Sat Dec 3 00:49:08 2016
@@ -23,7 +23,6 @@ import org.apache.poi.POIXMLDocumentPart
import org.apache.poi.POIXMLException;
import org.apache.poi.POIXMLRelation;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.ss.usermodel.PictureData;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.IOUtils;
@@ -72,14 +71,6 @@ public class XSSFPictureData extends POI
protected XSSFPictureData(PackagePart part) {
super(part);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFPictureData(PackagePart part, PackageRelationship rel) {
- this(part);
- }
/**
* Gets the picture data as a byte array.
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java Sat Dec 3 00:49:08 2016
@@ -23,7 +23,6 @@ import java.io.InputStream;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
@@ -58,14 +57,6 @@ public class XSSFPivotCache extends POIX
super(part);
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFPivotCache(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
@Beta
protected void readFrom(InputStream is) throws IOException {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java Sat Dec 3 00:49:08 2016
@@ -27,7 +27,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
@@ -70,14 +69,6 @@ public class XSSFPivotCacheDefinition ex
super(part);
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFPivotCacheDefinition(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
@Beta
public void readFrom(InputStream is) throws IOException {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java Sat Dec 3 00:49:08 2016
@@ -26,7 +26,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.Beta;
import org.apache.poi.util.Internal;
import org.apache.xmlbeans.XmlException;
@@ -55,14 +54,6 @@ public class XSSFPivotCacheRecords exten
super(part);
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFPivotCacheRecords(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
@Beta
protected void readFrom(InputStream is) throws IOException {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java Sat Dec 3 00:49:08 2016
@@ -29,7 +29,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.DataConsolidateFunction;
@@ -78,14 +77,6 @@ public class XSSFPivotTable extends POIX
super(part);
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFPivotTable(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
@Beta
public void readFrom(InputStream is) throws IOException {
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=1772424&r1=1772423&r2=1772424&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 Sat Dec 3 00:49:08 2016
@@ -99,7 +99,7 @@ import org.openxmlformats.schemas.spread
* contain text, numbers, dates, and formulas. Cells can also be formatted.
* </p>
*/
-public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
+public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
private static final POILogger logger = POILogFactory.getLogger(XSSFSheet.class);
private static final double DEFAULT_ROW_HEIGHT = 15.0;
@@ -153,14 +153,6 @@ public class XSSFSheet extends POIXMLDoc
}
/**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFSheet(PackagePart part, PackageRelationship rel) {
- this(part);
- }
-
- /**
* Returns the parent XSSFWorkbook
*
* @return the parent XSSFWorkbook
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=1772424&r1=1772423&r2=1772424&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 Sat Dec 3 00:49:08 2016
@@ -30,12 +30,11 @@ import java.util.Locale;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.ss.usermodel.Table;
import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.helpers.XSSFXmlColumnPr;
import org.apache.poi.util.Internal;
import org.apache.poi.util.StringUtil;
+import org.apache.poi.xssf.usermodel.helpers.XSSFXmlColumnPr;
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTable;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumn;
@@ -76,14 +75,6 @@ public class XSSFTable extends POIXMLDoc
super(part);
readFrom(part.getInputStream());
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XSSFTable(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
public void readFrom(InputStream is) throws IOException {
try {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java Sat Dec 3 00:49:08 2016
@@ -19,7 +19,6 @@ package org.apache.poi.xssf.usermodel;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
public class XSSFVBAPart extends POIXMLDocumentPart {
@@ -40,14 +39,6 @@ public class XSSFVBAPart extends POIXMLD
protected XSSFVBAPart(PackagePart part) {
super(part);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFVBAPart(PackagePart part, PackageRelationship rel) {
- this(part);
- }
/**
* Like *PictureData, VBA objects store the actual content in the part
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java Sat Dec 3 00:49:08 2016
@@ -33,7 +33,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.DocumentHelper;
import org.apache.poi.xssf.util.EvilUnclosedBRFixingInputStream;
import org.apache.xmlbeans.XmlCursor;
@@ -121,14 +120,6 @@ public final class XSSFVMLDrawing extend
read(getPackagePart().getInputStream());
}
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- protected XSSFVMLDrawing(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
- this(part);
- }
-
@SuppressWarnings("resource")
protected void read(InputStream is) throws IOException, XmlException {
Document doc;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java Sat Dec 3 00:49:08 2016
@@ -873,9 +873,7 @@ public class XSSFWorkbook extends POIXML
protected XSSFDialogsheet createDialogsheet(String sheetname, CTDialogsheet dialogsheet) {
XSSFSheet sheet = createSheet(sheetname);
- String sheetRelId = getRelationId(sheet);
- PackageRelationship pr = getPackagePart().getRelationship(sheetRelId);
- return new XSSFDialogsheet(sheet, pr);
+ return new XSSFDialogsheet(sheet);
}
private CTSheet addSheet(String sheetname) {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java Sat Dec 3 00:49:08 2016
@@ -27,7 +27,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
@@ -73,14 +72,6 @@ public class XWPFFooter extends XWPFHead
public XWPFFooter(POIXMLDocumentPart parent, PackagePart part) throws IOException {
super(parent, part);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XWPFFooter(POIXMLDocumentPart parent, PackagePart part, PackageRelationship rel) throws IOException {
- this(parent, part);
- }
/**
* save and commit footer
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java Sat Dec 3 00:49:08 2016
@@ -31,7 +31,6 @@ import org.apache.poi.POIXMLDocumentPart
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFootnotes;
@@ -56,14 +55,6 @@ public class XWPFFootnotes extends POIXM
public XWPFFootnotes(PackagePart part) throws IOException, OpenXML4JException {
super(part);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XWPFFootnotes(PackagePart part, PackageRelationship rel) throws IOException, OpenXML4JException {
- this(part);
- }
/**
* Construct XWPFFootnotes from scratch for a new document.
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java Sat Dec 3 00:49:08 2016
@@ -27,7 +27,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -53,14 +52,6 @@ public class XWPFHeader extends XWPFHead
public XWPFHeader(POIXMLDocumentPart parent, PackagePart part) throws IOException {
super(parent, part);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XWPFHeader(POIXMLDocumentPart parent, PackagePart part, PackageRelationship rel) throws IOException {
- this(parent, part);
- }
public XWPFHeader(XWPFDocument doc, CTHdrFtr hdrFtr) {
super(doc, hdrFtr);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java Sat Dec 3 00:49:08 2016
@@ -28,7 +28,6 @@ import org.apache.poi.POIXMLException;
import org.apache.poi.POIXMLRelation;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.xmlbeans.XmlCursor;
@@ -77,14 +76,6 @@ public abstract class XWPFHeaderFooter e
throw new NullPointerException();
}
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XWPFHeaderFooter(POIXMLDocumentPart parent, PackagePart part, PackageRelationship rel) throws IOException {
- this(parent, part);
- }
@Override
protected void onDocumentRead() throws IOException {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java Sat Dec 3 00:49:08 2016
@@ -31,7 +31,6 @@ import org.apache.poi.POIXMLDocumentPart
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAbstractNum;
@@ -57,14 +56,6 @@ public class XWPFNumbering extends POIXM
super(part);
isNew = true;
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XWPFNumbering(PackagePart part, PackageRelationship rel) throws IOException, OpenXML4JException {
- this(part);
- }
/**
* create a new XWPFNumbering object for use in a new document
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java Sat Dec 3 00:49:08 2016
@@ -26,7 +26,6 @@ import org.apache.poi.POIXMLException;
import org.apache.poi.POIXMLRelation;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.util.IOUtils;
/**
@@ -78,14 +77,6 @@ public class XWPFPictureData extends POI
public XWPFPictureData(PackagePart part) {
super(part);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XWPFPictureData(PackagePart part, PackageRelationship rel) {
- this(part);
- }
@Override
protected void onDocumentRead() throws IOException {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java Sat Dec 3 00:49:08 2016
@@ -30,7 +30,6 @@ import javax.xml.namespace.QName;
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.poifs.crypt.CryptoFunctions;
import org.apache.poi.poifs.crypt.HashAlgorithm;
import org.apache.xmlbeans.XmlOptions;
@@ -55,14 +54,6 @@ public class XWPFSettings extends POIXML
public XWPFSettings(PackagePart part) throws IOException {
super(part);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XWPFSettings(PackagePart part, PackageRelationship rel) throws IOException {
- this(part);
- }
public XWPFSettings() {
super();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java Sat Dec 3 00:49:08 2016
@@ -31,7 +31,6 @@ import org.apache.poi.POIXMLDocumentPart
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDocDefaults;
@@ -68,14 +67,6 @@ public class XWPFStyles extends POIXMLDo
public XWPFStyles(PackagePart part) throws IOException, OpenXML4JException {
super(part);
}
-
- /**
- * @deprecated in POI 3.14, scheduled for removal in POI 3.16
- */
- @Deprecated
- public XWPFStyles(PackagePart part, PackageRelationship rel) throws IOException, OpenXML4JException {
- this(part);
- }
/**
* Construct XWPFStyles from scratch for a new document.
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java Sat Dec 3 00:49:08 2016
@@ -34,6 +34,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import org.apache.poi.POIXMLDocumentPart.RelationPart;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
import org.apache.poi.openxml4j.opc.OPCPackage;
@@ -43,7 +44,6 @@ import org.apache.poi.util.NullOutputStr
import org.apache.poi.util.PackageHelper;
import org.apache.poi.util.TempFile;
import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.apache.poi.xslf.usermodel.XSLFShape;
import org.apache.poi.xssf.usermodel.XSSFRelation;
import org.apache.poi.xwpf.usermodel.XWPFRelation;
import org.junit.Test;
@@ -95,23 +95,31 @@ public final class TestPOIXMLDocument {
}
}
+ private static void traverse(POIXMLDocument doc) throws IOException{
+ HashMap<String,POIXMLDocumentPart> context = new HashMap<String,POIXMLDocumentPart>();
+ for (RelationPart p : doc.getRelationParts()){
+ traverse(p, context);
+ }
+ }
+
/**
* Recursively traverse a OOXML document and assert that same logical parts have the same physical instances
*/
- private static void traverse(POIXMLDocumentPart part, HashMap<String,POIXMLDocumentPart> context) throws IOException{
- assertEquals(part.getPackageRelationship().getTargetURI().toString(), part.getPackagePart().getPartName().getName());
+ private static void traverse(RelationPart rp, HashMap<String,POIXMLDocumentPart> context) throws IOException{
+ POIXMLDocumentPart dp = rp.getDocumentPart();
+ assertEquals(rp.getRelationship().getTargetURI().toString(), dp.getPackagePart().getPartName().getName());
- context.put(part.getPackagePart().getPartName().getName(), part);
- for(POIXMLDocumentPart p : part.getRelations()){
- assertNotNull(p.toString());
+ context.put(dp.getPackagePart().getPartName().getName(), dp);
+ for(RelationPart p : dp.getRelationParts()){
+ assertNotNull(p.getRelationship().toString());
- String uri = p.getPackagePart().getPartName().getURI().toString();
- assertEquals(uri, p.getPackageRelationship().getTargetURI().toString());
+ String uri = p.getDocumentPart().getPackagePart().getPartName().getURI().toString();
+ assertEquals(uri, p.getRelationship().getTargetURI().toString());
if (!context.containsKey(uri)) {
traverse(p, context);
} else {
POIXMLDocumentPart prev = context.get(uri);
- assertSame("Duplicate POIXMLDocumentPart instance for targetURI=" + uri, prev, p);
+ assertSame("Duplicate POIXMLDocumentPart instance for targetURI=" + uri, prev, p.getDocumentPart());
}
}
}
@@ -121,9 +129,7 @@ public final class TestPOIXMLDocument {
OPCParser doc = new OPCParser(pkg1);
doc.parse(new TestFactory());
- HashMap<String,POIXMLDocumentPart> context = new HashMap<String,POIXMLDocumentPart>();
- traverse(doc, context);
- context.clear();
+ traverse(doc);
File tmp = TempFile.createTempFile("poi-ooxml", ".tmp");
FileOutputStream out = new FileOutputStream(tmp);
@@ -167,9 +173,7 @@ public final class TestPOIXMLDocument {
doc = new OPCParser(pkg1);
try {
doc.parse(new TestFactory());
- context = new HashMap<String,POIXMLDocumentPart>();
- traverse(doc, context);
- context.clear();
+ traverse(doc);
assertEquals(pkg1.getRelationships().size(), pkg2.getRelationships().size());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java Sat Dec 3 00:49:08 2016
@@ -44,8 +44,8 @@ public final class TestReadOnlySharedStr
List<PackagePart> parts = pkg.getPartsByName(Pattern.compile("/xl/sharedStrings.xml"));
assertEquals(1, parts.size());
- SharedStringsTable stbl = new SharedStringsTable(parts.get(0), null);
- ReadOnlySharedStringsTable rtbl = new ReadOnlySharedStringsTable(parts.get(0), null);
+ SharedStringsTable stbl = new SharedStringsTable(parts.get(0));
+ ReadOnlySharedStringsTable rtbl = new ReadOnlySharedStringsTable(parts.get(0));
assertEquals(stbl.getCount(), rtbl.getCount());
assertEquals(stbl.getUniqueCount(), rtbl.getUniqueCount());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java?rev=1772424&r1=1772423&r2=1772424&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java Sat Dec 3 00:49:08 2016
@@ -37,9 +37,7 @@ import org.apache.poi.openxml4j.opc.OPCP
import org.apache.poi.openxml4j.opc.PackageAccess;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
import org.apache.poi.xwpf.XWPFTestDataSamples;
import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
import org.apache.xmlbeans.XmlCursor;
@@ -264,8 +262,7 @@ public final class TestXWPFDocument {
os.write(nature1);
os.close();
XWPFHeader xwpfHeader = doc.getHeaderArray(0);
- PackageRelationship relationship = xwpfHeader.getPackagePart().addRelationship(partName, TargetMode.INTERNAL, jpgRelation.getRelation());
- XWPFPictureData newPicData = new XWPFPictureData(newImagePart, relationship);
+ XWPFPictureData newPicData = new XWPFPictureData(newImagePart);
/* new part is now ready to rumble */
assertFalse(xwpfHeader.getAllPictures().contains(newPicData));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org