diff --git a/src/java/org/apache/poi/hssf/record/CFRuleBase.java b/src/java/org/apache/poi/hssf/record/CFRuleBase.java index e3a91e9f5..3554039af 100644 --- a/src/java/org/apache/poi/hssf/record/CFRuleBase.java +++ b/src/java/org/apache/poi/hssf/record/CFRuleBase.java @@ -40,6 +40,7 @@ import org.apache.poi.util.POILogger; * for their rules.
*/ public abstract class CFRuleBase extends StandardRecord implements Cloneable { + // FIXME: Merge with org.apache.poi.ss.usermodel.ComparisonOperator and rewrite as an enum public static final class ComparisonOperator { public static final byte NO_COMPARISON = 0; public static final byte BETWEEN = 1; diff --git a/src/java/org/apache/poi/hssf/record/DrawingRecord.java b/src/java/org/apache/poi/hssf/record/DrawingRecord.java index 453a7bc75..c55cafa44 100644 --- a/src/java/org/apache/poi/hssf/record/DrawingRecord.java +++ b/src/java/org/apache/poi/hssf/record/DrawingRecord.java @@ -37,6 +37,9 @@ public final class DrawingRecord extends StandardRecord implements Cloneable { recordData = in.readRemainder(); } + /** + * @deprecated POI 3.9 + */ @Deprecated public void processContinueRecord(byte[] record) { //don't merge continue record with the drawing record, it must be serialized separately @@ -55,11 +58,6 @@ public final class DrawingRecord extends StandardRecord implements Cloneable { return sid; } - @Deprecated - public byte[] getData() { - return recordData; - } - public byte[] getRecordData(){ return recordData; } diff --git a/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java b/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java index 18aacc5cf..beee8bca6 100644 --- a/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java +++ b/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java @@ -162,14 +162,6 @@ public class ExternSheetRecord extends StandardRecord { return _list.get(i); } - /** - * @deprecated Was prevously used for removing sheets, which we now do differently - */ - @Deprecated - public void adjustIndex(int extRefIndex, int offset) { - getRef(extRefIndex).adjustIndex(offset); - } - public void removeSheet(int sheetIdx) { int nItems = _list.size(); for (int i = 0; i < nItems; i++) { diff --git a/src/java/org/apache/poi/hssf/record/FilePassRecord.java b/src/java/org/apache/poi/hssf/record/FilePassRecord.java index 413b86504..7c8ae948f 100644 --- a/src/java/org/apache/poi/hssf/record/FilePassRecord.java +++ b/src/java/org/apache/poi/hssf/record/FilePassRecord.java @@ -251,54 +251,6 @@ public final class FilePassRecord extends StandardRecord implements Cloneable { } return rc4; } - - /** - * @deprecated use getRc4KeyData().getSalt() - * @return the rc4 salt - */ - public byte[] getDocId() { - return checkRc4().getSalt(); - } - - /** - * @deprecated use getRc4KeyData().setSalt() - * @param docId the new rc4 salt - */ - public void setDocId(byte[] docId) { - checkRc4().setSalt(docId); - } - - /** - * @deprecated use getRc4KeyData().getEncryptedVerifier() - * @return the rc4 encrypted verifier - */ - public byte[] getSaltData() { - return checkRc4().getEncryptedVerifier(); - } - - /** - * @deprecated use getRc4KeyData().setEncryptedVerifier() - * @param saltData the new rc4 encrypted verifier - */ - public void setSaltData(byte[] saltData) { - getRc4KeyData().setEncryptedVerifier(saltData); - } - - /** - * @deprecated use getRc4KeyData().getEncryptedVerifierHash() - * @return the rc4 encrypted verifier hash - */ - public byte[] getSaltHash() { - return getRc4KeyData().getEncryptedVerifierHash(); - } - - /** - * @deprecated use getRc4KeyData().setEncryptedVerifierHash() - * @param saltHash the new rc4 encrypted verifier - */ - public void setSaltHash(byte[] saltHash) { - getRc4KeyData().setEncryptedVerifierHash(saltHash); - } public short getSid() { return sid; diff --git a/src/java/org/apache/poi/hssf/record/PaneRecord.java b/src/java/org/apache/poi/hssf/record/PaneRecord.java index ea7d967ad..5bff223b2 100644 --- a/src/java/org/apache/poi/hssf/record/PaneRecord.java +++ b/src/java/org/apache/poi/hssf/record/PaneRecord.java @@ -34,9 +34,6 @@ public final class PaneRecord extends StandardRecord { public final static short ACTIVE_PANE_LOWER_RIGHT = 0; public final static short ACTIVE_PANE_UPPER_RIGHT = 1; public final static short ACTIVE_PANE_LOWER_LEFT = 2; - // TODO - remove obsolete field (it was deprecated May-2008 v3.1) - /** @deprecated use ACTIVE_PANE_UPPER_LEFT */ - public final static short ACTIVE_PANE_UPER_LEFT = 3; public final static short ACTIVE_PANE_UPPER_LEFT = 3; diff --git a/src/java/org/apache/poi/hssf/record/PasswordRecord.java b/src/java/org/apache/poi/hssf/record/PasswordRecord.java index dc7a4c395..3277cdcb8 100644 --- a/src/java/org/apache/poi/hssf/record/PasswordRecord.java +++ b/src/java/org/apache/poi/hssf/record/PasswordRecord.java @@ -38,15 +38,6 @@ public final class PasswordRecord extends StandardRecord { field_1_password = in.readShort(); } - /** - * Return the password hash - * - * @deprecated use {@link CryptoFunctions#createXorVerifier1(String)} - */ - public static short hashPassword(String password) { - return (short)CryptoFunctions.createXorVerifier1(password); - } - /** * set the password * diff --git a/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java b/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java index 263bdeeee..3f6a9c469 100644 --- a/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java +++ b/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java @@ -29,8 +29,6 @@ import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey; import org.apache.poi.hssf.record.crypto.Biff8RC4Key; import org.apache.poi.hssf.record.crypto.Biff8XORKey; import org.apache.poi.poifs.crypt.Decryptor; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; /** * A stream based way to get at complete records, with diff --git a/src/java/org/apache/poi/hssf/record/RecordInputStream.java b/src/java/org/apache/poi/hssf/record/RecordInputStream.java index 126092bd4..2b66bd80a 100644 --- a/src/java/org/apache/poi/hssf/record/RecordInputStream.java +++ b/src/java/org/apache/poi/hssf/record/RecordInputStream.java @@ -415,7 +415,7 @@ public final class RecordInputStream implements LittleEndianInput { /** Reads all byte data for the current record, including any * that overlaps into any following continue records. * - * @deprecated Best to write a input stream that wraps this one where there is + * @deprecated POI 2.0 Best to write a input stream that wraps this one where there is * special sub record that may overlap continue records. */ public byte[] readAllContinuedRemainder() { diff --git a/src/java/org/apache/poi/hssf/record/UnicodeString.java b/src/java/org/apache/poi/hssf/record/UnicodeString.java deleted file mode 100644 index a8c23dfd9..000000000 --- a/src/java/org/apache/poi/hssf/record/UnicodeString.java +++ /dev/null @@ -1,35 +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.record; -/** - * @deprecated Use {@link org.apache.poi.hssf.record.common.UnicodeString} instead - */ -public final class UnicodeString extends org.apache.poi.hssf.record.common.UnicodeString { - /** - * @deprecated Use {@link org.apache.poi.hssf.record.common.UnicodeString} instead - */ - public UnicodeString(RecordInputStream in) { - super(in); - } - /** - * @deprecated Use {@link org.apache.poi.hssf.record.common.UnicodeString} instead - */ - public UnicodeString(String str) { - super(str); - } -} diff --git a/src/java/org/apache/poi/hssf/record/WindowOneRecord.java b/src/java/org/apache/poi/hssf/record/WindowOneRecord.java index ffed2164e..e2b9e2c4d 100644 --- a/src/java/org/apache/poi/hssf/record/WindowOneRecord.java +++ b/src/java/org/apache/poi/hssf/record/WindowOneRecord.java @@ -182,14 +182,6 @@ public final class WindowOneRecord extends StandardRecord { public void setActiveSheetIndex(int index) { field_6_active_sheet = index; } - /** - * deprecated May 2008 - * @deprecated - Misleading name - use setActiveSheetIndex() - */ - public void setSelectedTab(short s) - { - setActiveSheetIndex(s); - } /** * Sets the first visible sheet in the worksheet tab-bar. This method does not @@ -200,14 +192,6 @@ public final class WindowOneRecord extends StandardRecord { field_7_first_visible_tab = t; } - /** - * deprecated May 2008 - * @deprecated - Misleading name - use setFirstVisibleTab() - */ - public void setDisplayedTab(short t) { - setFirstVisibleTab(t); - } - /** * set the number of selected tabs * @param n number of tabs @@ -340,14 +324,6 @@ public final class WindowOneRecord extends StandardRecord { public int getActiveSheetIndex() { return field_6_active_sheet; } - /** - * deprecated May 2008 - * @deprecated - Misleading name - use getActiveSheetIndex() - */ - public short getSelectedTab() - { - return (short) getActiveSheetIndex(); - } /** * @return the first visible sheet in the worksheet tab-bar. @@ -356,14 +332,6 @@ public final class WindowOneRecord extends StandardRecord { public int getFirstVisibleTab() { return field_7_first_visible_tab; } - /** - * deprecated May 2008 - * @deprecated - Misleading name - use getFirstVisibleTab() - */ - public short getDisplayedTab() - { - return (short) getFirstVisibleTab(); - } /** * get the number of selected tabs diff --git a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java b/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java index a56f9bd52..d7f0ec477 100644 --- a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java +++ b/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java @@ -198,13 +198,7 @@ public final class WindowTwoRecord extends StandardRecord { public void setActive(boolean p) { field_1_options = active.setShortBoolean(field_1_options, p); } - /** - * deprecated May 2008 - * @deprecated use setActive() - */ - public void setPaged(boolean p) { - setActive(p); - } + /** * was the sheet saved in page break view * @param p pagebreaksaved or not @@ -396,13 +390,6 @@ public final class WindowTwoRecord extends StandardRecord { public boolean isActive() { return active.isSet(field_1_options); } - /** - * deprecated May 2008 - * @deprecated use isActive() - */ - public boolean getPaged() { - return isActive(); - } /** * was the sheet saved in page break view diff --git a/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java index 68b3e9e48..0319af64e 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java @@ -442,14 +442,6 @@ public final class RowRecordsAggregate extends RecordAggregate { return _valuesAgg.iterator(); } - /** - * @deprecated use {@link #getCellValueIterator()} instead - */ - public CellValueRecordInterface[] getValueRecords() { - //noinspection deprecation - return _valuesAgg.getValueRecords(); - } - public IndexRecord createIndexRecord(int indexRecordOffset, int sizeOfInitialSheetRecords) { IndexRecord result = new IndexRecord(); result.setFirstRow(_firstrow); diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java index 14415ae9b..5713d75e5 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java @@ -359,33 +359,6 @@ public final class ValueRecordsAggregate implements Iterable
@@ -342,14 +330,6 @@ public final class HSSFRow implements Row, Comparable
- * MUST be one of the IDs of a {@link ConditionType}
- *
* MUST be a constant from {@link ComparisonOperator}
*
- * If the condition type is {@link #CONDITION_TYPE_CELL_VALUE_IS},
+ * If the condition type is {@link ConditionType#CELL_VALUE_IS},
* this field is the first operand of the comparison.
- * If type is {@link #CONDITION_TYPE_FORMULA}, this formula is used
+ * If type is {@link ConditionType#FORMULA}, this formula is used
* to determine if the conditional formatting is applied.
*
- * If comparison type is {@link #CONDITION_TYPE_FORMULA} the formula MUST be a Boolean function
+ * If comparison type is {@link ConditionType#FORMULA} the formula MUST be a Boolean function
*
- * MUST be one of the IDs of a {@link ConditionType}
- *
* MUST be a constant from {@link org.apache.poi.ss.usermodel.ComparisonOperator}
*
- * If the condition type is {@link ConditionalFormattingRule#CONDITION_TYPE_CELL_VALUE_IS},
+ * If the condition type is {@link ConditionType#CELL_VALUE_IS},
* this field is the first operand of the comparison.
- * If type is {@link ConditionalFormattingRule#CONDITION_TYPE_FORMULA}, this formula is used
+ * If type is {@link ConditionType#FORMULA}, this formula is used
* to determine if the conditional formatting is applied.
*
- * If comparison type is {@link ConditionalFormattingRule#CONDITION_TYPE_FORMULA} the formula MUST be a Boolean function
+ * If comparison type is {@link ConditionType#FORMULA} the formula MUST be a Boolean function
*