remove some more deprecated code

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1879299 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/poi/hssf/util/CellReference.java

@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-/**
- * Common conversion functions between Excel style A1, C27 style
- *  cell references, and POI usermodel style row=0, column=0
- *  style references.
- *
- *  @deprecated POI 4.0.0-SNAPSHOT. Use {@link org.apache.poi.ss.util.CellReference} instead.
- *          Actually the replacement CellReference was added earlier, but the deprecation notice
- *          was added only in 4.0.0-SNAPSHOT.
- */
-public final class CellReference extends org.apache.poi.ss.util.CellReference {
-    /**
-     * Create an cell ref from a string representation.  Sheet names containing special characters should be
-     * delimited and escaped as per normal syntax rules for formulas.
-     */
-    public CellReference(String cellRef) {
-    	super(cellRef);
-    }
-
-    public CellReference(int pRow, int pCol) {
-    	super(pRow, pCol, true, true);
-    }
-    
-    public CellReference(int pRow, int pCol, boolean pAbsRow, boolean pAbsCol) {
-        super(null, pRow, pCol, pAbsRow, pAbsCol);
-    }
-
-    public CellReference(String pSheetName, int pRow, int pCol, boolean pAbsRow, boolean pAbsCol) {
-    	super(pSheetName, pRow, pCol, pAbsRow, pAbsCol);
-    }
-}

src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java

@@ -1,143 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-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.usermodel.BorderStyle;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.RegionUtil;
-import org.apache.poi.util.Removal;
-
-/**
- * Various utility functions that make working with a region of cells easier.
- * @deprecated POI 4.0.0
- * @see RegionUtil
- */
-@Removal(version="4.2")
-public final class HSSFRegionUtil {
-
-	private HSSFRegionUtil() {
-		// no instances of this class
-	}
-
-	/**
-	 * Sets the left border 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 workbook The workbook that the region is on.
-	 * @param sheet The sheet that the region is on.
-	 */
-	public static void setBorderLeft(int border, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBorderLeft(BorderStyle.valueOf((short)border), region, sheet);
-	}
-
-	/**
-	 * Sets the leftBorderColor attribute of the HSSFRegionUtil object
-	 *
-	 * @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.
-	 */
-	public static void setLeftBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setLeftBorderColor(color, region, sheet);
-	}
-
-	/**
-	 * Sets the borderRight attribute of the HSSFRegionUtil object
-	 *
-	 * @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.
-	 */
-	public static void setBorderRight(int border, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBorderRight(BorderStyle.valueOf((short)border), region, sheet);
-	}
-
-	/**
-	 * Sets the rightBorderColor attribute of the HSSFRegionUtil object
-	 *
-	 * @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.
-	 */
-	public static void setRightBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setRightBorderColor(color, region, sheet);
-	}
-
-	/**
-	 * Sets the borderBottom attribute of the HSSFRegionUtil object
-	 *
-	 * @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.
-	 */
-	public static void setBorderBottom(int border, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBorderBottom(BorderStyle.valueOf((short)border), region, sheet);
-	}
-
-	/**
-	 * Sets the bottomBorderColor attribute of the HSSFRegionUtil object
-	 *
-	 * @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.
-	 */
-	public static void setBottomBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBottomBorderColor(color, region, sheet);
-	}
-
-	/**
-	 * Sets the borderBottom attribute of the HSSFRegionUtil object
-	 *
-	 * @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.
-	 */
-	public static void setBorderTop(int border, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBorderTop(BorderStyle.valueOf((short)border), region, sheet);
-	}
-
-	/**
-	 * Sets the topBorderColor attribute of the HSSFRegionUtil object
-	 *
-	 * @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.
-	 */
-	public static void setTopBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setTopBorderColor(color, region, sheet);
-	}
-}

src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java

@@ -290,7 +290,6 @@ public class TestBugs{
      * [FAILING] Bug 47286 - Word documents saves in wrong format if source
      * contains form elements
      */
-    @SuppressWarnings("deprecation")
     @Test
     public void test47286() throws IOException {
         // Fetch the current text
@@ -323,12 +322,6 @@ public class TestBugs{
         assertEquals(doc1.getCharacterTable().getTextRuns().size(), doc2
                 .getCharacterTable().getTextRuns().size());
 
-        List<PlexOfField> expectedFields = doc1.getFieldsTables()
-                .getFieldsPLCF(FieldsDocumentPart.MAIN);
-        List<PlexOfField> actualFields = doc2.getFieldsTables().getFieldsPLCF(
-                FieldsDocumentPart.MAIN);
-        assertEquals(expectedFields.size(), actualFields.size());
-
         assertTableStructures(doc1.getRange(), doc2.getRange());
     }