remove some deprecated code

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

diff --git a/src/java/org/apache/poi/common/usermodel/Hyperlink.java b/src/java/org/apache/poi/common/usermodel/Hyperlink.java
index d7a24a3711654b185ef0d2469639e2df009978ff..0673ab39507d5fed4d13bdbfff6437eda98bf316 100644 (file)
--- a/src/java/org/apache/poi/common/usermodel/Hyperlink.java
+++ b/src/java/org/apache/poi/common/usermodel/Hyperlink.java
@@ -55,7 +55,6 @@ public interface Hyperlink {
      * Return the type of this hyperlink
      *
      * @return the type of this hyperlink
-     * @see HyperlinkType#forInt(int)
      */
     public HyperlinkType getType();
 }

diff --git a/src/java/org/apache/poi/common/usermodel/HyperlinkType.java b/src/java/org/apache/poi/common/usermodel/HyperlinkType.java
index af86c3e824f82651a9ab891d51a2a8e82c5154ad..74fa7b6e5f4358fe148f97297ea7a0648ee6fdd5 100644 (file)
--- a/src/java/org/apache/poi/common/usermodel/HyperlinkType.java
+++ b/src/java/org/apache/poi/common/usermodel/HyperlinkType.java
@@ -16,9 +16,6 @@
 ==================================================================== */
 package org.apache.poi.common.usermodel;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.poi.util.Internal;
 
 /**
@@ -70,38 +67,13 @@ public enum HyperlinkType {
         this.code = code;
     }
     
-    private static final Map<Integer, HyperlinkType> map = new HashMap<>();
-    static {
-        for (HyperlinkType type : values()) {
-            map.put(type.getCode(), type);
-        }
-    }
-    
     /**
      * @deprecated POI 3.15 beta 3
      *
      * @return the old integer code for a HyperlinkType enum
      */
     @Internal(since="3.15 beta 3")
-    @Deprecated
-    public int getCode() {
+    int getCode() {
         return code;
     }
-    
-    /**
-     * @deprecated POI 3.15 beta 3
-     *
-     * @param code the old integer code
-     * @return the corresponding HyperlinkEnum, if it exists
-     * @throws IllegalArgumentException if {@code code} is not a valid HyperlinkType.
-     */
-    @Internal(since="3.15 beta 3")
-    @Deprecated
-    public static HyperlinkType forInt(int code) {
-        HyperlinkType type = map.get(code);
-        if (type == null) {
-            throw new IllegalArgumentException("Invalid type: " + code);
-        }
-        return type;
-    }
 }

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java b/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
index 358c72807fd9b0f0f9ca36ea61b7bb80394577a9..1b51235bc87529fb0f136f5f3a20fc30e81cf9d6 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
@@ -257,7 +257,6 @@ public class HSSFHyperlink implements Hyperlink {
      * Return the type of this hyperlink
      *
      * @return the type of this hyperlink
-     * @see HyperlinkType#forInt
      */
     @Override
     public HyperlinkType getType() {

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
index f5dddf607b485916a366dd69fb8be8fb7f216c88..1d13e688c5b14431bc5128a25e40cb181c694d43 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
@@ -155,7 +155,6 @@ public class XSSFHyperlink implements Hyperlink {
      * Return the type of this hyperlink
      *
      * @return the type of this hyperlink
-     * @see HyperlinkType#forInt
      */
     @Override
     public HyperlinkType getType() {