Author: kiwiwings
Date: Sat Mar 12 00:17:16 2016
New Revision: 1734651
URL: http://svn.apache.org/viewvc?rev=1734651&view=rev
Log:
#59170 - Remove deprecated classes (POI 3.15) -
org.apache.poi.hssf/ss.util.Region
Removed:
poi/trunk/src/java/org/apache/poi/hssf/util/Region.java
poi/trunk/src/java/org/apache/poi/ss/util/Region.java
poi/trunk/src/testcases/org/apache/poi/ss/util/TestRegion.java
Modified:
poi/site/src/documentation/content/xdocs/status.xml
poi/site/src/documentation/content/xdocs/trans/es/hssf/quick-guide.xml
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
poi/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
poi/trunk/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java
Modified: poi/site/src/documentation/content/xdocs/status.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/status.xml?rev=1734651&r1=1734650&r2=1734651&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/status.xml (original)
+++ poi/site/src/documentation/content/xdocs/status.xml Sat Mar 12 00:17:16 2016
@@ -40,6 +40,7 @@
</devs>
<release version="3.15-beta1" date="2016-07-??">
+ <action dev="PD" type="fix" fixes-bug="59170">Remove deprecated
classes (POI 3.15) - org.apache.poi.hssf/ss.util.Region</action>
<action dev="PD" type="add" fixes-bug="57031">Out of Memory when
extracting text from attached files</action>
<action dev="PD" type="fix">More helpful exception when
POIFSFileSystem is given a raw XML file</action>
</release>
Modified: poi/site/src/documentation/content/xdocs/trans/es/hssf/quick-guide.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/trans/es/hssf/quick-guide.xml?rev=1734651&r1=1734650&r2=1734651&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/trans/es/hssf/quick-guide.xml
(original)
+++ poi/site/src/documentation/content/xdocs/trans/es/hssf/quick-guide.xml Sat
Mar 12 00:17:16 2016
@@ -257,7 +257,7 @@
HSSFCell cell = row.createCell((short) 1);
cell.setCellValue("This is a test of merging");
- sheet.addMergedRegion(new Region(1,(short)1,1,(short)2));
+ sheet.addMergedRegion(new CellRangeAddress(1,(short)1,1,(short)2));
// Write the output to a file
FileOutputStream fileOut = new FileOutputStream("workbook.xls");
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java?rev=1734651&r1=1734650&r2=1734651&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
Sat Mar 12 00:17:16 2016
@@ -92,13 +92,6 @@ public final class HSSFConditionalFormat
}
/**
- * @deprecated (Aug-2008) use {@link
HSSFConditionalFormatting#getFormattingRanges()}
- */
- public org.apache.poi.ss.util.Region[] getFormattingRegions() {
- CellRangeAddress[] cellRanges = getFormattingRanges();
- return
org.apache.poi.ss.util.Region.convertCellRangesToRegions(cellRanges);
- }
- /**
* @return array of <tt>CellRangeAddress</tt>s. never <code>null</code>
*/
public CellRangeAddress[] getFormattingRanges() {
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java?rev=1734651&r1=1734650&r2=1734651&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
Sat Mar 12 00:17:16 2016
@@ -115,18 +115,6 @@ public class HSSFFormulaEvaluator implem
return _bookEvaluator;
}
- /**
- * Does nothing
- * @deprecated (Aug 2008) - not needed, since the current row can be
derived from the cell
- */
- @Deprecated
- public void setCurrentRow(HSSFRow row) {
- // do nothing
-// if (false) {
-// row.getClass(); // suppress unused parameter compiler
warning
-// }
- }
-
/**
* Should be called whenever there are major changes (e.g. moving
sheets) to input cells
* in the evaluated workbook. If performance is not critical, a single
call to this method
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java?rev=1734651&r1=1734650&r2=1734651&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
Sat Mar 12 00:17:16 2016
@@ -163,12 +163,6 @@ public final class HSSFSheetConditionalF
}
/**
- * @deprecated use <tt>CellRangeAddress</tt> instead of <tt>Region</tt>
- */
- public int addConditionalFormatting(org.apache.poi.ss.util.Region[]
regions, HSSFConditionalFormattingRule[] cfRules) {
- return
addConditionalFormatting(org.apache.poi.ss.util.Region.convertRegionsToCellRanges(regions),
cfRules);
- }
- /**
* Allows to add a new Conditional Formatting set to the sheet.
*
* @param regions - list of rectangular regions to apply conditional
formatting rules
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=1734651&r1=1734650&r2=1734651&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 Sat Mar 12
00:17:16 2016
@@ -31,20 +31,6 @@ public final class HSSFRegionUtil {
// no instances of this class
}
- /**
- * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of {@link
Region}
- */
- private static CellRangeAddress toCRA(org.apache.poi.ss.util.Region
region) {
- return
org.apache.poi.ss.util.Region.convertToCellRangeAddress(region);
- }
-
- /**
- * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of
{@link Region}
- */
- public static void setBorderLeft(short border, Region region, HSSFSheet
sheet,
- HSSFWorkbook workbook) {
- setBorderLeft(border, toCRA(region), sheet, workbook);
- }
/**
* Sets the left border for a region of cells by manipulating the cell
style
* of the individual cells on the left
@@ -60,13 +46,6 @@ public final class HSSFRegionUtil {
}
/**
- * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of
{@link Region}
- */
- public static void setLeftBorderColor(short color, Region region,
HSSFSheet sheet,
- HSSFWorkbook workbook) {
- setLeftBorderColor(color, toCRA(region), sheet, workbook);
- }
- /**
* Sets the leftBorderColor attribute of the HSSFRegionUtil object
*
* @param color The color of the border
@@ -80,13 +59,6 @@ public final class HSSFRegionUtil {
}
/**
- * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of
{@link Region}
- */
- public static void setBorderRight(short border, Region region,
HSSFSheet sheet,
- HSSFWorkbook workbook) {
- setBorderRight(border, toCRA(region), sheet, workbook);
- }
- /**
* Sets the borderRight attribute of the HSSFRegionUtil object
*
* @param border The new border
@@ -100,13 +72,6 @@ public final class HSSFRegionUtil {
}
/**
- * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of
{@link Region}
- */
- public static void setRightBorderColor(short color, Region region,
HSSFSheet sheet,
- HSSFWorkbook workbook) {
- setRightBorderColor(color, toCRA(region), sheet, workbook);
- }
- /**
* Sets the rightBorderColor attribute of the HSSFRegionUtil object
*
* @param color The color of the border
@@ -120,13 +85,6 @@ public final class HSSFRegionUtil {
}
/**
- * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of
{@link Region}
- */
- public static void setBorderBottom(short border, Region region,
HSSFSheet sheet,
- HSSFWorkbook workbook) {
- setBorderBottom(border, toCRA(region), sheet, workbook);
- }
- /**
* Sets the borderBottom attribute of the HSSFRegionUtil object
*
* @param border The new border
@@ -140,13 +98,6 @@ public final class HSSFRegionUtil {
}
/**
- * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of
{@link Region}
- */
- public static void setBottomBorderColor(short color, Region region,
HSSFSheet sheet,
- HSSFWorkbook workbook) {
- setBottomBorderColor(color, toCRA(region), sheet, workbook);
- }
- /**
* Sets the bottomBorderColor attribute of the HSSFRegionUtil object
*
* @param color The color of the border
@@ -160,13 +111,6 @@ public final class HSSFRegionUtil {
}
/**
- * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of
{@link Region}
- */
- public static void setBorderTop(short border, Region region, HSSFSheet
sheet,
- HSSFWorkbook workbook) {
- setBorderTop(border, toCRA(region), sheet, workbook);
- }
- /**
* Sets the borderBottom attribute of the HSSFRegionUtil object
*
* @param border The new border
@@ -180,13 +124,6 @@ public final class HSSFRegionUtil {
}
/**
- * @deprecated (Aug 2008) use {@link CellRangeAddress} instead of
{@link Region}
- */
- public static void setTopBorderColor(short color, Region region,
HSSFSheet sheet,
- HSSFWorkbook workbook) {
- setTopBorderColor(color, toCRA(region), sheet, workbook);
- }
- /**
* Sets the topBorderColor attribute of the HSSFRegionUtil object
*
* @param color The color of the border
Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java?rev=1734651&r1=1734650&r2=1734651&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java Sat Mar
12 00:17:16 2016
@@ -33,7 +33,6 @@ import org.junit.runners.Suite;
TestExpandedDouble.class,
TestNumberComparer.class,
TestNumberToTextConverter.class,
- TestRegion.class,
TestSheetBuilder.class,
TestSheetUtil.class,
TestWorkbookUtil.class
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
