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

diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/Package.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/Package.java
deleted file mode 100644 (file)
index ebd3ae7..0000000
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/Package.java
+++ /dev/null
@@ -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);
-       }
-}

diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
index 695be27f212915463cf3c57880a225d5dce6aea2..fe4d6f1ed80792482e9c195eef3654fa9da3a397 100644 (file)
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
@@ -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);
 
     /**

diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
index f9f7c23da388139e8ee07531e4936b64cd94a885..f737af82648861f2087e465af3ad15f1ba43bd09 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
+++ b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
@@ -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 {