You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2017/06/30 11:48:24 UTC
svn commit: r1800375 [1/2] - in /poi/trunk: .settings/
src/examples/src/org/apache/poi/poifs/poibrowser/
src/java/org/apache/poi/common/usermodel/
src/java/org/apache/poi/hssf/model/ src/java/org/apache/poi/hssf/usermodel/
src/java/org/apache/poi/hssf/...
Author: fanningpj
Date: Fri Jun 30 11:48:23 2017
New Revision: 1800375
URL: http://svn.apache.org/viewvc?rev=1800375&view=rev
Log:
Remove more deprecated code (especially from Spreadsheet Cell classes)
Removed:
poi/trunk/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
Modified:
poi/trunk/.settings/org.eclipse.jdt.core.prefs
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
poi/trunk/src/java/org/apache/poi/common/usermodel/Hyperlink.java
poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
poi/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java
poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java
poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
Modified: poi/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/poi/trunk/.settings/org.eclipse.jdt.core.prefs?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ poi/trunk/.settings/org.eclipse.jdt.core.prefs Fri Jun 30 11:48:23 2017
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.static
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -23,6 +26,7 @@ org.eclipse.jdt.core.compiler.compliance
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
@@ -46,12 +50,25 @@ org.eclipse.jdt.core.compiler.problem.in
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
@@ -111,6 +128,7 @@ org.eclipse.jdt.core.compiler.problem.un
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -124,8 +142,10 @@ org.eclipse.jdt.core.formatter.alignment
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -135,6 +155,8 @@ org.eclipse.jdt.core.formatter.alignment
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
@@ -193,6 +215,7 @@ org.eclipse.jdt.core.formatter.indent_st
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -387,11 +410,24 @@ org.eclipse.jdt.core.formatter.never_ind
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
Modified: poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java Fri Jun 30 11:48:23 2017
@@ -49,7 +49,7 @@ import org.apache.poi.poifs.filesystem.P
* but it could be any other string.</p>
*
* <p>The value of a tree node is a {@link DocumentDescriptor}. Unlike
- * a {@link org.apache.poi.poifs.filesystem.POIFSDocument} which may be as heavy
+ * a {@link org.apache.poi.poifs.filesystem.OPOIFSDocument} which may be as heavy
* as many megabytes, an instance of {@link DocumentDescriptor} is a
* light-weight object and contains only some meta-information about a
* document.</p>
Modified: poi/trunk/src/java/org/apache/poi/common/usermodel/Hyperlink.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/common/usermodel/Hyperlink.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/common/usermodel/Hyperlink.java (original)
+++ poi/trunk/src/java/org/apache/poi/common/usermodel/Hyperlink.java Fri Jun 30 11:48:23 2017
@@ -22,38 +22,6 @@ import org.apache.poi.util.Removal;
* Represents a hyperlink.
*/
public interface Hyperlink {
- /**
- * Link to an existing file or web page
- *
- * @deprecated POI 3.15 beta 3. Use {@link HyperlinkType#URL} instead.
- */
- @Removal(version="3.17")
- public static final int LINK_URL = 1; // HyperlinkType.URL.getCode()
-
- /**
- * Link to a place in this document
- *
- * @deprecated POI 3.15 beta 3. Use {@link HyperlinkType#DOCUMENT} instead.
- */
- @Removal(version="3.17")
- public static final int LINK_DOCUMENT = 2; // HyperlinkType.DOCUMENT.getCode()
-
- /**
- * Link to an E-mail address
- *
- * @deprecated POI 3.15 beta 3. Use {@link HyperlinkType#EMAIL} instead.
- */
- @Removal(version="3.17")
- public static final int LINK_EMAIL = 3; // HyperlinkType.EMAIL.getCode()
-
- /**
- * Link to an file
- *
- * @deprecated POI 3.15 beta 3. Use {@link HyperlinkType#FILE} instead.
- */
- @Removal(version="3.17")
- public static final int LINK_FILE = 4; // HyperlinkType.FILE.getCode()
-
/**
* Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file, etc.
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java Fri Jun 30 11:48:23 2017
@@ -54,19 +54,6 @@ public final class HSSFFormulaParser {
}
/**
- * @param formula The formula to parse, excluding the leading equals sign
- * @param workbook The parent workbook
- * @param formulaType a constant from {@link FormulaType}
- * @return the parsed formula tokens
- * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
- *
- * @deprecated POI 3.15 beta 3. Use {@link #parse(String, HSSFWorkbook, FormulaType)} instead.
- */
- @Removal(version="3.17")
- public static Ptg[] parse(String formula, HSSFWorkbook workbook, int formulaType) throws FormulaParseException {
- return parse(formula, workbook, FormulaType.forInt(formulaType));
- }
- /**
* @param formula The formula to parse, excluding the leading equals sign
* @param workbook The parent workbook
* @param formulaType The type of formula
@@ -78,22 +65,6 @@ public final class HSSFFormulaParser {
}
/**
- * @param formula the formula to parse
- * @param workbook the parent workbook
- * @param formulaType a constant from {@link FormulaType}
- * @param sheetIndex the 0-based index of the sheet this formula belongs to.
- * The sheet index is required to resolve sheet-level names. <code>-1</code> means that
- * the scope of the name will be ignored and the parser will match named ranges only by name
- *
- * @return the parsed formula tokens
- * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
- * @deprecated POI 3.15 beta 3. Use {@link #parse(String, HSSFWorkbook, FormulaType, int)} instead.
- */
- @Removal(version="3.17")
- public static Ptg[] parse(String formula, HSSFWorkbook workbook, int formulaType, int sheetIndex) throws FormulaParseException {
- return parse(formula, workbook, FormulaType.forInt(formulaType), sheetIndex);
- }
- /**
* @param formula The formula to parse
* @param workbook The parent workbook
* @param formulaType The type of formula
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java Fri Jun 30 11:48:23 2017
@@ -33,7 +33,6 @@ import org.apache.poi.ss.usermodel.FillP
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.util.Removal;
/**
* High level representation of the style of a cell in a sheet of a workbook.
@@ -168,7 +167,7 @@ public final class HSSFCellStyle impleme
/**
* set the font for this style
- * @param font a font object created or retreived from the HSSFWorkbook object
+ * @param font a font object created or retrieved from the HSSFWorkbook object
* @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createFont()
* @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getFontAt(short)
*/
@@ -265,26 +264,6 @@ public final class HSSFCellStyle impleme
/**
* set the type of horizontal alignment for the cell
* @param align - the type of alignment
- * @see #ALIGN_GENERAL
- * @see #ALIGN_LEFT
- * @see #ALIGN_CENTER
- * @see #ALIGN_RIGHT
- * @see #ALIGN_FILL
- * @see #ALIGN_JUSTIFY
- * @see #ALIGN_CENTER_SELECTION
- * @deprecated POI 3.15 beta 3. Use {@link #setAlignment(HorizontalAlignment)} instead.
- */
- @Deprecated
- @Removal(version="3.17")
- @Override
- public void setAlignment(short align)
- {
- _format.setIndentNotParentAlignment(true);
- _format.setAlignment(align);
- }
- /**
- * set the type of horizontal alignment for the cell
- * @param align - the type of alignment
*/
@Override
public void setAlignment(HorizontalAlignment align)
@@ -296,13 +275,6 @@ public final class HSSFCellStyle impleme
/**
* get the type of horizontal alignment for the cell
* @return align - the type of alignment
- * @see #ALIGN_GENERAL
- * @see #ALIGN_LEFT
- * @see #ALIGN_CENTER
- * @see #ALIGN_RIGHT
- * @see #ALIGN_FILL
- * @see #ALIGN_JUSTIFY
- * @see #ALIGN_CENTER_SELECTION
* @deprecated POI 3.15 beta 3. Use {@link #getAlignmentEnum()} instead.
*/
@Deprecated
@@ -345,23 +317,6 @@ public final class HSSFCellStyle impleme
/**
* set the type of vertical alignment for the cell
* @param align the type of alignment
- * @see #VERTICAL_TOP
- * @see #VERTICAL_CENTER
- * @see #VERTICAL_BOTTOM
- * @see #VERTICAL_JUSTIFY
- * @see VerticalAlignment
- * @deprecated POI 3.15 beta 3. Use {@link #setVerticalAlignment(VerticalAlignment)} instead.
- */
- @Deprecated
- @Removal(version="3.17")
- @Override
- public void setVerticalAlignment(short align)
- {
- _format.setVerticalAlignment(align);
- }
- /**
- * set the type of vertical alignment for the cell
- * @param align the type of alignment
*/
@Override
public void setVerticalAlignment(VerticalAlignment align)
@@ -372,10 +327,6 @@ public final class HSSFCellStyle impleme
/**
* get the type of vertical alignment for the cell
* @return align the type of alignment
- * @see #VERTICAL_TOP
- * @see #VERTICAL_CENTER
- * @see #VERTICAL_BOTTOM
- * @see #VERTICAL_JUSTIFY
* @see VerticalAlignment
* @deprecated POI 3.15 beta 3. Use {@link #getVerticalAlignmentEnum()} instead.
*/
@@ -465,33 +416,6 @@ public final class HSSFCellStyle impleme
{
return _format.getIndent();
}
-
- /**
- * set the type of border to use for the left border of the cell
- * @param border type
- * @see #BORDER_NONE
- * @see #BORDER_THIN
- * @see #BORDER_MEDIUM
- * @see #BORDER_DASHED
- * @see #BORDER_DOTTED
- * @see #BORDER_THICK
- * @see #BORDER_DOUBLE
- * @see #BORDER_HAIR
- * @see #BORDER_MEDIUM_DASHED
- * @see #BORDER_DASH_DOT
- * @see #BORDER_MEDIUM_DASH_DOT
- * @see #BORDER_DASH_DOT_DOT
- * @see #BORDER_MEDIUM_DASH_DOT_DOT
- * @see #BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderLeft(BorderStyle)} instead.
- */
- @Deprecated
- @Removal(version="3.17")
- @Override
- public void setBorderLeft(short border) {
- _format.setIndentNotParentBorder(true);
- _format.setBorderLeft(border);
- }
/**
* set the type of border to use for the left border of the cell
@@ -501,7 +425,8 @@ public final class HSSFCellStyle impleme
@Override
public void setBorderLeft(BorderStyle border)
{
- setBorderLeft(border.getCode());
+ _format.setIndentNotParentBorder(true);
+ _format.setBorderLeft(border.getCode());
}
/**
@@ -525,34 +450,6 @@ public final class HSSFCellStyle impleme
{
return BorderStyle.valueOf(_format.getBorderLeft());
}
-
- /**
- * set the type of border to use for the right border of the cell
- * @param border type
- * @see #BORDER_NONE
- * @see #BORDER_THIN
- * @see #BORDER_MEDIUM
- * @see #BORDER_DASHED
- * @see #BORDER_DOTTED
- * @see #BORDER_THICK
- * @see #BORDER_DOUBLE
- * @see #BORDER_HAIR
- * @see #BORDER_MEDIUM_DASHED
- * @see #BORDER_DASH_DOT
- * @see #BORDER_MEDIUM_DASH_DOT
- * @see #BORDER_DASH_DOT_DOT
- * @see #BORDER_MEDIUM_DASH_DOT_DOT
- * @see #BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderRight(BorderStyle)} instead.
- */
- @Deprecated
- @Removal(version="3.17")
- @Override
- public void setBorderRight(short border)
- {
- _format.setIndentNotParentBorder(true);
- _format.setBorderRight(border);
- }
/**
* set the type of border to use for the right border of the cell
@@ -562,7 +459,8 @@ public final class HSSFCellStyle impleme
@Override
public void setBorderRight(BorderStyle border)
{
- setBorderRight(border.getCode());
+ _format.setIndentNotParentBorder(true);
+ _format.setBorderRight(border.getCode());
}
/**
@@ -586,34 +484,6 @@ public final class HSSFCellStyle impleme
{
return BorderStyle.valueOf(_format.getBorderRight());
}
-
- /**
- * set the type of border to use for the top border of the cell
- * @param border type
- * @see #BORDER_NONE
- * @see #BORDER_THIN
- * @see #BORDER_MEDIUM
- * @see #BORDER_DASHED
- * @see #BORDER_DOTTED
- * @see #BORDER_THICK
- * @see #BORDER_DOUBLE
- * @see #BORDER_HAIR
- * @see #BORDER_MEDIUM_DASHED
- * @see #BORDER_DASH_DOT
- * @see #BORDER_MEDIUM_DASH_DOT
- * @see #BORDER_DASH_DOT_DOT
- * @see #BORDER_MEDIUM_DASH_DOT_DOT
- * @see #BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderTop(BorderStyle)} instead.
- */
- @Deprecated
- @Removal(version="3.17")
- @Override
- public void setBorderTop(short border)
- {
- _format.setIndentNotParentBorder(true);
- _format.setBorderTop(border);
- }
/**
* set the type of border to use for the top border of the cell
@@ -623,7 +493,8 @@ public final class HSSFCellStyle impleme
@Override
public void setBorderTop(BorderStyle border)
{
- setBorderTop(border.getCode());
+ _format.setIndentNotParentBorder(true);
+ _format.setBorderTop(border.getCode());
}
/**
@@ -647,34 +518,6 @@ public final class HSSFCellStyle impleme
{
return BorderStyle.valueOf(_format.getBorderTop());
}
-
- /**
- * set the type of border to use for the bottom border of the cell
- * @param border type
- * @see #BORDER_NONE
- * @see #BORDER_THIN
- * @see #BORDER_MEDIUM
- * @see #BORDER_DASHED
- * @see #BORDER_DOTTED
- * @see #BORDER_THICK
- * @see #BORDER_DOUBLE
- * @see #BORDER_HAIR
- * @see #BORDER_MEDIUM_DASHED
- * @see #BORDER_DASH_DOT
- * @see #BORDER_MEDIUM_DASH_DOT
- * @see #BORDER_DASH_DOT_DOT
- * @see #BORDER_MEDIUM_DASH_DOT_DOT
- * @see #BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderBottom(BorderStyle)} instead.
- */
- @Deprecated
- @Removal(version="3.17")
- @Override
- public void setBorderBottom(short border)
- {
- _format.setIndentNotParentBorder(true);
- _format.setBorderBottom(border);
- }
/**
* set the type of border to use for the bottom border of the cell
@@ -684,7 +527,8 @@ public final class HSSFCellStyle impleme
@Override
public void setBorderBottom(BorderStyle border)
{
- setBorderBottom(border.getCode());
+ _format.setIndentNotParentBorder(true);
+ _format.setBorderBottom(border.getCode());
}
/**
@@ -792,39 +636,6 @@ public final class HSSFCellStyle impleme
{
return _format.getBottomBorderPaletteIdx();
}
-
- /**
- * setting to one fills the cell with the foreground color... No idea about
- * other values
- *
- * @see #NO_FILL
- * @see #SOLID_FOREGROUND
- * @see #FINE_DOTS
- * @see #ALT_BARS
- * @see #SPARSE_DOTS
- * @see #THICK_HORZ_BANDS
- * @see #THICK_VERT_BANDS
- * @see #THICK_BACKWARD_DIAG
- * @see #THICK_FORWARD_DIAG
- * @see #BIG_SPOTS
- * @see #BRICKS
- * @see #THIN_HORZ_BANDS
- * @see #THIN_VERT_BANDS
- * @see #THIN_BACKWARD_DIAG
- * @see #THIN_FORWARD_DIAG
- * @see #SQUARES
- * @see #DIAMONDS
- *
- * @param fp fill pattern (set to 1 to fill w/foreground color)
- * @deprecated POI 3.15 beta 3. Use {@link #setFillPattern(FillPatternType)} instead.
- */
- @Deprecated
- @Removal(version="3.17")
- @Override
- public void setFillPattern(short fp)
- {
- setFillPattern(FillPatternType.forInt(fp));
- }
/**
* setting to one fills the cell with the foreground color... No idea about
Modified: poi/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java Fri Jun 30 11:48:23 2017
@@ -19,8 +19,8 @@ package org.apache.poi.hssf.util;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.RegionUtil;
import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.RegionUtil;
/**
* Various utility functions that make working with a region of cells easier.
@@ -42,7 +42,7 @@ public final class HSSFRegionUtil {
*/
public static void setBorderLeft(int border, CellRangeAddress region, HSSFSheet sheet,
HSSFWorkbook workbook) {
- RegionUtil.setBorderLeft(border, region, sheet, workbook);
+ RegionUtil.setBorderLeft(border, region, sheet);
}
/**
@@ -55,7 +55,7 @@ public final class HSSFRegionUtil {
*/
public static void setLeftBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
HSSFWorkbook workbook) {
- RegionUtil.setLeftBorderColor(color, region, sheet, workbook);
+ RegionUtil.setLeftBorderColor(color, region, sheet);
}
/**
@@ -68,7 +68,7 @@ public final class HSSFRegionUtil {
*/
public static void setBorderRight(int border, CellRangeAddress region, HSSFSheet sheet,
HSSFWorkbook workbook) {
- RegionUtil.setBorderRight(border, region, sheet, workbook);
+ RegionUtil.setBorderRight(border, region, sheet);
}
/**
@@ -81,7 +81,7 @@ public final class HSSFRegionUtil {
*/
public static void setRightBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
HSSFWorkbook workbook) {
- RegionUtil.setRightBorderColor(color, region, sheet, workbook);
+ RegionUtil.setRightBorderColor(color, region, sheet);
}
/**
@@ -94,7 +94,7 @@ public final class HSSFRegionUtil {
*/
public static void setBorderBottom(int border, CellRangeAddress region, HSSFSheet sheet,
HSSFWorkbook workbook) {
- RegionUtil.setBorderBottom(border, region, sheet, workbook);
+ RegionUtil.setBorderBottom(border, region, sheet);
}
/**
@@ -107,7 +107,7 @@ public final class HSSFRegionUtil {
*/
public static void setBottomBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
HSSFWorkbook workbook) {
- RegionUtil.setBottomBorderColor(color, region, sheet, workbook);
+ RegionUtil.setBottomBorderColor(color, region, sheet);
}
/**
@@ -120,7 +120,7 @@ public final class HSSFRegionUtil {
*/
public static void setBorderTop(int border, CellRangeAddress region, HSSFSheet sheet,
HSSFWorkbook workbook) {
- RegionUtil.setBorderTop(border, region, sheet, workbook);
+ RegionUtil.setBorderTop(border, region, sheet);
}
/**
@@ -133,6 +133,6 @@ public final class HSSFRegionUtil {
*/
public static void setTopBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
HSSFWorkbook workbook) {
- RegionUtil.setTopBorderColor(color, region, sheet, workbook);
+ RegionUtil.setTopBorderColor(color, region, sheet);
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java Fri Jun 30 11:48:23 2017
@@ -17,319 +17,9 @@
package org.apache.poi.ss.usermodel;
-import org.apache.poi.util.Removal;
-
public interface CellStyle {
/**
- * general (normal) horizontal alignment
- * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#GENERAL} instead.
- */
- @Removal(version="3.17")
- short ALIGN_GENERAL = 0x0; //HorizontalAlignment.GENERAL.getCode();
-
- /**
- * left-justified horizontal alignment
- * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#LEFT} instead.
- */
- @Removal(version="3.17")
- short ALIGN_LEFT = 0x1; //HorizontalAlignment.LEFT.getCode();
-
- /**
- * center horizontal alignment
- * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#CENTER} instead.
- */
- @Removal(version="3.17")
- short ALIGN_CENTER = 0x2; //HorizontalAlignment.CENTER.getCode();
-
- /**
- * right-justified horizontal alignment
- * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#RIGHT} instead.
- */
- @Removal(version="3.17")
- short ALIGN_RIGHT = 0x3; //HorizontalAlignment.RIGHT.getCode();
-
- /**
- * fill? horizontal alignment
- * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#FILL} instead.
- */
- @Removal(version="3.17")
- short ALIGN_FILL = 0x4; //HorizontalAlignment.FILL.getCode();
-
- /**
- * justified horizontal alignment
- * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#JUSTIFY} instead.
- */
- @Removal(version="3.17")
- short ALIGN_JUSTIFY = 0x5; //HorizontalAlignment.JUSTIFY.getCode();
-
- /**
- * center-selection? horizontal alignment
- * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#CENTER_SELECTION} instead.
- */
- @Removal(version="3.17")
- short ALIGN_CENTER_SELECTION = 0x6; //HorizontalAlignment.CENTER_SELECTION.getCode();
-
- /**
- * top-aligned vertical alignment
- * @deprecated POI 3.15 beta 3. Use {@link VerticalAlignment#TOP} instead.
- */
- @Removal(version="3.17")
- short VERTICAL_TOP = 0x0; //VerticalAlignment.TOP.getCode();
-
- /**
- * center-aligned vertical alignment
- * @deprecated POI 3.15 beta 3. Use {@link VerticalAlignment#CENTER} instead.
- */
- @Removal(version="3.17")
- short VERTICAL_CENTER = 0x1; //VerticalAlignment.CENTER.getCode();
-
- /**
- * bottom-aligned vertical alignment
- * @deprecated POI 3.15 beta 3. Use {@link VerticalAlignment#BOTTOM} instead.
- */
- @Removal(version="3.17")
- short VERTICAL_BOTTOM = 0x2; //VerticalAlignment.BOTTOM.getCode();
-
- /**
- * vertically justified vertical alignment
- * @deprecated POI 3.15 beta 3. Use {@link VerticalAlignment#JUSTIFY} instead.
- */
- @Removal(version="3.17")
- short VERTICAL_JUSTIFY = 0x3; //VerticalAlignment.JUSTIFY.getCode();
-
- /**
- * No border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#NONE} instead.
- */
- @Removal(version="3.17")
- short BORDER_NONE = 0x0; //BorderStyle.NONE.getCode();
-
- /**
- * Thin border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#THIN} instead.
- */
- @Removal(version="3.17")
- short BORDER_THIN = 0x1; //BorderStyle.THIN.getCode();
-
- /**
- * Medium border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM} instead.
- */
- @Removal(version="3.17")
- short BORDER_MEDIUM = 0x2; //BorderStyle.MEDIUM.getCode();
-
- /**
- * dash border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASHED} instead.
- */
- @Removal(version="3.17")
- short BORDER_DASHED = 0x3; //BorderStyle.DASHED.getCode();
-
- /**
- * dot border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOTTED} instead.
- */
- @Removal(version="3.17")
- short BORDER_DOTTED = 0x4; //BorderStyle.DOTTED.getCode();
-
- /**
- * Thick border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#THICK} instead.
- */
- @Removal(version="3.17")
- short BORDER_THICK = 0x5; //BorderStyle.THICK.getCode();
-
- /**
- * double-line border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOUBLE} instead.
- */
- @Removal(version="3.17")
- short BORDER_DOUBLE = 0x6; //BorderStyle.DOUBLE.getCode();
-
- /**
- * hair-line border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#HAIR} instead.
- */
- @Removal(version="3.17")
- short BORDER_HAIR = 0x7; //BorderStyle.HAIR.getCode();
-
- /**
- * Medium dashed border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASHED} instead.
- */
- @Removal(version="3.17")
- short BORDER_MEDIUM_DASHED = 0x8; //BorderStyle.MEDIUM_DASHED.getCode();
-
- /**
- * dash-dot border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT} instead.
- */
- @Removal(version="3.17")
- short BORDER_DASH_DOT = 0x9; //BorderStyle.DASH_DOT.getCode();
-
- /**
- * medium dash-dot border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT} instead.
- */
- @Removal(version="3.17")
- short BORDER_MEDIUM_DASH_DOT = 0xA; //BorderStyle.MEDIUM_DASH_DOT.getCode();
-
- /**
- * dash-dot-dot border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT_DOT} instead.
- */
- @Removal(version="3.17")
- short BORDER_DASH_DOT_DOT = 0xB; //BorderStyle.DASH_DOT_DOT.getCode();
-
- /**
- * medium dash-dot-dot border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT_DOT} instead.
- */
- @Removal(version="3.17")
- short BORDER_MEDIUM_DASH_DOT_DOT = 0xC; //BorderStyle.MEDIUM_DASH_DOT_DOT.getCode();
-
- /**
- * slanted dash-dot border
- * @deprecated 3.15 beta 2. Use {@link BorderStyle#SLANTED_DASH_DOT} instead.
- */
- @Removal(version="3.17")
- short BORDER_SLANTED_DASH_DOT = 0xD; //BorderStyle.SLANTED_DASH_DOT.getCode();
-
- /**
- * Fill Pattern: No background
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#NO_FILL} instead.
- */
- @Removal(version="3.17")
- short NO_FILL = 0; //FillPatternType.NO_FILL.getCode();
-
- /**
- * Fill Pattern: Solidly filled
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#SOLID_FOREGROUND} instead.
- */
- @Removal(version="3.17")
- short SOLID_FOREGROUND = 1; //FillPatternType.SOLID_FOREGROUND.getCode();
-
- /**
- * Fill Pattern: Small fine dots
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#FINE_DOTS} instead.
- */
- @Removal(version="3.17")
- short FINE_DOTS = 2; //FillPatternType.FINE_DOTS.getCode();
-
- /**
- * Fill Pattern: Wide dots
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#ALT_BARS} instead.
- */
- @Removal(version="3.17")
- short ALT_BARS = 3; //FillPatternType.ALT_BARS.getCode();
-
- /**
- * Fill Pattern: Sparse dots
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#SPARSE_DOTS} instead.
- */
- @Removal(version="3.17")
- short SPARSE_DOTS = 4; //FillPatternType.SPARSE_DOTS.getCode();
-
- /**
- * Fill Pattern: Thick horizontal bands
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#THICK_HORZ_BANDS} instead.
- */
- @Removal(version="3.17")
- short THICK_HORZ_BANDS = 5; //FillPatternType.THICK_HORZ_BANDS.getCode();
-
- /**
- * Fill Pattern: Thick vertical bands
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#THICK_VERT_BANDS} instead.
- */
- @Removal(version="3.17")
- short THICK_VERT_BANDS = 6; //FillPatternType.THICK_VERT_BANDS.getCode();
-
- /**
- * Fill Pattern: Thick backward facing diagonals
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#THICK_BACKWARD_DIAG} instead.
- */
- @Removal(version="3.17")
- short THICK_BACKWARD_DIAG = 7; //FillPatternType.THICK_BACKWARD_DIAG.getCode();
-
- /**
- * Fill Pattern: Thick forward facing diagonals
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#THICK_FORWARD_DIAG} instead.
- */
- @Removal(version="3.17")
- short THICK_FORWARD_DIAG = 8; //FillPatternType.THICK_FORWARD_DIAG.getCode();
-
- /**
- * Fill Pattern: Large spots
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#BIG_SPOTS} instead.
- */
- @Removal(version="3.17")
- short BIG_SPOTS = 9; //FillPatternType.BIG_SPOTS.getCode();
-
- /**
- * Fill Pattern: Brick-like layout
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#BRICKS} instead.
- */
- @Removal(version="3.17")
- short BRICKS = 10; //FillPatternType.BRICKS.getCode();
-
- /**
- * Fill Pattern: Thin horizontal bands
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#THIN_HORZ_BANDS} instead.
- */
- @Removal(version="3.17")
- short THIN_HORZ_BANDS = 11; //FillPatternType.THIN_HORZ_BANDS.getCode();
-
- /**
- * Fill Pattern: Thin vertical bands
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#THIN_VERT_BANDS} instead.
- */
- @Removal(version="3.17")
- short THIN_VERT_BANDS = 12; //FillPatternType.THIN_VERT_BANDS.getCode();
-
- /**
- * Fill Pattern: Thin backward diagonal
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#THIN_BACKWARD_DIAG} instead.
- */
- @Removal(version="3.17")
- short THIN_BACKWARD_DIAG = 13; //FillPatternType.THIN_BACKWARD_DIAG.getCode();
-
- /**
- * Fill Pattern: Thin forward diagonal
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#THIN_FORWARD_DIAG} instead.
- */
- @Removal(version="3.17")
- short THIN_FORWARD_DIAG = 14; //FillPatternType.THIN_FORWARD_DIAG.getCode();
-
- /**
- * Fill Pattern: Squares
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#SQUARES} instead.
- */
- @Removal(version="3.17")
- short SQUARES = 15; //FillPatternType.SQUARES.getCode();
-
- /**
- * Fill Pattern: Diamonds
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#DIAMONDS} instead.
- */
- @Removal(version="3.17")
- short DIAMONDS = 16; //FillPatternType.DIAMONDS.getCode();
-
- /**
- * Fill Pattern: Less Dots
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#LESS_DOTS} instead.
- */
- @Removal(version="3.17")
- short LESS_DOTS = 17; //FillPatternType.LESS_DOTS.getCode();
-
- /**
- * Fill Pattern: Least Dots
- * @deprecated 3.15 beta 3. Use {@link FillPatternType#LEAST_DOTS} instead.
- */
- @Removal(version="3.17")
- short LEAST_DOTS = 18; //FillPatternType.LEAST_DOTS.getCode();
-
- /**
* get the index within the Workbook (sequence within the collection of ExtnededFormat objects)
* @return unique index number of the underlying record this style represents (probably you don't care
* unless you're comparing which one is which)
@@ -417,32 +107,12 @@ public interface CellStyle {
/**
* set the type of horizontal alignment for the cell
* @param align - the type of alignment
- * @see #ALIGN_GENERAL
- * @see #ALIGN_LEFT
- * @see #ALIGN_CENTER
- * @see #ALIGN_RIGHT
- * @see #ALIGN_FILL
- * @see #ALIGN_JUSTIFY
- * @see #ALIGN_CENTER_SELECTION
- * @deprecated POI 3.15 beta 3. Use {@link #setAlignment(HorizontalAlignment)} instead.
- */
- void setAlignment(short align);
- /**
- * set the type of horizontal alignment for the cell
- * @param align - the type of alignment
*/
void setAlignment(HorizontalAlignment align);
/**
* get the type of horizontal alignment for the cell
* @return align - the type of alignment
- * @see #ALIGN_GENERAL
- * @see #ALIGN_LEFT
- * @see #ALIGN_CENTER
- * @see #ALIGN_RIGHT
- * @see #ALIGN_FILL
- * @see #ALIGN_JUSTIFY
- * @see #ALIGN_CENTER_SELECTION
* @deprecated POI 3.15 beta 3. Use {@link #getAlignmentEnum()} instead.
*/
short getAlignment();
@@ -472,26 +142,12 @@ public interface CellStyle {
/**
* set the type of vertical alignment for the cell
* @param align the type of alignment
- * @see #VERTICAL_TOP
- * @see #VERTICAL_CENTER
- * @see #VERTICAL_BOTTOM
- * @see #VERTICAL_JUSTIFY
- * @deprecated POI 3.15 beta 3. Use {@link #setVerticalAlignment(VerticalAlignment)} instead.
- */
- void setVerticalAlignment(short align);
- /**
- * set the type of vertical alignment for the cell
- * @param align the type of alignment
*/
void setVerticalAlignment(VerticalAlignment align);
/**
* get the type of vertical alignment for the cell
* @return align the type of alignment
- * @see #VERTICAL_TOP
- * @see #VERTICAL_CENTER
- * @see #VERTICAL_BOTTOM
- * @see #VERTICAL_JUSTIFY
* @deprecated POI 3.15 beta 3. Use {@link #getVerticalAlignmentEnum()} instead.
*/
short getVerticalAlignment();
@@ -541,28 +197,6 @@ public interface CellStyle {
/**
* set the type of border to use for the left border of the cell
* @param border type
- * @see #BORDER_NONE
- * @see #BORDER_THIN
- * @see #BORDER_MEDIUM
- * @see #BORDER_DASHED
- * @see #BORDER_DOTTED
- * @see #BORDER_THICK
- * @see #BORDER_DOUBLE
- * @see #BORDER_HAIR
- * @see #BORDER_MEDIUM_DASHED
- * @see #BORDER_DASH_DOT
- * @see #BORDER_MEDIUM_DASH_DOT
- * @see #BORDER_DASH_DOT_DOT
- * @see #BORDER_MEDIUM_DASH_DOT_DOT
- * @see #BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle)} instead
- */
- @Removal(version="3.17")
- void setBorderLeft(short border);
-
- /**
- * set the type of border to use for the left border of the cell
- * @param border type
* @since POI 3.15
*/
void setBorderLeft(BorderStyle border);
@@ -584,28 +218,6 @@ public interface CellStyle {
/**
* set the type of border to use for the right border of the cell
* @param border type
- * @see #BORDER_NONE
- * @see #BORDER_THIN
- * @see #BORDER_MEDIUM
- * @see #BORDER_DASHED
- * @see #BORDER_DOTTED
- * @see #BORDER_THICK
- * @see #BORDER_DOUBLE
- * @see #BORDER_HAIR
- * @see #BORDER_MEDIUM_DASHED
- * @see #BORDER_DASH_DOT
- * @see #BORDER_MEDIUM_DASH_DOT
- * @see #BORDER_DASH_DOT_DOT
- * @see #BORDER_MEDIUM_DASH_DOT_DOT
- * @see #BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle)} instead
- */
- @Removal(version="3.17")
- void setBorderRight(short border);
-
- /**
- * set the type of border to use for the right border of the cell
- * @param border type
* @since POI 3.15
*/
void setBorderRight(BorderStyle border);
@@ -627,28 +239,6 @@ public interface CellStyle {
/**
* set the type of border to use for the top border of the cell
* @param border type
- * @see #BORDER_NONE
- * @see #BORDER_THIN
- * @see #BORDER_MEDIUM
- * @see #BORDER_DASHED
- * @see #BORDER_DOTTED
- * @see #BORDER_THICK
- * @see #BORDER_DOUBLE
- * @see #BORDER_HAIR
- * @see #BORDER_MEDIUM_DASHED
- * @see #BORDER_DASH_DOT
- * @see #BORDER_MEDIUM_DASH_DOT
- * @see #BORDER_DASH_DOT_DOT
- * @see #BORDER_MEDIUM_DASH_DOT_DOT
- * @see #BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle)} instead
- */
- @Removal(version="3.17")
- void setBorderTop(short border);
-
- /**
- * set the type of border to use for the top border of the cell
- * @param border type
* @since POI 3.15
*/
void setBorderTop(BorderStyle border);
@@ -666,28 +256,6 @@ public interface CellStyle {
* @since POI 3.15
*/
BorderStyle getBorderTopEnum();
-
- /**
- * set the type of border to use for the bottom border of the cell
- * @param border type
- * @see #BORDER_NONE
- * @see #BORDER_THIN
- * @see #BORDER_MEDIUM
- * @see #BORDER_DASHED
- * @see #BORDER_DOTTED
- * @see #BORDER_THICK
- * @see #BORDER_DOUBLE
- * @see #BORDER_HAIR
- * @see #BORDER_MEDIUM_DASHED
- * @see #BORDER_DASH_DOT
- * @see #BORDER_MEDIUM_DASH_DOT
- * @see #BORDER_DASH_DOT_DOT
- * @see #BORDER_MEDIUM_DASH_DOT_DOT
- * @see #BORDER_SLANTED_DASH_DOT
- * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle)} instead.
- */
- @Removal(version="3.17")
- void setBorderBottom(short border);
/**
* set the type of border to use for the bottom border of the cell
@@ -761,50 +329,6 @@ public interface CellStyle {
* setting to one fills the cell with the foreground color... No idea about
* other values
*
- * @see #NO_FILL
- * @see #SOLID_FOREGROUND
- * @see #FINE_DOTS
- * @see #ALT_BARS
- * @see #SPARSE_DOTS
- * @see #THICK_HORZ_BANDS
- * @see #THICK_VERT_BANDS
- * @see #THICK_BACKWARD_DIAG
- * @see #THICK_FORWARD_DIAG
- * @see #BIG_SPOTS
- * @see #BRICKS
- * @see #THIN_HORZ_BANDS
- * @see #THIN_VERT_BANDS
- * @see #THIN_BACKWARD_DIAG
- * @see #THIN_FORWARD_DIAG
- * @see #SQUARES
- * @see #DIAMONDS
- *
- * @param fp fill pattern (set to 1 to fill w/foreground color)
- * @deprecated POI 3.15 beta 3. Use {@link #setFillPattern(FillPatternType)} instead.
- */
- void setFillPattern(short fp);
- /**
- * setting to one fills the cell with the foreground color... No idea about
- * other values
- *
- * @see #NO_FILL
- * @see #SOLID_FOREGROUND
- * @see #FINE_DOTS
- * @see #ALT_BARS
- * @see #SPARSE_DOTS
- * @see #THICK_HORZ_BANDS
- * @see #THICK_VERT_BANDS
- * @see #THICK_BACKWARD_DIAG
- * @see #THICK_FORWARD_DIAG
- * @see #BIG_SPOTS
- * @see #BRICKS
- * @see #THIN_HORZ_BANDS
- * @see #THIN_VERT_BANDS
- * @see #THIN_BACKWARD_DIAG
- * @see #THIN_FORWARD_DIAG
- * @see #SQUARES
- * @see #DIAMONDS
- *
* @param fp fill pattern (set to {@link FillPatternType#SOLID_FOREGROUND} to fill w/foreground color)
* @since POI 3.15 beta 3
*/
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java Fri Jun 30 11:48:23 2017
@@ -261,7 +261,7 @@ public interface Workbook extends Closea
/**
* Get the Sheet object at the given index.
*
- * @param index of the sheet number (0-based physical & logical)
+ * @param index of the sheet number (0-based physical & logical)
* @return Sheet at the provided index
* @throws IllegalArgumentException if the index is out of range (index
* < 0 || index >= getNumberOfSheets()).
Modified: poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java Fri Jun 30 11:48:23 2017
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.poi.ss.usermodel.BorderStyle;
@@ -198,29 +197,6 @@ public final class CellUtil {
* style if no match exists.
*
* @param cell the cell to set the alignment for
- * @param workbook The workbook that is being worked with.
- * @param align the column alignment to use.
- *
- * @deprecated 3.15-beta2. Use {@link #setAlignment(Cell, HorizontalAlignment)} instead.
- *
- * @see CellStyle for alignment options
- */
- @Deprecated
- @Removal(version="3.17")
- public static void setAlignment(Cell cell, Workbook workbook, short align) {
- setAlignment(cell, HorizontalAlignment.forInt(align));
- }
-
- /**
- * Take a cell, and align it.
- *
- * This is superior to cell.getCellStyle().setAlignment(align) because
- * this method will not modify the CellStyle object that may be referenced
- * by multiple cells. Instead, this method will search for existing CellStyles
- * that match the desired CellStyle, creating a new CellStyle with the desired
- * style if no match exists.
- *
- * @param cell the cell to set the alignment for
* @param align the horizontal alignment to use.
*
* @see HorizontalAlignment for alignment options
@@ -658,40 +634,6 @@ public final class CellUtil {
properties.put(name, value);
}
- /**
- * Utility method that puts the named short value to the given map.
- *
- * @param properties map of properties (String -> Object)
- * @param name property name
- * @param value property value
- */
- private static void putShort(Map<String, Object> properties, String name, short value) {
- properties.put(name, value);
- }
-
- /**
- * Utility method that puts the named BorderStyle, HorizontalAlignment, VerticalAlignment, etc
- * value to the given map.
- *
- * @param properties map of properties (String -> Object)
- * @param name property name
- * @param value property value
- */
- private static void putEnum(Map<String, Object> properties, String name, Enum<?> value) {
- properties.put(name, value);
- }
-
- /**
- * Utility method that puts the named boolean value to the given map.
- *
- * @param properties map of properties (String -> Object)
- * @param name property name
- * @param value property value
- */
- private static void putBoolean(Map<String, Object> properties, String name, boolean value) {
- properties.put(name, value);
- }
-
/**
* Looks for text in the cell that should be unicode, like α and provides the
* unicode version of it.
Modified: poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java Fri Jun 30 11:48:23 2017
@@ -21,7 +21,6 @@ import org.apache.poi.ss.usermodel.Borde
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.Removal;
/**
@@ -64,20 +63,6 @@ public final class RegionUtil {
*
* @param border The new border
* @param region The region that should have the border
- * @param workbook The workbook that the region is on.
- * @param sheet The sheet that the region is on.
- * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle, CellRangeAddress, Sheet)}.
- */
- @Removal(version="3.17")
- public static void setBorderLeft(int border, CellRangeAddress region, Sheet sheet, Workbook workbook) {
- setBorderLeft(border, region, sheet);
- }
- /**
- * Sets the left border style for a region of cells by manipulating the cell style of the individual
- * cells on the left
- *
- * @param border The new border
- * @param region The region that should have the border
* @param sheet The sheet that the region is on.
* @since POI 3.15 beta 2
* @deprecated 3.16 beta 1. Use {@link #setBorderLeft(BorderStyle, CellRangeAddress, Sheet)}.
@@ -119,20 +104,6 @@ public final class RegionUtil {
*
* @param color The color of the border
* @param region The region that should have the border
- * @param workbook The workbook that the region is on.
- * @param sheet The sheet that the region is on.
- * @deprecated 3.15 beta 2. Use {@link #setLeftBorderColor(int, CellRangeAddress, Sheet)}.
- */
- @Removal(version="3.17")
- public static void setLeftBorderColor(int color, CellRangeAddress region, Sheet sheet, Workbook workbook) {
- setLeftBorderColor(color, region, sheet);
- }
- /**
- * Sets the left border color for a region of cells by manipulating the cell style of the individual
- * cells on the left
- *
- * @param color The color of the border
- * @param region The region that should have the border
* @param sheet The sheet that the region is on.
* @since POI 3.15 beta 2
*/
@@ -153,20 +124,6 @@ public final class RegionUtil {
*
* @param border The new border
* @param region The region that should have the border
- * @param workbook The workbook that the region is on.
- * @param sheet The sheet that the region is on.
- * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle, CellRangeAddress, Sheet)}.
- */
- @Removal(version="3.17")
- public static void setBorderRight(int border, CellRangeAddress region, Sheet sheet, Workbook workbook) {
- setBorderRight(border, region, sheet);
- }
- /**
- * Sets the right border style for a region of cells by manipulating the cell style of the individual
- * cells on the right
- *
- * @param border The new border
- * @param region The region that should have the border
* @param sheet The sheet that the region is on.
* @since POI 3.15 beta 2
* @deprecated POI 3.16 beta 1. Use {@link #setBorderRight(BorderStyle, CellRangeAddress, Sheet)}.
@@ -208,20 +165,6 @@ public final class RegionUtil {
*
* @param color The color of the border
* @param region The region that should have the border
- * @param workbook The workbook that the region is on.
- * @param sheet The sheet that the region is on.
- * @deprecated 3.15 beta 2. Use {@link #setRightBorderColor(int, CellRangeAddress, Sheet)}.
- */
- @Removal(version="3.17")
- public static void setRightBorderColor(int color, CellRangeAddress region, Sheet sheet, Workbook workbook) {
- setRightBorderColor(color, region, sheet);
- }
- /**
- * Sets the right border color for a region of cells by manipulating the cell style of the individual
- * cells on the right
- *
- * @param color The color of the border
- * @param region The region that should have the border
* @param sheet The sheet that the region is on.
* @since POI 3.15 beta 2
*/
@@ -242,20 +185,6 @@ public final class RegionUtil {
*
* @param border The new border
* @param region The region that should have the border
- * @param workbook The workbook that the region is on.
- * @param sheet The sheet that the region is on.
- * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle, CellRangeAddress, Sheet)}.
- */
- @Removal(version="3.17")
- public static void setBorderBottom(int border, CellRangeAddress region, Sheet sheet, Workbook workbook) {
- setBorderBottom(border, region, sheet);
- }
- /**
- * Sets the bottom border style for a region of cells by manipulating the cell style of the individual
- * cells on the bottom
- *
- * @param border The new border
- * @param region The region that should have the border
* @param sheet The sheet that the region is on.
* @since POI 3.15 beta 2
* @deprecated POI 3.16 beta 1. Use {@link #setBorderBottom(BorderStyle, CellRangeAddress, Sheet)}.
@@ -297,20 +226,6 @@ public final class RegionUtil {
*
* @param color The color of the border
* @param region The region that should have the border
- * @param workbook The workbook that the region is on.
- * @param sheet The sheet that the region is on.
- * @deprecated 3.15 beta 2. Use {@link #setBottomBorderColor(int, CellRangeAddress, Sheet)}.
- */
- @Removal(version="3.17")
- public static void setBottomBorderColor(int color, CellRangeAddress region, Sheet sheet, Workbook workbook) {
- setBottomBorderColor(color, region, sheet);
- }
- /**
- * Sets the bottom border color for a region of cells by manipulating the cell style of the individual
- * cells on the bottom
- *
- * @param color The color of the border
- * @param region The region that should have the border
* @param sheet The sheet that the region is on.
* @since POI 3.15 beta 2
*/
@@ -331,20 +246,6 @@ public final class RegionUtil {
*
* @param border The new border
* @param region The region that should have the border
- * @param workbook The workbook that the region is on.
- * @param sheet The sheet that the region is on.
- * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle, CellRangeAddress, Sheet)}.
- */
- @Removal(version="3.17")
- public static void setBorderTop(int border, CellRangeAddress region, Sheet sheet, Workbook workbook) {
- setBorderTop(border, region, sheet);
- }
- /**
- * Sets the top border style for a region of cells by manipulating the cell style of the individual
- * cells on the top
- *
- * @param border The new border
- * @param region The region that should have the border
* @param sheet The sheet that the region is on.
* @since POI 3.15 beta 2
* @deprecated 3.16 beta 1. Use {@link #setBorderTop(BorderStyle, CellRangeAddress, Sheet)}.
@@ -383,20 +284,6 @@ public final class RegionUtil {
/**
* Sets the top border color for a region of cells by manipulating the cell style of the individual
* cells on the top
- *
- * @param color The color of the border
- * @param region The region that should have the border
- * @param workbook The workbook that the region is on.
- * @param sheet The sheet that the region is on.
- * @deprecated 3.15 beta 2. Use {@link #setTopBorderColor(int, CellRangeAddress, Sheet)}.
- */
- @Removal(version="3.17")
- public static void setTopBorderColor(int color, CellRangeAddress region, Sheet sheet, Workbook workbook) {
- setTopBorderColor(color, region, sheet);
- }
- /**
- * Sets the top border color for a region of cells by manipulating the cell style of the individual
- * cells on the top
*
* @param color The color of the border
* @param region The region that should have the border
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java Fri Jun 30 11:48:23 2017
@@ -28,7 +28,6 @@ import org.apache.poi.ss.usermodel.Horiz
import org.apache.poi.ss.usermodel.IndexedColors;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
import org.apache.poi.xssf.model.StylesTable;
import org.apache.poi.xssf.model.ThemesTable;
import org.apache.poi.xssf.usermodel.extensions.XSSFCellAlignment;
@@ -221,13 +220,6 @@ public class XSSFCellStyle implements Ce
* Get the type of horizontal alignment for the cell
*
* @return short - the type of alignment
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_GENERAL
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_LEFT
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_CENTER
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_RIGHT
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_FILL
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_JUSTIFY
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_CENTER_SELECTION
* @deprecated POI 3.15 beta 3. Use {@link #getAlignmentEnum()} instead.
*/
@Override
@@ -503,25 +495,7 @@ public class XSSFCellStyle implements Ce
/**
* Get the fill pattern
- * @return fill pattern, default value is {@link org.apache.poi.ss.usermodel.CellStyle#NO_FILL}
- *
- * @see org.apache.poi.ss.usermodel.CellStyle#NO_FILL
- * @see org.apache.poi.ss.usermodel.CellStyle#SOLID_FOREGROUND
- * @see org.apache.poi.ss.usermodel.CellStyle#FINE_DOTS
- * @see org.apache.poi.ss.usermodel.CellStyle#ALT_BARS
- * @see org.apache.poi.ss.usermodel.CellStyle#SPARSE_DOTS
- * @see org.apache.poi.ss.usermodel.CellStyle#THICK_HORZ_BANDS
- * @see org.apache.poi.ss.usermodel.CellStyle#THICK_VERT_BANDS
- * @see org.apache.poi.ss.usermodel.CellStyle#THICK_BACKWARD_DIAG
- * @see org.apache.poi.ss.usermodel.CellStyle#THICK_FORWARD_DIAG
- * @see org.apache.poi.ss.usermodel.CellStyle#BIG_SPOTS
- * @see org.apache.poi.ss.usermodel.CellStyle#BRICKS
- * @see org.apache.poi.ss.usermodel.CellStyle#THIN_HORZ_BANDS
- * @see org.apache.poi.ss.usermodel.CellStyle#THIN_VERT_BANDS
- * @see org.apache.poi.ss.usermodel.CellStyle#THIN_BACKWARD_DIAG
- * @see org.apache.poi.ss.usermodel.CellStyle#THIN_FORWARD_DIAG
- * @see org.apache.poi.ss.usermodel.CellStyle#SQUARES
- * @see org.apache.poi.ss.usermodel.CellStyle#DIAMONDS
+ * @return fill pattern, default value is the code for {@link org.apache.poi.ss.usermodel.FillPatternType#NO_FILL}
* @deprecated POI 3.15 beta 3. This method will return {@link FillPatternType} in the future. Use {@link #setFillPattern(FillPatternType)} instead.
*/
@Override
@@ -742,11 +716,7 @@ public class XSSFCellStyle implements Ce
/**
* Get the type of vertical alignment for the cell
*
- * @return align the type of alignment, default value is {@link org.apache.poi.ss.usermodel.CellStyle#VERTICAL_BOTTOM}
- * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_TOP
- * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_CENTER
- * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_BOTTOM
- * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_JUSTIFY
+ * @return align the type of alignment, default value is {@link org.apache.poi.ss.usermodel.VerticalAlignment}
* @deprecated POI 3.15 beta 3. Use {@link #getVerticalAlignmentEnum()} instead.
*/
@Override
@@ -783,25 +753,6 @@ public class XSSFCellStyle implements Ce
* Set the type of horizontal alignment for the cell
*
* @param align - the type of alignment
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_GENERAL
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_LEFT
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_CENTER
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_RIGHT
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_FILL
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_JUSTIFY
- * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_CENTER_SELECTION
- * @deprecated POI 3.15 beta 3. Use {@link #setAlignment(HorizontalAlignment)} instead.
- */
- @Removal(version="3.17")
- @Override
- public void setAlignment(short align) {
- setAlignment(HorizontalAlignment.forInt(align));
- }
-
- /**
- * Set the type of horizontal alignment for the cell
- *
- * @param align - the type of alignment
*/
@Override
public void setAlignment(HorizontalAlignment align) {
@@ -811,18 +762,6 @@ public class XSSFCellStyle implements Ce
/**
* Set the type of border to use for the bottom border of the cell
*
- * @param border the type of border to use
- * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle)}
- */
- @Removal(version="3.17")
- @Override
- public void setBorderBottom(short border) {
- setBorderBottom(BorderStyle.valueOf(border));
- }
-
- /**
- * Set the type of border to use for the bottom border of the cell
- *
* @param border - type of border to use
* @see org.apache.poi.ss.usermodel.BorderStyle
* @since POI 3.15
@@ -840,17 +779,6 @@ public class XSSFCellStyle implements Ce
_cellXf.setApplyBorder(true);
}
- /**
- * Set the type of border to use for the left border of the cell
- * @param border the type of border to use
- * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle)}
- */
- @Removal(version="3.17")
- @Override
- public void setBorderLeft(short border) {
- setBorderLeft(BorderStyle.valueOf(border));
- }
-
/**
* Set the type of border to use for the left border of the cell
*
@@ -870,18 +798,6 @@ public class XSSFCellStyle implements Ce
_cellXf.setApplyBorder(true);
}
- /**
- * Set the type of border to use for the right border of the cell
- *
- * @param border the type of border to use
- * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle)}
- */
- @Removal(version="3.17")
- @Override
- public void setBorderRight(short border) {
- setBorderRight(BorderStyle.valueOf(border));
- }
-
/**
* Set the type of border to use for the right border of the cell
*
@@ -905,18 +821,6 @@ public class XSSFCellStyle implements Ce
* Set the type of border to use for the top border of the cell
*
* @param border the type of border to use
- * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle)}
- */
- @Removal(version="3.17")
- @Override
- public void setBorderTop(short border) {
- setBorderTop(BorderStyle.valueOf(border));
- }
-
- /**
- * Set the type of border to use for the top border of the cell
- *
- * @param border the type of border to use
* @since POI 3.15
*/
@Override
@@ -1123,39 +1027,6 @@ public class XSSFCellStyle implements Ce
}
/**
- * This element is used to specify cell fill information for pattern and solid color cell fills.
- * For solid cell fills (no pattern), foreground color is used.
- * For cell fills with patterns specified, then the cell fill color is specified by the background color.
- *
- * @see org.apache.poi.ss.usermodel.CellStyle#NO_FILL
- * @see org.apache.poi.ss.usermodel.CellStyle#SOLID_FOREGROUND
- * @see org.apache.poi.ss.usermodel.CellStyle#FINE_DOTS
- * @see org.apache.poi.ss.usermodel.CellStyle#ALT_BARS
- * @see org.apache.poi.ss.usermodel.CellStyle#SPARSE_DOTS
- * @see org.apache.poi.ss.usermodel.CellStyle#THICK_HORZ_BANDS
- * @see org.apache.poi.ss.usermodel.CellStyle#THICK_VERT_BANDS
- * @see org.apache.poi.ss.usermodel.CellStyle#THICK_BACKWARD_DIAG
- * @see org.apache.poi.ss.usermodel.CellStyle#THICK_FORWARD_DIAG
- * @see org.apache.poi.ss.usermodel.CellStyle#BIG_SPOTS
- * @see org.apache.poi.ss.usermodel.CellStyle#BRICKS
- * @see org.apache.poi.ss.usermodel.CellStyle#THIN_HORZ_BANDS
- * @see org.apache.poi.ss.usermodel.CellStyle#THIN_VERT_BANDS
- * @see org.apache.poi.ss.usermodel.CellStyle#THIN_BACKWARD_DIAG
- * @see org.apache.poi.ss.usermodel.CellStyle#THIN_FORWARD_DIAG
- * @see org.apache.poi.ss.usermodel.CellStyle#SQUARES
- * @see org.apache.poi.ss.usermodel.CellStyle#DIAMONDS
- * @see #setFillBackgroundColor(short)
- * @see #setFillForegroundColor(short)
- * @param fp fill pattern (set to {@link org.apache.poi.ss.usermodel.CellStyle#SOLID_FOREGROUND} to fill w/foreground color)
- * @deprecated POI 3.15. Use {@link #setFillPattern(FillPatternType)} instead.
- */
- @Removal(version="3.17")
- @Override
- public void setFillPattern(short fp) {
- setFillPattern(FillPatternType.forInt(fp));
- }
-
- /**
* This element is used to specify cell fill information for pattern and solid color cell fills. For solid cell fills (no pattern),
* foreground color is used is used. For cell fills with patterns specified, then the cell fill color is specified by the background color element.
*
@@ -1363,23 +1234,6 @@ public class XSSFCellStyle implements Ce
}
/**
- * Set the type of vertical alignment for the cell
- *
- * @param align - align the type of alignment
- * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_TOP
- * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_CENTER
- * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_BOTTOM
- * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_JUSTIFY
- * @see org.apache.poi.ss.usermodel.VerticalAlignment
- * @deprecated POI 3.15 beta 3. Use {@link #setVerticalAlignment(VerticalAlignment)} instead.
- */
- @Removal(version="3.17")
- @Override
- public void setVerticalAlignment(short align) {
- setVerticalAlignment(VerticalAlignment.forInt(align));
- }
-
- /**
* Set the type of vertical alignment for the cell
*
* @param align - the type of alignment
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java Fri Jun 30 11:48:23 2017
@@ -26,7 +26,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.commons.codec.binary.Hex;
-import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.FillPatternType;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.xssf.XSSFTestDataSamples;
import org.apache.poi.xssf.model.ThemesTable.ThemeElement;
@@ -130,7 +130,7 @@ public class TestThemesTable {
if (createFiles) {
XSSFCellStyle cs = row.getSheet().getWorkbook().createCellStyle();
cs.setFillForegroundColor(color);
- cs.setFillPattern(CellStyle.SOLID_FOREGROUND);
+ cs.setFillPattern(FillPatternType.SOLID_FOREGROUND);
row.createCell(1).setCellStyle(cs);
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java Fri Jun 30 11:48:23 2017
@@ -32,8 +32,8 @@ import java.util.Calendar;
import java.util.Date;
import org.apache.poi.hssf.HSSFTestDataSamples;
+import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.ss.usermodel.RichTextString;
import org.apache.poi.ss.usermodel.Row;
@@ -242,17 +242,17 @@ public final class TestUnfixedBugs {
sheet.addMergedRegion(range4);
// set border
- RegionUtil.setBorderBottom(CellStyle.BORDER_THIN, range1, sheet, wb);
+ RegionUtil.setBorderBottom(BorderStyle.THIN, range1, sheet);
- row2.getCell(0).getCellStyle().setBorderBottom(CellStyle.BORDER_THIN);
- row2.getCell(1).getCellStyle().setBorderBottom(CellStyle.BORDER_THIN);
+ row2.getCell(0).getCellStyle().setBorderBottom(BorderStyle.THIN);
+ row2.getCell(1).getCellStyle().setBorderBottom(BorderStyle.THIN);
Cell cell0 = CellUtil.getCell(row3, 0);
- CellUtil.setCellStyleProperty(cell0, CellUtil.BORDER_BOTTOM, CellStyle.BORDER_THIN);
+ CellUtil.setCellStyleProperty(cell0, CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
Cell cell1 = CellUtil.getCell(row3, 1);
- CellUtil.setCellStyleProperty(cell1, CellUtil.BORDER_BOTTOM, CellStyle.BORDER_THIN);
+ CellUtil.setCellStyleProperty(cell1, CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
- RegionUtil.setBorderBottom(CellStyle.BORDER_THIN, range4, sheet, wb);
+ RegionUtil.setBorderBottom(BorderStyle.THIN, range4, sheet);
// write to file
OutputStream stream = new FileOutputStream(new File("C:/temp/55752.xlsx"));
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java Fri Jun 30 11:48:23 2017
@@ -94,7 +94,6 @@ import org.openxmlformats.schemas.spread
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTFontImpl;
-@SuppressWarnings("deprecation")
public final class TestXSSFBugs extends BaseTestBugzillaIssues {
public TestXSSFBugs() {
super(XSSFITestDataProvider.instance);
@@ -1112,12 +1111,12 @@ public final class TestXSSFBugs extends
CellStyle blueStyle = wb.createCellStyle();
blueStyle.setFillForegroundColor(IndexedColors.AQUA.getIndex());
- blueStyle.setFillPattern(CellStyle.SOLID_FOREGROUND);
+ blueStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
assertEquals(1, blueStyle.getIndex());
CellStyle pinkStyle = wb.createCellStyle();
pinkStyle.setFillForegroundColor(IndexedColors.PINK.getIndex());
- pinkStyle.setFillPattern(CellStyle.SOLID_FOREGROUND);
+ pinkStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
assertEquals(2, pinkStyle.getIndex());
// Starts empty
@@ -2979,13 +2978,13 @@ public final class TestXSSFBugs extends
XSSFColor color = new XSSFColor(java.awt.Color.RED);
XSSFCellStyle style = workbook.createCellStyle();
style.setFillForegroundColor(color);
- style.setFillPattern(CellStyle.SOLID_FOREGROUND);
+ style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
cell.setCellStyle(style);
// Everything is fine at this point, cell is red
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(CellUtil.BORDER_BOTTOM, CellStyle.BORDER_THIN); //or BorderStyle.THIN
+ properties.put(CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
CellUtil.setCellStyleProperties(cell, properties);
// Now the cell is all black
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java?rev=1800375&r1=1800374&r2=1800375&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java Fri Jun 30 11:48:23 2017
@@ -580,13 +580,13 @@ public class TestXSSFCellStyle {
assertEquals(IndexedColors.AUTOMATIC.getIndex(), defaultStyle.getFillForegroundColor());
assertEquals(null, defaultStyle.getFillForegroundXSSFColor());
assertEquals(FillPatternType.NO_FILL, defaultStyle.getFillPatternEnum());
- assertEquals(CellStyle.NO_FILL, defaultStyle.getFillPattern());
+ assertEquals(FillPatternType.NO_FILL.getCode(), defaultStyle.getFillPattern());
XSSFCellStyle customStyle = wb.createCellStyle();
customStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
assertEquals(FillPatternType.SOLID_FOREGROUND, customStyle.getFillPatternEnum());
- assertEquals(CellStyle.SOLID_FOREGROUND, customStyle.getFillPattern());
+ assertEquals(FillPatternType.SOLID_FOREGROUND.getCode(), customStyle.getFillPattern());
assertEquals(3, styles.getFills().size());
customStyle.setFillForegroundColor(IndexedColors.BRIGHT_GREEN.getIndex());
@@ -598,7 +598,7 @@ public class TestXSSFCellStyle {
style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
assertEquals(FillPatternType.SOLID_FOREGROUND, style.getFillPatternEnum());
- assertEquals(CellStyle.SOLID_FOREGROUND, style.getFillPattern());
+ assertEquals(FillPatternType.SOLID_FOREGROUND.getCode(), style.getFillPattern());
assertEquals(4, styles.getFills().size());
style.setFillForegroundColor(IndexedColors.BRIGHT_GREEN.getIndex());
@@ -619,7 +619,7 @@ public class TestXSSFCellStyle {
int num = stylesTable.getFills().size();
cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
assertEquals(FillPatternType.SOLID_FOREGROUND, cellStyle.getFillPatternEnum());
- assertEquals(CellStyle.SOLID_FOREGROUND, cellStyle.getFillPattern());
+ assertEquals(FillPatternType.SOLID_FOREGROUND.getCode(), cellStyle.getFillPattern());
assertEquals(num + 1, stylesTable.getFills().size());
int fillId = (int)cellStyle.getCoreXf().getFillId();
assertTrue(fillId > 0);
@@ -635,7 +635,7 @@ public class TestXSSFCellStyle {
cellStyle.setFillPattern(FillPatternType.NO_FILL);
assertEquals(FillPatternType.NO_FILL, cellStyle.getFillPatternEnum());
- assertEquals(CellStyle.NO_FILL, cellStyle.getFillPattern());
+ assertEquals(FillPatternType.NO_FILL.getCode(), cellStyle.getFillPattern());
fillId = (int)cellStyle.getCoreXf().getFillId();
ctFill2 = stylesTable.getFillAt(fillId).getCTFill();
assertFalse(ctFill2.getPatternFill().isSetPatternType());
@@ -675,22 +675,22 @@ public class TestXSSFCellStyle {
}
@Test
- public void testGetSetAlignement() {
+ public void testGetSetAlignment() {
assertNull(cellStyle.getCellAlignment().getCTCellAlignment().getHorizontal());
assertEquals(HorizontalAlignment.GENERAL, cellStyle.getAlignmentEnum());
- cellStyle.setAlignment(XSSFCellStyle.ALIGN_LEFT);
- assertEquals(XSSFCellStyle.ALIGN_LEFT, cellStyle.getAlignment());
+ cellStyle.setAlignment(HorizontalAlignment.LEFT);
+ assertEquals(HorizontalAlignment.LEFT.getCode(), cellStyle.getAlignment());
assertEquals(HorizontalAlignment.LEFT, cellStyle.getAlignmentEnum());
assertEquals(STHorizontalAlignment.LEFT, cellStyle.getCellAlignment().getCTCellAlignment().getHorizontal());
cellStyle.setAlignment(HorizontalAlignment.JUSTIFY);
- assertEquals(XSSFCellStyle.ALIGN_JUSTIFY, cellStyle.getAlignment());
+ assertEquals(HorizontalAlignment.JUSTIFY.getCode(), cellStyle.getAlignment());
assertEquals(HorizontalAlignment.JUSTIFY, cellStyle.getAlignmentEnum());
assertEquals(STHorizontalAlignment.JUSTIFY, cellStyle.getCellAlignment().getCTCellAlignment().getHorizontal());
cellStyle.setAlignment(HorizontalAlignment.CENTER);
- assertEquals(XSSFCellStyle.ALIGN_CENTER, cellStyle.getAlignment());
+ assertEquals(HorizontalAlignment.CENTER.getCode(), cellStyle.getAlignment());
assertEquals(HorizontalAlignment.CENTER, cellStyle.getAlignmentEnum());
assertEquals(STHorizontalAlignment.CENTER, cellStyle.getCellAlignment().getCTCellAlignment().getHorizontal());
}
@@ -698,16 +698,16 @@ public class TestXSSFCellStyle {
@Test
public void testGetSetVerticalAlignment() {
assertEquals(VerticalAlignment.BOTTOM, cellStyle.getVerticalAlignmentEnum());
- assertEquals(XSSFCellStyle.VERTICAL_BOTTOM, cellStyle.getVerticalAlignment());
+ assertEquals(VerticalAlignment.BOTTOM.getCode(), cellStyle.getVerticalAlignment());
assertNull(cellStyle.getCellAlignment().getCTCellAlignment().getVertical());
- cellStyle.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
- assertEquals(XSSFCellStyle.VERTICAL_CENTER, cellStyle.getVerticalAlignment());
+ cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+ assertEquals(VerticalAlignment.CENTER.getCode(), cellStyle.getVerticalAlignment());
assertEquals(VerticalAlignment.CENTER, cellStyle.getVerticalAlignmentEnum());
assertEquals(STVerticalAlignment.CENTER, cellStyle.getCellAlignment().getCTCellAlignment().getVertical());
- cellStyle.setVerticalAlignment(XSSFCellStyle.VERTICAL_JUSTIFY);
- assertEquals(XSSFCellStyle.VERTICAL_JUSTIFY, cellStyle.getVerticalAlignment());
+ cellStyle.setVerticalAlignment(VerticalAlignment.JUSTIFY);
+ assertEquals(VerticalAlignment.JUSTIFY.getCode(), cellStyle.getVerticalAlignment());
assertEquals(VerticalAlignment.JUSTIFY, cellStyle.getVerticalAlignmentEnum());
assertEquals(STVerticalAlignment.JUSTIFY, cellStyle.getCellAlignment().getCTCellAlignment().getVertical());
}
@@ -734,23 +734,23 @@ public class TestXSSFCellStyle {
assertEquals(2, wb.getNumberOfFonts());
XSSFCellStyle orig = wb.createCellStyle();
- orig.setAlignment(CellStyle.ALIGN_RIGHT);
+ orig.setAlignment(HorizontalAlignment.RIGHT);
orig.setFont(fnt);
orig.setDataFormat((short)18);
- assertTrue(CellStyle.ALIGN_RIGHT == orig.getAlignment());
- assertTrue(fnt == orig.getFont());
- assertTrue(18 == orig.getDataFormat());
+ assertEquals(HorizontalAlignment.RIGHT, orig.getAlignmentEnum());
+ assertEquals(fnt, orig.getFont());
+ assertEquals(18, orig.getDataFormat());
XSSFCellStyle clone = wb.createCellStyle();
- assertFalse(CellStyle.ALIGN_RIGHT == clone.getAlignment());
+ assertFalse(HorizontalAlignment.RIGHT == clone.getAlignmentEnum());
assertFalse(fnt == clone.getFont());
assertFalse(18 == clone.getDataFormat());
clone.cloneStyleFrom(orig);
- assertTrue(CellStyle.ALIGN_RIGHT == clone.getAlignment());
- assertTrue(fnt == clone.getFont());
- assertTrue(18 == clone.getDataFormat());
+ assertEquals(HorizontalAlignment.RIGHT, clone.getAlignmentEnum());
+ assertEquals(fnt, clone.getFont());
+ assertEquals(18, clone.getDataFormat());
assertEquals(2, wb.getNumberOfFonts());
XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb);
@@ -779,11 +779,11 @@ public class TestXSSFCellStyle {
fmt.getFormat("MadeUpTwo");
XSSFCellStyle orig = wbOrig.createCellStyle();
- orig.setAlignment(HSSFCellStyle.ALIGN_RIGHT);
+ orig.setAlignment(HorizontalAlignment.RIGHT);
orig.setFont(fnt);
orig.setDataFormat(fmt.getFormat("Test##"));
- assertTrue(XSSFCellStyle.ALIGN_RIGHT == orig.getAlignment());
+ assertTrue(HorizontalAlignment.RIGHT == orig.getAlignmentEnum());
assertTrue(fnt == orig.getFont());
assertTrue(fmt.getFormat("Test##") == orig.getDataFormat());
@@ -803,7 +803,7 @@ public class TestXSSFCellStyle {
assertEquals(1, wbClone.getNumberOfFonts());
assertEquals(0, wbClone.getStylesSource().getNumberFormats().size());
- assertFalse(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
+ assertFalse(HorizontalAlignment.RIGHT == clone.getAlignmentEnum());
assertNotEquals("TestingFont", clone.getFont().getFontName());
clone.cloneStyleFrom(orig);
@@ -812,7 +812,7 @@ public class TestXSSFCellStyle {
assertEquals(2, wbClone.getNumCellStyles());
assertEquals(1, wbClone.getStylesSource().getNumberFormats().size());
- assertEquals(HSSFCellStyle.ALIGN_RIGHT, clone.getAlignment());
+ assertEquals(HorizontalAlignment.RIGHT, clone.getAlignmentEnum());
assertEquals("TestingFont", clone.getFont().getFontName());
assertEquals(fmtClone.getFormat("Test##"), clone.getDataFormat());
assertFalse(fmtClone.getFormat("Test##") == fmt.getFormat("Test##"));
@@ -824,7 +824,7 @@ public class TestXSSFCellStyle {
assertEquals(1, wbReload.getStylesSource().getNumberFormats().size());
XSSFCellStyle reload = wbReload.getCellStyleAt((short)1);
- assertEquals(HSSFCellStyle.ALIGN_RIGHT, reload.getAlignment());
+ assertEquals(HorizontalAlignment.RIGHT, reload.getAlignmentEnum());
assertEquals("TestingFont", reload.getFont().getFontName());
assertEquals(fmtClone.getFormat("Test##"), reload.getDataFormat());
assertFalse(fmtClone.getFormat("Test##") == fmt.getFormat("Test##"));
@@ -944,8 +944,8 @@ public class TestXSSFCellStyle {
cellStyle2.setFillForegroundColor(IndexedColors.DARK_BLUE.getIndex());
cellStyle2.setFillPattern(FillPatternType.SOLID_FOREGROUND);
- cellStyle2.setAlignment(CellStyle.ALIGN_RIGHT);
- cellStyle2.setVerticalAlignment(CellStyle.VERTICAL_TOP);
+ cellStyle2.setAlignment(HorizontalAlignment.RIGHT);
+ cellStyle2.setVerticalAlignment(VerticalAlignment.TOP);
cell.setCellStyle(cellStyle2);
@@ -955,10 +955,10 @@ public class TestXSSFCellStyle {
CellStyle styleBack = cellBack.getCellStyle();
assertEquals(IndexedColors.DARK_BLUE.getIndex(), styleBack.getFillBackgroundColor());
assertEquals(IndexedColors.DARK_BLUE.getIndex(), styleBack.getFillForegroundColor());
- assertEquals(CellStyle.ALIGN_RIGHT, styleBack.getAlignment());
- assertEquals(CellStyle.VERTICAL_TOP, styleBack.getVerticalAlignment());
+ assertEquals(HorizontalAlignment.RIGHT, styleBack.getAlignmentEnum());
+ assertEquals(VerticalAlignment.TOP, styleBack.getVerticalAlignmentEnum());
assertEquals(FillPatternType.SOLID_FOREGROUND, styleBack.getFillPatternEnum());
- assertEquals(CellStyle.SOLID_FOREGROUND, styleBack.getFillPattern());
+ assertEquals(FillPatternType.SOLID_FOREGROUND.getCode(), styleBack.getFillPattern());
wbBack.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org