Remove more deprecated code
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1813092 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning
parent
6c0ac68e05
commit
af2813634b
@ -1,31 +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.hwpf.model;
|
||||
|
||||
import org.apache.poi.util.Internal;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author andy
|
||||
*/
|
||||
@Internal
|
||||
@Deprecated
|
||||
public interface HDFType {
|
||||
|
||||
}
|
||||
|
||||
@ -34,8 +34,7 @@ import org.apache.poi.util.StringUtil;
|
||||
* @author Ryan Ackley
|
||||
*/
|
||||
@Internal
|
||||
public final class StyleDescription implements HDFType
|
||||
{
|
||||
public final class StyleDescription {
|
||||
|
||||
private static final POILogger logger = POILogFactory.getLogger(StyleDescription.class);
|
||||
//arbitrarily selected; may need to increase
|
||||
@ -57,27 +56,21 @@ public final class StyleDescription implements HDFType
|
||||
@Deprecated
|
||||
CharacterProperties _chp;
|
||||
|
||||
public StyleDescription()
|
||||
{
|
||||
public StyleDescription() {
|
||||
// _pap = new ParagraphProperties();
|
||||
// _chp = new CharacterProperties();
|
||||
}
|
||||
public StyleDescription(byte[] std, int baseLength, int offset, boolean word9)
|
||||
{
|
||||
|
||||
public StyleDescription(byte[] std, int baseLength, int offset, boolean word9) {
|
||||
_baseLength = baseLength;
|
||||
int nameStart = offset + baseLength;
|
||||
|
||||
boolean readStdfPost2000 = false;
|
||||
if ( baseLength == 0x0012 )
|
||||
{
|
||||
if (baseLength == 0x0012) {
|
||||
readStdfPost2000 = true;
|
||||
}
|
||||
else if ( baseLength == 0x000A )
|
||||
{
|
||||
} else if (baseLength == 0x000A) {
|
||||
readStdfPost2000 = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
logger.log(POILogger.WARN,
|
||||
"Style definition has non-standard size of ",
|
||||
Integer.valueOf(baseLength));
|
||||
@ -86,8 +79,7 @@ public final class StyleDescription implements HDFType
|
||||
_stdfBase = new StdfBase(std, offset);
|
||||
offset += StdfBase.getSize();
|
||||
|
||||
if ( readStdfPost2000 )
|
||||
{
|
||||
if (readStdfPost2000) {
|
||||
_stdfPost2000 = new StdfPost2000(std, offset);
|
||||
// offset += StdfPost2000.getSize();
|
||||
}
|
||||
@ -96,14 +88,11 @@ public final class StyleDescription implements HDFType
|
||||
//style name and aliases string
|
||||
int nameLength = 0;
|
||||
int multiplier = 1;
|
||||
if(word9)
|
||||
{
|
||||
if (word9) {
|
||||
nameLength = LittleEndian.getShort(std, nameStart);
|
||||
multiplier = 2;
|
||||
nameStart += LittleEndian.SHORT_SIZE;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
nameLength = std[nameStart];
|
||||
}
|
||||
|
||||
@ -116,8 +105,7 @@ public final class StyleDescription implements HDFType
|
||||
int varOffset = ((nameLength + 1) * multiplier) + nameStart;
|
||||
int countOfUPX = _stdfBase.getCupx();
|
||||
_upxs = new UPX[countOfUPX];
|
||||
for(int x = 0; x < countOfUPX; x++)
|
||||
{
|
||||
for (int x = 0; x < countOfUPX; x++) {
|
||||
int upxSize = LittleEndian.getShort(std, varOffset);
|
||||
varOffset += LittleEndian.SHORT_SIZE;
|
||||
|
||||
@ -128,8 +116,7 @@ public final class StyleDescription implements HDFType
|
||||
|
||||
|
||||
// the upx will always start on a word boundary.
|
||||
if((upxSize & 1) == 1)
|
||||
{
|
||||
if ((upxSize & 1) == 1) {
|
||||
++varOffset;
|
||||
}
|
||||
|
||||
@ -137,17 +124,15 @@ public final class StyleDescription implements HDFType
|
||||
|
||||
|
||||
}
|
||||
public int getBaseStyle()
|
||||
{
|
||||
|
||||
public int getBaseStyle() {
|
||||
return _stdfBase.getIstdBase();
|
||||
}
|
||||
public byte[] getCHPX()
|
||||
{
|
||||
switch (_stdfBase.getStk())
|
||||
{
|
||||
|
||||
public byte[] getCHPX() {
|
||||
switch (_stdfBase.getStk()) {
|
||||
case PARAGRAPH_STYLE:
|
||||
if (_upxs.length > 1)
|
||||
{
|
||||
if (_upxs.length > 1) {
|
||||
return _upxs[1].getUPX();
|
||||
}
|
||||
return null;
|
||||
@ -158,44 +143,41 @@ public final class StyleDescription implements HDFType
|
||||
}
|
||||
|
||||
}
|
||||
public byte[] getPAPX()
|
||||
{
|
||||
switch (_stdfBase.getStk())
|
||||
{
|
||||
|
||||
public byte[] getPAPX() {
|
||||
switch (_stdfBase.getStk()) {
|
||||
case PARAGRAPH_STYLE:
|
||||
return _upxs[0].getUPX();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public ParagraphProperties getPAP()
|
||||
{
|
||||
public ParagraphProperties getPAP() {
|
||||
return _pap;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public CharacterProperties getCHP()
|
||||
{
|
||||
public CharacterProperties getCHP() {
|
||||
return _chp;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
void setPAP(ParagraphProperties pap)
|
||||
{
|
||||
void setPAP(ParagraphProperties pap) {
|
||||
_pap = pap;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
void setCHP(CharacterProperties chp)
|
||||
{
|
||||
void setCHP(CharacterProperties chp) {
|
||||
_chp = chp;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
public String getName() {
|
||||
return _name;
|
||||
}
|
||||
|
||||
public byte[] toByteArray()
|
||||
{
|
||||
public byte[] toByteArray() {
|
||||
// size equals _baseLength bytes for known variables plus 2 bytes for name
|
||||
// length plus name length * 2 plus 2 bytes for null plus upx's preceded by
|
||||
// length
|
||||
@ -204,8 +186,7 @@ public final class StyleDescription implements HDFType
|
||||
// determine the size needed for the upxs. They always fall on word
|
||||
// boundaries.
|
||||
size += _upxs[0].size() + 2;
|
||||
for (int x = 1; x < _upxs.length; x++)
|
||||
{
|
||||
for (int x = 1; x < _upxs.length; x++) {
|
||||
size += _upxs[x - 1].size() % 2;
|
||||
size += _upxs[x].size() + 2;
|
||||
}
|
||||
@ -219,16 +200,14 @@ public final class StyleDescription implements HDFType
|
||||
char[] letters = _name.toCharArray();
|
||||
LittleEndian.putShort(buf, _baseLength, (short) letters.length);
|
||||
offset += LittleEndian.SHORT_SIZE;
|
||||
for (int x = 0; x < letters.length; x++)
|
||||
{
|
||||
for (int x = 0; x < letters.length; x++) {
|
||||
LittleEndian.putShort(buf, offset, (short) letters[x]);
|
||||
offset += LittleEndian.SHORT_SIZE;
|
||||
}
|
||||
// get past the null delimiter for the name.
|
||||
offset += LittleEndian.SHORT_SIZE;
|
||||
|
||||
for (int x = 0; x < _upxs.length; x++)
|
||||
{
|
||||
for (int x = 0; x < _upxs.length; x++) {
|
||||
short upxSize = (short) _upxs[x].size();
|
||||
LittleEndian.putShort(buf, offset, upxSize);
|
||||
offset += LittleEndian.SHORT_SIZE;
|
||||
@ -240,8 +219,7 @@ public final class StyleDescription implements HDFType
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode()
|
||||
{
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((_name == null) ? 0 : _name.hashCode());
|
||||
@ -252,8 +230,7 @@ public final class StyleDescription implements HDFType
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals( Object obj )
|
||||
{
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
@ -261,19 +238,15 @@ public final class StyleDescription implements HDFType
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
StyleDescription other = (StyleDescription) obj;
|
||||
if ( _name == null )
|
||||
{
|
||||
if (_name == null) {
|
||||
if (other._name != null)
|
||||
return false;
|
||||
}
|
||||
else if ( !_name.equals( other._name ) )
|
||||
} else if (!_name.equals(other._name))
|
||||
return false;
|
||||
if ( _stdfBase == null )
|
||||
{
|
||||
if (_stdfBase == null) {
|
||||
if (other._stdfBase != null)
|
||||
return false;
|
||||
}
|
||||
else if ( !_stdfBase.equals( other._stdfBase ) )
|
||||
} else if (!_stdfBase.equals(other._stdfBase))
|
||||
return false;
|
||||
if (!Arrays.equals(_upxs, other._upxs))
|
||||
return false;
|
||||
@ -281,8 +254,7 @@ public final class StyleDescription implements HDFType
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
public String toString() {
|
||||
StringBuilder result = new StringBuilder();
|
||||
result.append("[STD]: '");
|
||||
result.append(_name);
|
||||
@ -291,8 +263,7 @@ public final class StyleDescription implements HDFType
|
||||
"\n "));
|
||||
result.append(("\nStdfPost2000:\t" + _stdfPost2000).replaceAll(
|
||||
"\n", "\n "));
|
||||
for ( UPX upx : _upxs )
|
||||
{
|
||||
for (UPX upx : _upxs) {
|
||||
result.append(("\nUPX:\t" + upx).replaceAll("\n", "\n "));
|
||||
}
|
||||
return result.toString();
|
||||
|
||||
@ -39,7 +39,7 @@ import org.apache.poi.util.LittleEndian;
|
||||
* @author Ryan Ackley
|
||||
*/
|
||||
@Internal
|
||||
public final class StyleSheet implements HDFType {
|
||||
public final class StyleSheet {
|
||||
|
||||
public static final int NIL_STYLE = 4095;
|
||||
// private static final int PAP_TYPE = 1;
|
||||
@ -74,8 +74,7 @@ public final class StyleSheet implements HDFType {
|
||||
* info. Found by using FileInformationBlock.getFcStshf() and
|
||||
* FileInformationBLock.getLcbStshf()
|
||||
*/
|
||||
public StyleSheet(byte[] tableStream, int offset)
|
||||
{
|
||||
public StyleSheet(byte[] tableStream, int offset) {
|
||||
int startOffset = offset;
|
||||
_cbStshi = LittleEndian.getShort(tableStream, offset);
|
||||
offset += LittleEndian.SHORT_SIZE;
|
||||
@ -95,13 +94,11 @@ public final class StyleSheet implements HDFType {
|
||||
|
||||
offset = startOffset + LittleEndian.SHORT_SIZE + _cbStshi;
|
||||
_styleDescriptions = new StyleDescription[_stshif.getCstd()];
|
||||
for(int x = 0; x < _stshif.getCstd(); x++)
|
||||
{
|
||||
for (int x = 0; x < _stshif.getCstd(); x++) {
|
||||
int stdSize = LittleEndian.getShort(tableStream, offset);
|
||||
//get past the size
|
||||
offset += 2;
|
||||
if(stdSize > 0)
|
||||
{
|
||||
if (stdSize > 0) {
|
||||
//byte[] std = new byte[stdSize];
|
||||
|
||||
StyleDescription aStyle = new StyleDescription(tableStream,
|
||||
@ -113,10 +110,8 @@ public final class StyleSheet implements HDFType {
|
||||
offset += stdSize;
|
||||
|
||||
}
|
||||
for(int x = 0; x < _styleDescriptions.length; x++)
|
||||
{
|
||||
if(_styleDescriptions[x] != null)
|
||||
{
|
||||
for (int x = 0; x < _styleDescriptions.length; x++) {
|
||||
if (_styleDescriptions[x] != null) {
|
||||
createPap(x);
|
||||
createChp(x);
|
||||
}
|
||||
@ -124,8 +119,7 @@ public final class StyleSheet implements HDFType {
|
||||
}
|
||||
|
||||
public void writeTo(OutputStream out)
|
||||
throws IOException
|
||||
{
|
||||
throws IOException {
|
||||
|
||||
int offset = 0;
|
||||
|
||||
@ -149,10 +143,8 @@ public final class StyleSheet implements HDFType {
|
||||
out.write(buf);
|
||||
|
||||
byte[] sizeHolder = new byte[2];
|
||||
for (int x = 0; x < _styleDescriptions.length; x++)
|
||||
{
|
||||
if(_styleDescriptions[x] != null)
|
||||
{
|
||||
for (int x = 0; x < _styleDescriptions.length; x++) {
|
||||
if (_styleDescriptions[x] != null) {
|
||||
byte[] std = _styleDescriptions[x].toByteArray();
|
||||
|
||||
// adjust the size so it is always on a word boundary
|
||||
@ -161,13 +153,10 @@ public final class StyleSheet implements HDFType {
|
||||
out.write(std);
|
||||
|
||||
// Must always start on a word boundary.
|
||||
if (std.length % 2 == 1)
|
||||
{
|
||||
if (std.length % 2 == 1) {
|
||||
out.write('\0');
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
sizeHolder[0] = 0;
|
||||
sizeHolder[1] = 0;
|
||||
out.write(sizeHolder);
|
||||
@ -176,8 +165,7 @@ public final class StyleSheet implements HDFType {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o)
|
||||
{
|
||||
public boolean equals(Object o) {
|
||||
if (!(o instanceof StyleSheet)) return false;
|
||||
StyleSheet ss = (StyleSheet) o;
|
||||
|
||||
@ -213,17 +201,14 @@ public final class StyleSheet implements HDFType {
|
||||
* ParagraphProperties from (and also place the finished PAP in)
|
||||
*/
|
||||
@Deprecated
|
||||
private void createPap(int istd)
|
||||
{
|
||||
private void createPap(int istd) {
|
||||
StyleDescription sd = _styleDescriptions[istd];
|
||||
ParagraphProperties pap = sd.getPAP();
|
||||
byte[] papx = sd.getPAPX();
|
||||
int baseIndex = sd.getBaseStyle();
|
||||
if(pap == null && papx != null)
|
||||
{
|
||||
if (pap == null && papx != null) {
|
||||
ParagraphProperties parentPAP = new ParagraphProperties();
|
||||
if(baseIndex != NIL_STYLE)
|
||||
{
|
||||
if (baseIndex != NIL_STYLE) {
|
||||
|
||||
parentPAP = _styleDescriptions[baseIndex].getPAP();
|
||||
if (parentPAP == null) {
|
||||
@ -246,6 +231,7 @@ public final class StyleSheet implements HDFType {
|
||||
sd.setPAP(pap);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a CharacterProperties object from a chpx stored in the
|
||||
* StyleDescription at the index istd in the StyleDescription array. The
|
||||
@ -257,8 +243,7 @@ public final class StyleSheet implements HDFType {
|
||||
* CharacterProperties object from.
|
||||
*/
|
||||
@Deprecated
|
||||
private void createChp(int istd)
|
||||
{
|
||||
private void createChp(int istd) {
|
||||
StyleDescription sd = _styleDescriptions[istd];
|
||||
CharacterProperties chp = sd.getCHP();
|
||||
byte[] chpx = sd.getCHPX();
|
||||
@ -273,14 +258,11 @@ public final class StyleSheet implements HDFType {
|
||||
}
|
||||
|
||||
// Build and decompress the Chp if required
|
||||
if(chp == null && chpx != null)
|
||||
{
|
||||
if (chp == null && chpx != null) {
|
||||
CharacterProperties parentCHP = new CharacterProperties();
|
||||
if(baseIndex != NIL_STYLE)
|
||||
{
|
||||
if (baseIndex != NIL_STYLE) {
|
||||
parentCHP = _styleDescriptions[baseIndex].getCHP();
|
||||
if(parentCHP == null)
|
||||
{
|
||||
if (parentCHP == null) {
|
||||
createChp(baseIndex);
|
||||
parentCHP = _styleDescriptions[baseIndex].getCHP();
|
||||
}
|
||||
@ -296,6 +278,7 @@ public final class StyleSheet implements HDFType {
|
||||
|
||||
/**
|
||||
* Gets the number of styles in the style sheet.
|
||||
*
|
||||
* @return The number of styles in the style sheet.
|
||||
*/
|
||||
public int numStyles() {
|
||||
@ -305,24 +288,19 @@ public final class StyleSheet implements HDFType {
|
||||
/**
|
||||
* Gets the StyleDescription at index x.
|
||||
*
|
||||
* @param styleIndex
|
||||
* the index of the desired StyleDescription.
|
||||
* @param styleIndex the index of the desired StyleDescription.
|
||||
*/
|
||||
public StyleDescription getStyleDescription( int styleIndex )
|
||||
{
|
||||
public StyleDescription getStyleDescription(int styleIndex) {
|
||||
return _styleDescriptions[styleIndex];
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public CharacterProperties getCharacterStyle( int styleIndex )
|
||||
{
|
||||
if ( styleIndex == NIL_STYLE )
|
||||
{
|
||||
public CharacterProperties getCharacterStyle(int styleIndex) {
|
||||
if (styleIndex == NIL_STYLE) {
|
||||
return NIL_CHP;
|
||||
}
|
||||
|
||||
if ( styleIndex >= _styleDescriptions.length )
|
||||
{
|
||||
if (styleIndex >= _styleDescriptions.length) {
|
||||
return NIL_CHP;
|
||||
}
|
||||
|
||||
@ -331,75 +309,60 @@ public final class StyleSheet implements HDFType {
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public ParagraphProperties getParagraphStyle( int styleIndex )
|
||||
{
|
||||
if ( styleIndex == NIL_STYLE )
|
||||
{
|
||||
public ParagraphProperties getParagraphStyle(int styleIndex) {
|
||||
if (styleIndex == NIL_STYLE) {
|
||||
return NIL_PAP;
|
||||
}
|
||||
|
||||
if ( styleIndex >= _styleDescriptions.length )
|
||||
{
|
||||
if (styleIndex >= _styleDescriptions.length) {
|
||||
return NIL_PAP;
|
||||
}
|
||||
|
||||
if ( _styleDescriptions[styleIndex] == null )
|
||||
{
|
||||
if (_styleDescriptions[styleIndex] == null) {
|
||||
return NIL_PAP;
|
||||
}
|
||||
|
||||
if ( _styleDescriptions[styleIndex].getPAP() == null )
|
||||
{
|
||||
if (_styleDescriptions[styleIndex].getPAP() == null) {
|
||||
return NIL_PAP;
|
||||
}
|
||||
|
||||
return _styleDescriptions[styleIndex].getPAP();
|
||||
}
|
||||
|
||||
public byte[] getCHPX( int styleIndex )
|
||||
{
|
||||
if ( styleIndex == NIL_STYLE )
|
||||
{
|
||||
public byte[] getCHPX(int styleIndex) {
|
||||
if (styleIndex == NIL_STYLE) {
|
||||
return NIL_CHPX;
|
||||
}
|
||||
|
||||
if ( styleIndex >= _styleDescriptions.length )
|
||||
{
|
||||
if (styleIndex >= _styleDescriptions.length) {
|
||||
return NIL_CHPX;
|
||||
}
|
||||
|
||||
if ( _styleDescriptions[styleIndex] == null )
|
||||
{
|
||||
if (_styleDescriptions[styleIndex] == null) {
|
||||
return NIL_CHPX;
|
||||
}
|
||||
|
||||
if ( _styleDescriptions[styleIndex].getCHPX() == null )
|
||||
{
|
||||
if (_styleDescriptions[styleIndex].getCHPX() == null) {
|
||||
return NIL_CHPX;
|
||||
}
|
||||
|
||||
return _styleDescriptions[styleIndex].getCHPX();
|
||||
}
|
||||
|
||||
public byte[] getPAPX( int styleIndex )
|
||||
{
|
||||
if ( styleIndex == NIL_STYLE )
|
||||
{
|
||||
public byte[] getPAPX(int styleIndex) {
|
||||
if (styleIndex == NIL_STYLE) {
|
||||
return NIL_PAPX;
|
||||
}
|
||||
|
||||
if ( styleIndex >= _styleDescriptions.length )
|
||||
{
|
||||
if (styleIndex >= _styleDescriptions.length) {
|
||||
return NIL_PAPX;
|
||||
}
|
||||
|
||||
if ( _styleDescriptions[styleIndex] == null )
|
||||
{
|
||||
if (_styleDescriptions[styleIndex] == null) {
|
||||
return NIL_PAPX;
|
||||
}
|
||||
|
||||
if ( _styleDescriptions[styleIndex].getPAPX() == null )
|
||||
{
|
||||
if (_styleDescriptions[styleIndex].getPAPX() == null) {
|
||||
return NIL_PAPX;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user