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 2020/12/08 23:30:42 UTC

svn commit: r1884223 [2/2] - in /poi/trunk/src: java/org/apache/poi/hssf/record/ java/org/apache/poi/hssf/record/cf/ java/org/apache/poi/hssf/record/chart/ java/org/apache/poi/hssf/record/common/ java/org/apache/poi/ss/formula/ ooxml/java/org/apache/po...

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java Tue Dec  8 23:30:40 2020
@@ -54,7 +54,6 @@ public final class PlotAreaRecord extend
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
     @Removal(version = "5.0.0")

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java Tue Dec  8 23:30:40 2020
@@ -65,7 +65,6 @@ public final class PlotGrowthRecord exte
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
     @Removal(version = "5.0.0")

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java Tue Dec  8 23:30:40 2020
@@ -62,7 +62,6 @@ public final class SeriesChartGroupIndex
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
     @Removal(version = "5.0.0")

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java Tue Dec  8 23:30:40 2020
@@ -73,7 +73,6 @@ public final class SeriesLabelsRecord ex
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
     @Removal(version = "5.0.0")

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java Tue Dec  8 23:30:40 2020
@@ -78,7 +78,6 @@ public final class SeriesListRecord exte
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
     @Removal(version = "5.0.0")

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java Tue Dec  8 23:30:40 2020
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.Record
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The series record describes the overall data for a series.
@@ -95,17 +94,6 @@ public final class SeriesRecord extends
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SeriesRecord clone() {
-        return copy();
-    }
-
     @Override
     public SeriesRecord copy() {
         return new SeriesRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/TickRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/TickRecord.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/TickRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/TickRecord.java Tue Dec  8 23:30:40 2020
@@ -30,7 +30,6 @@ import org.apache.poi.hssf.record.Standa
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The Tick record defines how tick marks and label positioning/formatting<p>
@@ -115,17 +114,6 @@ public final class TickRecord extends St
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public TickRecord clone() {
-        return copy();
-    }
-
     @Override
     public TickRecord copy() {
         return new TickRecord(this);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java Tue Dec  8 23:30:40 2020
@@ -62,7 +62,6 @@ public final class UnitsRecord extends S
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
     @Removal(version = "5.0.0")

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java Tue Dec  8 23:30:40 2020
@@ -94,7 +94,6 @@ public final class ValueRangeRecord exte
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
     @Removal(version = "5.0.0")

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java Tue Dec  8 23:30:40 2020
@@ -170,7 +170,6 @@ public final class ExtendedColor impleme
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
     @Removal(version = "5.0.0")

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java Tue Dec  8 23:30:40 2020
@@ -27,7 +27,6 @@ import org.apache.poi.ss.util.CellRangeA
 import org.apache.poi.util.GenericRecordJsonWriter;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Title: FtrHeader (Future Record Header) common record part
@@ -96,17 +95,6 @@ public final class FtrHeader implements
         this.associatedRange = associatedRange;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FtrHeader clone() {
-        return copy();
-    }
-
     public FtrHeader copy() {
         return new FtrHeader(this);
     }

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java Tue Dec  8 23:30:40 2020
@@ -36,7 +36,6 @@ import org.apache.poi.util.BitFieldFacto
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Unicode String - just standard fields that are in several records.
@@ -497,17 +496,6 @@ public class UnicodeString implements Co
         return extBit.isSet(getOptionFlags());
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public UnicodeString clone() {
-        return copy();
-    }
-
     @Override
     public UnicodeString copy() {
         return new UnicodeString(this);

Modified: poi/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java Tue Dec  8 23:30:40 2020
@@ -27,7 +27,6 @@ import org.apache.poi.ss.usermodel.RichT
 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;
 
 /**
  * Common functionality across file formats for evaluating formula cells.<p>
@@ -187,34 +186,6 @@ public abstract class BaseFormulaEvaluat
         setCellValue(cell, cv);
         return cv.getCellType();
     }
-    
-    /**
-     * If cell contains formula, it evaluates the formula,
-     *  and saves the result of the formula. The cell
-     *  remains as a formula cell.
-     * Else if cell does not contain formula, this method leaves
-     *  the cell unchanged.
-     * Note that the type of the formula result is returned,
-     *  so you know what kind of value is also stored with
-     *  the formula.
-     * <pre>
-     * CellType evaluatedCellType = evaluator.evaluateFormulaCell(cell);
-     * </pre>
-     * Be aware that your cell will hold both the formula,
-     *  and the result. If you want the cell replaced with
-     *  the result of the formula, use {@link #evaluate(org.apache.poi.ss.usermodel.Cell)} }
-     * @param cell The cell to evaluate
-     * @return The type of the formula result (the cell's type remains as CellType.FORMULA however)
-     *         If cell is not a formula cell, returns {@link CellType#_NONE} rather than throwing an exception.
-     * @since POI 3.15 beta 3
-     * @deprecated use <code>evaluateFormulaCell(cell)</code> instead
-     */
-    @Deprecated
-    @Removal(version = "4.2")
-    @Override
-    public CellType evaluateFormulaCellEnum(Cell cell) {
-        return evaluateFormulaCell(cell);
-    }
 
     /**
      * set the cell type

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java Tue Dec  8 23:30:40 2020
@@ -18,7 +18,6 @@
 package org.apache.poi.xssf.usermodel.helpers;
 
 import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
 import org.apache.poi.xssf.usermodel.XSSFTable;
 import org.apache.poi.xssf.usermodel.XSSFTableColumn;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXmlColumnPr;
@@ -73,19 +72,6 @@ public class XSSFXmlColumnPr {
     }
 
     /**
-     * (see Open Office XML Part 4: chapter 3.5.1.3)
-     * 
-     * @deprecated Use {@link XSSFTableColumn#getId()} instead.
-     * 
-     * @return An integer representing the unique identifier of this column.
-     */
-    @Deprecated
-    @Removal(version="4.2")
-    public long getId() {
-        return tableColumn.getId();
-    }
-
-    /**
      * If the XPath is, for example, /Node1/Node2/Node3 and /Node1/Node2 is the common XPath for the table, the local XPath is /Node3
      * 
      * @return the local XPath

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java?rev=1884223&r1=1884222&r2=1884223&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java Tue Dec  8 23:30:40 2020
@@ -678,22 +678,6 @@ public class XWPFRun implements ISDTCont
 
     /**
      * Specifies the alignment which shall be applied to the contents of this
-     * run in relation to the default appearance of the run's text.
-     * This allows the text to be repositioned as subscript or superscript without
-     * altering the font size of the run properties.
-     *
-     * @return VerticalAlign
-     * @see {@link VerticalAlign} all possible value that could be applyed to this run
-     * @deprecated use {@link XWPFRun.getVerticalAlignment}
-     */
-    @Removal(version = "4.2")
-    public VerticalAlign getSubscript() {
-        CTRPr pr = getRunProperties(false);
-        return (pr != null && pr.isSetVertAlign()) ? VerticalAlign.valueOf(pr.getVertAlign().getVal().intValue()) : VerticalAlign.BASELINE;
-    }
-
-    /**
-     * Specifies the alignment which shall be applied to the contents of this
      * run in relation to the default appearance of the run's text. This allows
      * the text to be repositioned as subscript or superscript without altering
      * the font size of the run properties.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org