Remove old XSSFPaswordHelper

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1800247 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateTable.java b/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateTable.java
index 42ff8fbb72a3d2cb4ecbfbffbe7091ab886ceae9..c0b1d395365d064c12cd832c0c937442987a7e22 100644 (file)
--- a/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateTable.java
+++ b/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateTable.java
@@ -19,7 +19,6 @@ package org.apache.poi.xssf.usermodel.examples;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.AreaReference;
 import org.apache.poi.ss.util.CellReference;

diff --git a/src/java/org/apache/poi/ss/usermodel/DateUtil.java b/src/java/org/apache/poi/ss/usermodel/DateUtil.java
index 1ba0e133ff6464420973446e824f81aed0f721c3..848334039337a0848f3d48c414bd15ca8cb7fff7 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/DateUtil.java
+++ b/src/java/org/apache/poi/ss/usermodel/DateUtil.java
@@ -19,14 +19,11 @@
 package org.apache.poi.ss.usermodel;
 
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
 
 import org.apache.poi.ss.formula.ConditionalFormattingEvaluator;
-import org.apache.poi.ss.formula.EvaluationConditionalFormatRule;
 import org.apache.poi.util.LocaleUtil;
 
 /**

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPaswordHelper.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPaswordHelper.java
deleted file mode 100644 (file)
index 4e3c908..0000000
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPaswordHelper.java
+++ /dev/null
@@ -1,60 +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.xssf.usermodel.helpers;
-
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-import org.apache.xmlbeans.XmlObject;
-
-/**
- * @deprecated POI 3.15 beta 3. Use {@link XSSFPasswordHelper} instead.
- */
-@Internal(since="3.15 beta 3")
-@Deprecated
-@Removal(version="3.17")
-public class XSSFPaswordHelper {
-    /**
-     * Sets the XORed or hashed password 
-     *
-     * @param xobj the xmlbeans object which contains the password attributes
-     * @param password the password, if null, the password attributes will be removed
-     * @param hashAlgo the hash algorithm, if null the password will be XORed
-     * @param prefix the prefix of the password attributes, may be null
-     */
-    public static void setPassword(XmlObject xobj, String password, HashAlgorithm hashAlgo, String prefix) {
-        XSSFPasswordHelper.setPassword(xobj, password, hashAlgo, prefix);
-    }
-
-    /**
-     * Validates the password, i.e.
-     * calculates the hash of the given password and compares it against the stored hash
-     *
-     * @param xobj the xmlbeans object which contains the password attributes
-     * @param password the password, if null the method will always return false,
-     *  even if there's no password set
-     * @param prefix the prefix of the password attributes, may be null
-     * 
-     * @return true, if the hashes match
-     */
-    public static boolean validatePassword(XmlObject xobj, String password, String prefix) {
-        return XSSFPasswordHelper.validatePassword(xobj, password, prefix);
-    }
-}

diff --git a/src/ooxml/testcases/org/apache/poi/benchmark/AddImageBench.java b/src/ooxml/testcases/org/apache/poi/benchmark/AddImageBench.java
index c910a7fe95fdbe091f9a44db129bbe780521c924..c1cf799c256235c823a2e89c53e1f4b9319d92ec 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/benchmark/AddImageBench.java
+++ b/src/ooxml/testcases/org/apache/poi/benchmark/AddImageBench.java
@@ -1,4 +1,4 @@
-package org.apache.poi.benchmark;/* ====================================================================
+/* ====================================================================
    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.
@@ -15,9 +15,10 @@ package org.apache.poi.benchmark;/* ============================================
    limitations under the License.
 ==================================================================== */
 
+package org.apache.poi.benchmark;
+
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.profile.GCProfiler;
@@ -27,9 +28,6 @@ import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.concurrent.TimeUnit;