Skip to content

Commit 21009c9

Browse files
kiwiwingskiwiwings
committed
#60331 - Remove deprecated classes - remove constructors with PackageRelationship argument
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1772424 13f79535-47bb-0310-9956-ffa450edef68
1 parent fda7104 commit 21009c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+32
-572
lines changed

‎src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -165,37 +165,6 @@ public POIXMLDocumentPart(POIXMLDocumentPart parent, PackagePart part) {
165165
this.parent = parent;
166166
}
167167

168-
/**
169-
* Creates an POIXMLDocumentPart representing the given package part and relationship.
170-
* Called by {@link #read(POIXMLFactory, java.util.Map)} when reading in an existing file.
171-
*
172-
* @param part - The package part that holds xml data representing this sheet.
173-
* @param rel - the relationship of the given package part
174-
* @see #read(POIXMLFactory, java.util.Map)
175-
*
176-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
177-
*/
178-
@Deprecated
179-
public POIXMLDocumentPart(PackagePart part, PackageRelationship rel){
180-
this(null, part);
181-
}
182-
183-
/**
184-
* Creates an POIXMLDocumentPart representing the given package part, relationship and parent
185-
* Called by {@link #read(POIXMLFactory, java.util.Map)} when reading in an exisiting file.
186-
*
187-
* @param parent - Parent part
188-
* @param part - The package part that holds xml data represenring this sheet.
189-
* @param rel - the relationship of the given package part
190-
* @see #read(POIXMLFactory, java.util.Map)
191-
*
192-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
193-
*/
194-
@Deprecated
195-
public POIXMLDocumentPart(POIXMLDocumentPart parent, PackagePart part, PackageRelationship rel){
196-
this(parent, part);
197-
}
198-
199168
/**
200169
* When you open something like a theme, call this to
201170
* re-base the XML Document onto the core child of the
@@ -227,34 +196,6 @@ public final PackagePart getPackagePart(){
227196
return packagePart;
228197
}
229198

230-
/**
231-
* Provides access to the PackageRelationship that identifies this POIXMLDocumentPart
232-
*
233-
* @return the PackageRelationship that identifies this POIXMLDocumentPart
234-
*
235-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
236-
*/
237-
@Deprecated
238-
@SuppressWarnings("resource")
239-
public final PackageRelationship getPackageRelationship() {
240-
if (this.parent != null) {
241-
for (RelationPart rp : parent.getRelationParts()) {
242-
if (rp.getDocumentPart() == this) {
243-
return rp.getRelationship();
244-
}
245-
}
246-
} else {
247-
OPCPackage pkg = getPackagePart().getPackage();
248-
String partName = getPackagePart().getPartName().getName();
249-
for (PackageRelationship rel : pkg.getRelationships()) {
250-
if (rel.getTargetURI().toASCIIString().equals(partName)) {
251-
return rel;
252-
}
253-
}
254-
}
255-
return null;
256-
}
257-
258199
/**
259200
* Returns the list of child relations for this POIXMLDocumentPart
260201
*
@@ -315,20 +256,6 @@ public final String getRelationId(POIXMLDocumentPart part) {
315256
return null;
316257
}
317258

318-
/**
319-
* Add a new child POIXMLDocumentPart
320-
*
321-
* @param id the id of an existing child to replace
322-
* @param part the child to add
323-
*
324-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
325-
*/
326-
@Deprecated
327-
public final void addRelation(String id, POIXMLDocumentPart part) {
328-
PackageRelationship pr = part.getPackagePart().getRelationship(id);
329-
addRelation(pr, part);
330-
}
331-
332259
/**
333260
* Add a new child POIXMLDocumentPart
334261
*

‎src/ooxml/java/org/apache/poi/POIXMLFactory.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,6 @@ public POIXMLDocumentPart createDocumentPart(POIXMLDocumentPart parent, PackageP
9292
* @since POI 3.14-Beta1
9393
*/
9494
protected abstract POIXMLRelation getDescriptor(String relationshipType);
95-
96-
/**
97-
* Create a POIXMLDocumentPart from existing package part and relation. This method is called
98-
* from {@link POIXMLDocument#load(POIXMLFactory)} when parsing a document
99-
*
100-
* @param parent parent part
101-
* @param rel the package part relationship
102-
* @param part the PackagePart representing the created instance
103-
* @return A new instance of a POIXMLDocumentPart.
104-
*
105-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
106-
*/
107-
@Deprecated
108-
public final POIXMLDocumentPart createDocumentPart(POIXMLDocumentPart parent, PackageRelationship rel, PackagePart part) {
109-
return createDocumentPart(parent, part);
110-
}
11195

