summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2020-07-15 21:59:30 +0000
committerPJ Fanning <fanningpj@apache.org>2020-07-15 21:59:30 +0000
commitc34c1ca49ca7167b772eed18e1e3867245e05955 (patch)
tree8547727dea8c8f7ab81d3d9500b953e55355ab0d
parenteaf9f147d3cc4d7a49131c8ec6946e9246b64806 (diff)
downloadpoi-c34c1ca49ca7167b772eed18e1e3867245e05955.tar.gz
poi-c34c1ca49ca7167b772eed18e1e3867245e05955.zip
remove some deprecated code
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1879909 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/poi/common/usermodel/Hyperlink.java11
-rw-r--r--src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java14
-rw-r--r--src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java8
-rw-r--r--src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java14
-rw-r--r--src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java16
5 files changed, 0 insertions, 63 deletions
diff --git a/src/java/org/apache/poi/common/usermodel/Hyperlink.java b/src/java/org/apache/poi/common/usermodel/Hyperlink.java
index edb57bc645..d7a24a3711 100644
--- 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 7d3defe16d..358c72807f 100644
--- 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.
@@ -266,19 +265,6 @@ public class HSSFHyperlink implements Hyperlink {
}
/**
- * 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
*/
@Override
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 b86d553490..e4c417c464 100644
--- 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 c02e00ae78..f5dddf607b 100644
--- 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 0df60a215e..5575d16bb7 100644
--- 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) {