From 05d8c18a5823af76c5ba4b4d04b5ae6a6167ca8d Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 30 Jun 2017 12:18:13 +0000 Subject: [PATCH] Remove more deprecated code (BorderFormatting constants) git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1800385 13f79535-47bb-0310-9956-ffa450edef68 --- .settings/org.eclipse.jdt.core.prefs | 14 --- .../poifs/poibrowser/DocumentDescriptor.java | 2 +- .../ss/formula/OperandClassTransformer.java | 7 -- .../poi/ss/usermodel/BorderFormatting.java | 85 ------------------- src/java/org/apache/poi/ss/util/CellUtil.java | 46 +--------- 5 files changed, 2 insertions(+), 152 deletions(-) diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index bffc2a1b9..aa5bf02c9 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -26,7 +26,6 @@ org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -50,25 +49,12 @@ org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java b/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java index 247684d1b..754da35cc 100644 --- a/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java +++ b/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java @@ -22,7 +22,7 @@ import org.apache.poi.poifs.filesystem.*; /** *

Describes the most important (whatever that is) features of a - * {@link POIFSDocument}.

+ * {@link POIFSDocumentPath}.

*/ public class DocumentDescriptor { diff --git a/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java b/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java index 8e438c966..ba63c25c3 100644 --- a/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java +++ b/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java @@ -60,13 +60,6 @@ final class OperandClassTransformer { private final FormulaType _formulaType; - /** - * @deprecated POI 3.15 beta 3. Use {@code OperandClassTransformer(FormulaType)} instead. - */ - @Removal(version="3.17") - public OperandClassTransformer(int formulaType) { - this(FormulaType.forInt(formulaType)); - } public OperandClassTransformer(FormulaType formulaType) { _formulaType = formulaType; } diff --git a/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java b/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java index 030a33d5a..3e53865ed 100644 --- a/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java +++ b/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java @@ -19,96 +19,11 @@ package org.apache.poi.ss.usermodel; -import org.apache.poi.util.Removal; - /** * High level representation for Border Formatting component * of Conditional Formatting settings */ public interface BorderFormatting { - /** No border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#NONE} - */ - @Removal(version="3.17") - short BORDER_NONE = 0x0; - - /** Thin border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#THIN} - */ - @Removal(version="3.17") - short BORDER_THIN = 0x1; - - /** Medium border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM} - */ - @Removal(version="3.17") - short BORDER_MEDIUM = 0x2; - - /** dash border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASHED} - */ - @Removal(version="3.17") - short BORDER_DASHED = 0x3; - - /** dot border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOTTED} - */ - @Removal(version="3.17") - short BORDER_DOTTED = 0x4; - - /** Thick border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#THICK} - */ - @Removal(version="3.17") - short BORDER_THICK = 0x5; - - /** double-line border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOUBLE} - */ - @Removal(version="3.17") - short BORDER_DOUBLE = 0x6; - - /** hair-line border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#HAIR} - */ - @Removal(version="3.17") - short BORDER_HAIR = 0x7; - - /** Medium dashed border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASHED} - */ - @Removal(version="3.17") - short BORDER_MEDIUM_DASHED = 0x8; - - /** dash-dot border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT} - */ - @Removal(version="3.17") - short BORDER_DASH_DOT = 0x9; - - /** medium dash-dot border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT} - */ - @Removal(version="3.17") - short BORDER_MEDIUM_DASH_DOT = 0xA; - - /** dash-dot-dot border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT_DOT} - */ - @Removal(version="3.17") - short BORDER_DASH_DOT_DOT = 0xB; - - /** medium dash-dot-dot border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT_DOT} - */ - @Removal(version="3.17") - short BORDER_MEDIUM_DASH_DOT_DOT = 0xC; - - /** slanted dash-dot border - * @deprecated 3.15 beta 2. Use {@link BorderStyle#SLANTED_DASH_DOT} - */ - @Removal(version="3.17") - short BORDER_SLANTED_DASH_DOT = 0xD; /** * @deprecated POI 3.15. Use {@link #getBorderBottomEnum()}. diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java index 7c54cff81..855c28446 100644 --- a/src/java/org/apache/poi/ss/util/CellUtil.java +++ b/src/java/org/apache/poi/ss/util/CellUtil.java @@ -37,7 +37,6 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import org.apache.poi.util.Removal; /** * Various utility functions that make working with a cells and rows easier. The various methods @@ -225,22 +224,6 @@ public final class CellUtil { setCellStyleProperty(cell, VERTICAL_ALIGNMENT, align); } - /** - * Take a cell, and apply a font to it - * - * @param cell the cell to set the alignment for - * @param workbook The workbook that is being worked with. - * @param font The Font that you want to set. - * @throws IllegalArgumentException if font and cell do not belong to the same workbook - * - * @deprecated 3.15-beta2. Use {@link #setFont(Cell, Font)} instead. - */ - @Deprecated - @Removal(version="3.17") - public static void setFont(Cell cell, Workbook workbook, Font font) { - setFont(cell, font); - } - /** * Take a cell, and apply a font to it * @@ -273,7 +256,7 @@ public final class CellUtil { *

This is necessary because Excel has an upper limit on the number of styles that it supports.

* *

This function is more efficient than multiple calls to - * {@link #setCellStyleProperty(org.apache.poi.ss.usermodel.Cell, org.apache.poi.ss.usermodel.Workbook, String, Object)} + * {@link #setCellStyleProperty(org.apache.poi.ss.usermodel.Cell, String, Object)} * if adding multiple cell styles.

* *

For performance reasons, if this is the only cell in a workbook that uses a cell style, @@ -318,33 +301,6 @@ public final class CellUtil { cell.setCellStyle(newStyle); } - /** - *

This method attempts to find an existing CellStyle that matches the cell's - * current style plus a single style property propertyName with value - * propertyValue. - * A new style is created if the workbook does not contain a matching style.

- * - *

Modifies the cell style of cell without affecting other cells that use the - * same style.

- * - *

If setting more than one cell style property on a cell, use - * {@link #setCellStyleProperties(org.apache.poi.ss.usermodel.Cell, Map)}, - * which is faster and does not add unnecessary intermediate CellStyles to the workbook.

- * - * @param cell The cell that is to be changed. - * @param workbook The workbook that is being worked with. - * @param propertyName The name of the property that is to be changed. - * @param propertyValue The value of the property that is to be changed. - * - * @deprecated 3.15-beta2. Use {@link #setCellStyleProperty(Cell, String, Object)} instead. - */ - @Deprecated - @Removal(version="3.17") - public static void setCellStyleProperty(Cell cell, Workbook workbook, String propertyName, - Object propertyValue) { - setCellStyleProperty(cell, propertyName, propertyValue); - } - /** *

This method attempts to find an existing CellStyle that matches the cell's * current style plus a single style property propertyName with value