11296
/**
11397
* Create a new POIXMLDocumentPart using the supplied descriptor. This method is used when adding new parts

‎src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@ public class XDGFBaseContents extends XDGFXMLDocumentPart {
5959
public XDGFBaseContents(PackagePart part, XDGFDocument document) {
6060
super(part, document);
6161
}
62-
63-
/**
64-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
65-
*/
66-
@Deprecated
67-
public XDGFBaseContents(PackagePart part, PackageRelationship rel, XDGFDocument document) {
68-
this(part, document);
69-
}
7062

7163
@Internal
7264
public PageContentsType getXmlObject() {

‎src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2121

2222
import org.apache.poi.POIXMLException;
2323
import org.apache.poi.openxml4j.opc.PackagePart;
24-
import org.apache.poi.openxml4j.opc.PackageRelationship;
2524
import org.apache.poi.xdgf.exceptions.XDGFException;
2625
import org.apache.xmlbeans.XmlException;
2726

@@ -40,15 +39,6 @@ public class XDGFMasterContents extends XDGFBaseContents {
4039
public XDGFMasterContents(PackagePart part, XDGFDocument document) {
4140
super(part, document);
4241
}
43-
44-
/**
45-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
46-
*/
47-
@Deprecated
48-
public XDGFMasterContents(PackagePart part, PackageRelationship rel, XDGFDocument document) {
49-
this(part, document);
50-
}
51-
5242

5343
@Override
5444
protected void onDocumentRead() {

‎src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2626
import org.apache.poi.POIXMLDocumentPart;
2727
import org.apache.poi.POIXMLException;
2828
import org.apache.poi.openxml4j.opc.PackagePart;
29-
import org.apache.poi.openxml4j.opc.PackageRelationship;
3029
import org.apache.poi.util.Internal;
3130
import org.apache.poi.xdgf.exceptions.XDGFException;
3231
import org.apache.poi.xdgf.xml.XDGFXMLDocumentPart;
@@ -52,14 +51,6 @@ public class XDGFMasters extends XDGFXMLDocumentPart {
5251
public XDGFMasters(PackagePart part, XDGFDocument document) {
5352
super(part, document);
5453
}
55-
56-
/**
57-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
58-
*/
59-
@Deprecated
60-
public XDGFMasters(PackagePart part, PackageRelationship rel, XDGFDocument document) {
61-
this(part, document);
62-
}
6354

6455
@Internal
6556
protected MastersType getXmlObject() {

‎src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2424
import org.apache.poi.POIXMLDocumentPart;
2525
import org.apache.poi.POIXMLException;
2626
import org.apache.poi.openxml4j.opc.PackagePart;
27-
import org.apache.poi.openxml4j.opc.PackageRelationship;
2827
import org.apache.poi.xdgf.exceptions.XDGFException;
2928
import org.apache.xmlbeans.XmlException;
3029

@@ -41,14 +40,6 @@ public class XDGFPageContents extends XDGFBaseContents {
4140
public XDGFPageContents(PackagePart part, XDGFDocument document) {
4241
super(part, document);
4342
}
44-
45-
/**
46-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
47-
*/
48-
@Deprecated
49-
public XDGFPageContents(PackagePart part, PackageRelationship rel, XDGFDocument document) {
50-
this(part, document);
51-
}
5243

5344
@Override
5445
protected void onDocumentRead() {

‎src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2424
import org.apache.poi.POIXMLDocumentPart;
2525
import org.apache.poi.POIXMLException;
2626
import org.apache.poi.openxml4j.opc.PackagePart;
27-
import org.apache.poi.openxml4j.opc.PackageRelationship;
2827
import org.apache.poi.util.Internal;
2928
import org.apache.poi.xdgf.exceptions.XDGFException;
3029
import org.apache.poi.xdgf.xml.XDGFXMLDocumentPart;
@@ -51,14 +50,6 @@ public class XDGFPages extends XDGFXMLDocumentPart {
5150
public XDGFPages(PackagePart part, XDGFDocument document) {
5251
super(part, document);
5352
}
54-
55-
/**
56-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
57-
*/
58-
@Deprecated
59-
public XDGFPages(PackagePart part, PackageRelationship rel, XDGFDocument document) {
60-
this(part, document);
61-
}
6253

6354
@Internal
6455
PagesType getXmlObject() {

‎src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
1818

1919
import org.apache.poi.POIXMLDocumentPart;
2020
import org.apache.poi.openxml4j.opc.PackagePart;
21-
import org.apache.poi.openxml4j.opc.PackageRelationship;
2221
import org.apache.poi.xdgf.usermodel.XDGFDocument;
2322

2423
public class XDGFXMLDocumentPart extends POIXMLDocumentPart {
@@ -32,13 +31,4 @@ public XDGFXMLDocumentPart(PackagePart part, XDGFDocument document) {
3231
super(part);
3332
_document = document;
3433
}
35-
36-
/**
37-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
38-
*/
39-
@Deprecated
40-
public XDGFXMLDocumentPart(PackagePart part, PackageRelationship rel, XDGFDocument document) {
41-
this(part, document);
42-
}
43-
4434
}

‎src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
import org.apache.poi.POIXMLDocumentPart;
3030
import org.apache.poi.openxml4j.opc.PackagePart;
31-
import org.apache.poi.openxml4j.opc.PackageRelationship;
3231
import org.apache.poi.util.Beta;
3332
import org.apache.poi.util.Internal;
3433
import org.apache.xmlbeans.XmlException;
@@ -70,21 +69,6 @@ protected XSLFChart(PackagePart part) throws IOException, XmlException {
7069
chart = chartSpace.getChart();
7170
}
7271

73-
/**
74-
* Construct a chart from a package part.
75-
*
76-
* @param part the package part holding the chart data,
77-
* the content type must be <code>application/vnd.openxmlformats-officedocument.drawingml.chart+xml</code>
78-
* @param rel the package relationship holding this chart,
79-
* the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart
80-
*
81-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
82-
*/
83-
@Deprecated
84-
protected XSLFChart(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
85-
this(part);
86-
}
87-
8872
/**
8973
* Return the underlying CTChartSpace bean, the root element of the Chart part.
9074
*

‎src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2323

2424
import org.apache.poi.POIXMLDocumentPart;
2525
import org.apache.poi.openxml4j.opc.PackagePart;
26-
import org.apache.poi.openxml4j.opc.PackageRelationship;
2726
import org.apache.poi.util.Beta;
2827
import org.apache.xmlbeans.XmlException;
2928
import org.openxmlformats.schemas.presentationml.x2006.main.CTCommentAuthor;
@@ -57,21 +56,6 @@ public class XSLFCommentAuthors extends POIXMLDocumentPart {
5756
CmAuthorLstDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
5857
_authors = doc.getCmAuthorLst();
5958
}
60-
61-
/**
62-
* Construct a SpreadsheetML slide authors from a package part
63-
*
64-
* @param part the package part holding the comment authors data,
65-
* the content type must be <code>application/vnd.openxmlformats-officedocument.commentAuthors+xml</code>
66-
* @param rel the package relationship holding this comment authors,
67-
* the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors
68-
*
69-
* @deprecated in POI 3.14, scheduled for removal in POI 3.16
70-
*/
71-
@Deprecated
72-
XSLFCommentAuthors(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
73-
this(part);
74-
}
7559

7660
public CTCommentAuthorList getCTCommentAuthorsList() {
7761
return _authors;

0 commit comments

Comments
 (0)