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

bug 59170: remove deprecated o.a.p.openxml4j.opc.Package 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1748494 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-06-15 04:22:49 +00:00
parent 5cbfb10ee5
commit 840320f5c3
3 changed files with 3 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/ooxml/java/org/apache/poi/openxml4j/opc/Package.java
View File

@ -1,97 +0,0 @@
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
package org.apache.poi.openxml4j.opc;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
/**
* @deprecated (name clash with {@link java.lang.Package} use {@link OPCPackage} instead.
*/
@Deprecated
public abstract class Package extends OPCPackage {
/**
* @deprecated use {@link OPCPackage}
*/
@Deprecated
protected Package(PackageAccess access) {
super(access);
}
/**
* @deprecated use {@link OPCPackage#open(String)}
*/
@Deprecated
public static Package open(String path) throws InvalidFormatException {
return open(path, defaultPackageAccess);
}
/**
* @deprecated use {@link OPCPackage#open(String,PackageAccess)}
*/
@Deprecated
public static Package open(String path, PackageAccess access)
throws InvalidFormatException {
return (Package)OPCPackage.open(path, access);
}
/**
* @deprecated use {@link OPCPackage#open(InputStream)}
*/
@Deprecated
public static Package open(InputStream in) throws InvalidFormatException,
IOException {
return (Package)OPCPackage.open(in);
}
/**
* @deprecated use {@link OPCPackage#openOrCreate(java.io.File)}
*/
@Deprecated
public static Package openOrCreate(File file) throws InvalidFormatException {
return (Package)OPCPackage.openOrCreate(file);
}
/**
* @deprecated use {@link OPCPackage#create(String)}
*/
@Deprecated
public static Package create(String path) {
return (Package)OPCPackage.create(path);
}
/**
* @deprecated use {@link OPCPackage#create(File)}
*/
@Deprecated
public static Package create(File file) {
return (Package)OPCPackage.create(file);
}
/**
* @deprecated use {@link OPCPackage#create(OutputStream)}
*/
@Deprecated
public static Package create(OutputStream output) {
return (Package)OPCPackage.create(output);
}
}

3
src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
View File

@ -51,8 +51,7 @@ import org.apache.poi.util.TempFile;
/**
* Physical zip package.
*/
@SuppressWarnings("deprecation")
public final class ZipPackage extends Package {
public final class ZipPackage extends OPCPackage {
private static POILogger logger = POILogFactory.getLogger(ZipPackage.class);
/**

4
src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
View File

@ -78,8 +78,8 @@ public class XSSFExcelExtractor extends POIXMLTextExtractor
System.err.println(" XSSFExcelExtractor <filename.xlsx>");
System.exit(1);
}
POIXMLTextExtractor extractor =
new XSSFExcelExtractor(args[0]);
OPCPackage pkg = OPCPackage.create(args[0]);
POIXMLTextExtractor extractor = new XSSFExcelExtractor(pkg);
try {
System.out.println(extractor.getText());
} finally {