remove some deprecated code

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1879909 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 edb57bc64596c029cad3ec33b7bc46353cc35df5..d7a24a3711654b185ef0d2469639e2df009978ff 100644 (file)
--- a/src/java/org/apache/poi/common/usermodel/Hyperlink.java
+++ b/src/java/org/apache/poi/common/usermodel/Hyperlink.java
@@ -58,15 +58,4 @@ public interface Hyperlink {
      * @see HyperlinkType#forInt(int)
      */
     public HyperlinkType getType();
-    
-    /**
-     * Return the type of this hyperlink
-     *
-     * @return the type of this hyperlink
-     * @since POI 3.15 beta 3
-     * @deprecated use <code>getType()</code> instead
-     */
-    @Deprecated
-    @Removal(version = "4.2")
-    public HyperlinkType getTypeEnum();
 }

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java b/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
index 7d3defe16d91a3baf7d411e761026cfc326c1477..358c72807fd9b0f0f9ca36ea61b7bb80394577a9 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
@@ -20,7 +20,6 @@ import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.hssf.record.HyperlinkRecord;
 import org.apache.poi.ss.usermodel.Hyperlink;
 import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
 
 /**
  * Represents an Excel hyperlink.
@@ -265,19 +264,6 @@ public class HSSFHyperlink implements Hyperlink {
         return link_type;
     }
 
-    /**
-     * Return the type of this hyperlink
-     *
-     * @return the type of this hyperlink
-     * @deprecated use <code>getType()</code> instead
-     */
-    @Deprecated
-    @Removal(version = "4.2")
-    @Override
-    public HyperlinkType getTypeEnum() {
-        return getType();
-    }
-
     /**
      * @return whether the objects have the same HyperlinkRecord
      */

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
index b86d553490dc02aaf97848dd13d5dd653ea404fb..e4c417c464f199773593a85297fbee001b5848e4 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
@@ -26,7 +26,6 @@ import org.apache.poi.openxml4j.opc.PackageRelationship;
 import org.apache.poi.sl.usermodel.Hyperlink;
 import org.apache.poi.sl.usermodel.Slide;
 import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTHyperlink;
 
 public class XSLFHyperlink implements Hyperlink<XSLFShape,XSLFTextParagraph> {
@@ -95,13 +94,6 @@ public class XSLFHyperlink implements Hyperlink<XSLFShape,XSLFTextParagraph> {
         }
     }
 
-    @Deprecated
-    @Removal(version = "4.2")
-    @Override
-    public HyperlinkType getTypeEnum() {
-        return getType();
-    }
-
     @Override
     public void linkToEmail(String emailAddress) {
         linkToExternal("mailto:"+emailAddress);

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 c02e00ae780fb5bf80c2448bd81b353ccf8ec3b9..f5dddf607b485916a366dd69fb8be8fb7f216c88 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
@@ -25,7 +25,6 @@ import org.apache.poi.openxml4j.opc.PackageRelationship;
 import org.apache.poi.ss.usermodel.Hyperlink;
 import org.apache.poi.ss.util.CellReference;
 import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHyperlink;
 
 /**
@@ -162,19 +161,6 @@ public class XSSFHyperlink implements Hyperlink {
     public HyperlinkType getType() {
         return _type;
     }
-    
-    /**
-     * Return the type of this hyperlink
-     *
-     * @return the type of this hyperlink
-     * @deprecated use <code>getType</code> instead
-     */
-    @Deprecated
-    @Removal(version = "4.2")
-    @Override
-    public HyperlinkType getTypeEnum() {
-        return getType();
-    }
 
     /**
      * Get the address of the cell this hyperlink applies to, e.g. A55

diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
index 0df60a215ef43ce72fc924b7aecbb95d56f6dce1..5575d16bb7c111b80a249481cb036045d5707b64 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
@@ -33,7 +33,6 @@ import org.apache.poi.hslf.record.Record;
 import org.apache.poi.hslf.record.TxInteractiveInfoAtom;
 import org.apache.poi.sl.usermodel.Hyperlink;
 import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.util.Removal;
 
 /**
  * Represents a hyperlink in a PowerPoint document
@@ -150,21 +149,6 @@ public final class HSLFHyperlink implements Hyperlink<HSLFShape,HSLFTextParagrap
                 return HyperlinkType.NONE;
         }
     }
-    
-    /**
-     * Gets the type of the hyperlink action.
-     * Must be a <code>LINK_*</code>  constant</code>
-     *
-     * @return the hyperlink URL
-     * @see InteractiveInfoAtom
-     * @deprecated use <code>getType</code> instead
-     */
-    @Deprecated
-    @Removal(version = "4.2")
-    @Override
-    public HyperlinkType getTypeEnum() {
-        return getType();
-    }
 
     @Override
     public void linkToEmail(String emailAddress) {