Author: fanningpj
Date: Wed Dec 9 00:41:25 2020
New Revision: 1884229
URL: http://svn.apache.org/viewvc?rev=1884229&view=rev
Log:
remove some deprecated code
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java?rev=1884229&r1=1884228&r2=1884229&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java Wed
Dec 9 00:41:25 2020
@@ -33,7 +33,6 @@ import org.apache.poi.util.LittleEndianI
import org.apache.poi.util.LittleEndianOutput;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
/**
* Data Bar Conditional Formatting Rule Record.
@@ -154,16 +153,6 @@ public final class DataBarFormatting imp
return GenericRecordJsonWriter.marshal(this);
}
- /**
- * @deprecated use {@link #copy()} instead
- */
- @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
- @Deprecated
- @Removal(version = "5.0.0")
- public DataBarFormatting clone() {
- return copy();
- }
-
public DataBarFormatting copy() {
return new DataBarFormatting(this);
}
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=1884229&r1=1884228&r2=1884229&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 Wed Dec
9 00:41:25 2020
@@ -294,12 +294,6 @@ public final class HSSFCellStyle impleme
return HorizontalAlignment.forInt(_format.getAlignment());
}
- @Override
- public HorizontalAlignment getAlignmentEnum()
- {
- return getAlignment();
- }
-
/**
* set whether the text should be wrapped
* @param wrapped wrap text or not
@@ -336,11 +330,6 @@ public final class HSSFCellStyle impleme
return VerticalAlignment.forInt(_format.getVerticalAlignment());
}
- @Override
- public VerticalAlignment getVerticalAlignmentEnum() {
- return getVerticalAlignment();
- }
-
/**
* set the degree of rotation for the text in the cell
*
@@ -430,9 +419,6 @@ public final class HSSFCellStyle impleme
return BorderStyle.valueOf(_format.getBorderLeft());
}
- @Override
- public BorderStyle getBorderLeftEnum() { return getBorderLeft(); }
-
/**
* set the type of border to use for the right border of the cell
* @param border type
@@ -451,9 +437,6 @@ public final class HSSFCellStyle impleme
return BorderStyle.valueOf(_format.getBorderRight());
}
- @Override
- public BorderStyle getBorderRightEnum() { return getBorderRight(); }
-
/**
* set the type of border to use for the top border of the cell
* @param border type
@@ -472,9 +455,6 @@ public final class HSSFCellStyle impleme
return BorderStyle.valueOf(_format.getBorderTop());
}
- @Override
- public BorderStyle getBorderTopEnum() { return getBorderTop(); }
-
/**
* set the type of border to use for the bottom border of the cell
* @param border type
@@ -493,9 +473,6 @@ public final class HSSFCellStyle impleme
return BorderStyle.valueOf(_format.getBorderBottom());
}
- @Override
- public BorderStyle getBorderBottomEnum() { return getBorderBottom(); }
-
/**
* set the color to use for the left border
* @param color The index of the color definition
@@ -598,9 +575,6 @@ public final class HSSFCellStyle impleme
return FillPatternType.forInt(_format.getAdtlFillPattern());
}
- @Override
- public FillPatternType getFillPatternEnum() { return getFillPattern(); }
-
/**
* Checks if the background and foreground fills are set correctly when one
* or the other is set to the default color.
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=1884229&r1=1884228&r2=1884229&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 Wed Dec 9
00:41:25 2020
@@ -121,15 +121,6 @@ public interface CellStyle {
HorizontalAlignment getAlignment();
/**
- * get the type of horizontal alignment for the cell
- * @return align - the type of alignment
- * @deprecated use <code>getAlignment()</code> instead
- */
- @Removal(version = "4.2")
- @Deprecated
- HorizontalAlignment getAlignmentEnum();
-
- /**
* Set whether the text should be wrapped.
* Setting this flag to <code>true</code> make all content visible
* within a cell by displaying it on multiple lines
@@ -157,15 +148,6 @@ public interface CellStyle {
VerticalAlignment getVerticalAlignment();
/**
- * get the type of vertical alignment for the cell
- * @return align the type of alignment
- * @deprecated use <code>getVerticalAlignment()</code> instead
- */
- @Removal(version = "4.2")
- @Deprecated
- VerticalAlignment getVerticalAlignmentEnum();
-
- /**
* set the degree of rotation for the text in the cell.
*
* Note: HSSF uses values from -90 to 90 degrees, whereas XSSF
@@ -215,16 +197,6 @@ public interface CellStyle {
BorderStyle getBorderLeft();
/**
- * get the type of border to use for the left border of the cell
- * @return border type
- * @since POI 3.15
- * @deprecated use <code>getBorderLeft()</code> instead
- */
- @Removal(version = "4.2")
- @Deprecated
- BorderStyle getBorderLeftEnum();
-
- /**
* set the type of border to use for the right border of the cell
* @param border type
* @since POI 3.15
@@ -239,16 +211,6 @@ public interface CellStyle {
BorderStyle getBorderRight();
/**
- * get the type of border to use for the right border of the cell
- * @return border type
- * @since POI 3.15
- * @deprecated use <code>getBorderRight()</code> instead
- */
- @Removal(version = "4.2")
- @Deprecated
- BorderStyle getBorderRightEnum();
-
- /**
* set the type of border to use for the top border of the cell
* @param border type
* @since POI 3.15
@@ -263,16 +225,6 @@ public interface CellStyle {
BorderStyle getBorderTop();
/**
- * get the type of border to use for the top border of the cell
- * @return border type
- * @since POI 3.15
- * @deprecated use <code>getBorderTop()</code> instead
- */
- @Removal(version = "4.2")
- @Deprecated
- BorderStyle getBorderTopEnum();
-
- /**
* set the type of border to use for the bottom border of the cell
* @param border type
* @since POI 3.15
@@ -287,16 +239,6 @@ public interface CellStyle {
BorderStyle getBorderBottom();
/**
- * get the type of border to use for the bottom border of the cell
- * @return border type
- * @since POI 3.15
- * @deprecated use <code>getBorderBottom()</code> instead
- */
- @Removal(version = "4.2")
- @Deprecated
- BorderStyle getBorderBottomEnum();
-
- /**
* set the color to use for the left border
* @param color The index of the color definition
*/
@@ -361,17 +303,6 @@ public interface CellStyle {
FillPatternType getFillPattern();
/**
- * Get the fill pattern
- *
- * @return the fill pattern, default value is {@link
FillPatternType#NO_FILL}
- * @since POI 3.15 beta 3
- * @deprecated use <code>getFillPattern()</code> instead
- */
- @Removal(version = "4.2")
- @Deprecated
- FillPatternType getFillPatternEnum();
-
- /**
* set the background fill color.
*
* @param bg color
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=1884229&r1=1884228&r2=1884229&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
Wed Dec 9 00:41:25 2020
@@ -230,11 +230,6 @@ public class XSSFCellStyle implements Ce
}
@Override
- public HorizontalAlignment getAlignmentEnum() {
- return getAlignment();
- }
-
- @Override
public BorderStyle getBorderBottom() {
if(!_cellXf.getApplyBorder()) return BorderStyle.NONE;
@@ -248,11 +243,6 @@ public class XSSFCellStyle implements Ce
}
@Override
- public BorderStyle getBorderBottomEnum() {
- return getBorderBottom();
- }
-
- @Override
public BorderStyle getBorderLeft() {
if(!_cellXf.getApplyBorder()) return BorderStyle.NONE;
@@ -266,9 +256,6 @@ public class XSSFCellStyle implements Ce
}
@Override
- public BorderStyle getBorderLeftEnum() { return getBorderLeft(); }
-
- @Override
public BorderStyle getBorderRight() {
if(!_cellXf.getApplyBorder()) return BorderStyle.NONE;
@@ -282,11 +269,6 @@ public class XSSFCellStyle implements Ce
}
@Override
- public BorderStyle getBorderRightEnum() {
- return getBorderRight();
- }
-
- @Override
public BorderStyle getBorderTop() {
if(!_cellXf.getApplyBorder()) return BorderStyle.NONE;
@@ -299,11 +281,6 @@ public class XSSFCellStyle implements Ce
return BorderStyle.valueOf((short) (ptrn.intValue() - 1));
}
- @Override
- public BorderStyle getBorderTopEnum() {
- return getBorderTop();
- }
-
/**
* Get the color to use for the bottom border
* <br>
@@ -448,11 +425,6 @@ public class XSSFCellStyle implements Ce
return FillPatternType.forInt(ptrn.intValue() - 1);
}
- @Override
- public FillPatternType getFillPatternEnum() {
- return getFillPattern();
- }
-
/**
* Gets the font for this style
* @return Font - font
@@ -661,11 +633,6 @@ public class XSSFCellStyle implements Ce
return VerticalAlignment.BOTTOM;
}
- @Override
- public VerticalAlignment getVerticalAlignmentEnum() {
- return getVerticalAlignment();
- }
-
/**
* Whether the text should be wrapped
*
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=1884229&r1=1884228&r2=1884229&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
Wed Dec 9 00:41:25 2020
@@ -590,13 +590,11 @@ public class TestXSSFCellStyle {
assertEquals(IndexedColors.AUTOMATIC.getIndex(),
defaultStyle.getFillForegroundColor());
assertNull(defaultStyle.getFillForegroundXSSFColor());
assertEquals(FillPatternType.NO_FILL, defaultStyle.getFillPattern());
- assertEquals(FillPatternType.NO_FILL,
defaultStyle.getFillPatternEnum());
XSSFCellStyle customStyle = wb.createCellStyle();
customStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
assertEquals(FillPatternType.SOLID_FOREGROUND,
customStyle.getFillPattern());
- assertEquals(FillPatternType.SOLID_FOREGROUND,
customStyle.getFillPatternEnum());
assertEquals(3, styles.getFills().size());
customStyle.setFillForegroundColor(IndexedColors.BRIGHT_GREEN.getIndex());
@@ -838,7 +836,7 @@ public class TestXSSFCellStyle {
assertEquals("TestingFont", clone.getFont().getFontName());
assertEquals(fmtClone.getFormat("Test##"), clone.getDataFormat());
assertNotEquals(fmtClone.getFormat("Test##"), fmt.getFormat("Test##"));
- assertEquals(clone.getFillPatternEnum(),
FillPatternType.SOLID_FOREGROUND);
+ assertEquals(clone.getFillPattern(), FillPatternType.SOLID_FOREGROUND);
assertEquals(clone.getFillForegroundColor(),
IndexedColors.BRIGHT_GREEN.getIndex());
// Save it and re-check
@@ -852,7 +850,7 @@ public class TestXSSFCellStyle {
assertEquals("TestingFont", reload.getFont().getFontName());
assertEquals(fmtClone.getFormat("Test##"), reload.getDataFormat());
assertNotEquals(fmtClone.getFormat("Test##"), fmt.getFormat("Test##"));
- assertEquals(clone.getFillPatternEnum(),
FillPatternType.SOLID_FOREGROUND);
+ assertEquals(clone.getFillPattern(), FillPatternType.SOLID_FOREGROUND);
assertEquals(clone.getFillForegroundColor(),
IndexedColors.BRIGHT_GREEN.getIndex());
XSSFWorkbook wbOrig2 = XSSFTestDataSamples.writeOutAndReadBack(wbOrig);
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java?rev=1884229&r1=1884228&r2=1884229&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
Wed Dec 9 00:41:25 2020
@@ -105,7 +105,6 @@ public final class TestHSSFPalette {
assertEquals(64, cellA.getCellStyle().getFillBackgroundColor());
assertEquals(Font.COLOR_NORMAL,
cellA.getCellStyle().getFont(book).getColor());
assertEquals(FillPatternType.NO_FILL,
cellA.getCellStyle().getFillPattern());
- assertEquals(FillPatternType.NO_FILL,
cellA.getCellStyle().getFillPatternEnum());
assertEquals("0:0:0", p.getColor((short)64).getHexString());
assertNull(p.getColor((short) 32767));
@@ -115,7 +114,6 @@ public final class TestHSSFPalette {
assertEquals(64, cellB.getCellStyle().getFillBackgroundColor());
assertEquals(10, cellB.getCellStyle().getFont(book).getColor());
assertEquals(FillPatternType.NO_FILL,
cellB.getCellStyle().getFillPattern());
- assertEquals(FillPatternType.NO_FILL,
cellB.getCellStyle().getFillPatternEnum());
assertEquals("0:0:0", p.getColor((short)64).getHexString());
assertEquals("FFFF:0:0", p.getColor((short)10).getHexString());
@@ -125,7 +123,6 @@ public final class TestHSSFPalette {
assertEquals(64, cellC.getCellStyle().getFillBackgroundColor());
assertEquals(10, cellC.getCellStyle().getFont(book).getColor());
assertEquals(FillPatternType.SOLID_FOREGROUND,
cellC.getCellStyle().getFillPattern());
- assertEquals(FillPatternType.SOLID_FOREGROUND,
cellC.getCellStyle().getFillPatternEnum());
assertEquals("0:FFFF:0", p.getColor((short)11).getHexString());
assertEquals("FFFF:0:0", p.getColor((short)10).getHexString());
@@ -135,7 +132,6 @@ public final class TestHSSFPalette {
assertEquals(64, cellD.getCellStyle().getFillBackgroundColor());
assertEquals(14, cellD.getCellStyle().getFont(book).getColor());
assertEquals(FillPatternType.NO_FILL,
cellD.getCellStyle().getFillPattern());
- assertEquals(FillPatternType.NO_FILL,
cellD.getCellStyle().getFillPatternEnum());
assertEquals("FFFF:FFFF:0", p.getColor((short)13).getHexString());
assertEquals("FFFF:0:FFFF", p.getColor((short)14).getHexString());
@@ -145,7 +141,6 @@ public final class TestHSSFPalette {
assertEquals(64, cellE.getCellStyle().getFillBackgroundColor());
assertEquals(14, cellE.getCellStyle().getFont(book).getColor());
assertEquals(FillPatternType.NO_FILL,
cellE.getCellStyle().getFillPattern());
- assertEquals(FillPatternType.NO_FILL,
cellE.getCellStyle().getFillPatternEnum());
assertEquals("FFFF:FFFF:0", p.getColor((short)13).getHexString());
assertEquals("FFFF:0:FFFF", p.getColor((short)14).getHexString());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
