From c4e543d4fa4c23f937bed7d059b577575f0a6854 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Tue, 4 Aug 2015 23:11:50 +0000 Subject: [PATCH] Findbugs fixes for DMI_INVOKING_TOSTRING_ON_ARRAY git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1694124 13f79535-47bb-0310-9956-ffa450edef68 --- .../hssf/record/chart/SeriesListRecord.java | 6 +- .../poi/hssf/usermodel/DummyGraphics2d.java | 16 ++-- .../hdftypes/definitions/DOPAbstractType.java | 10 ++- .../src/org/apache/poi/hwpf/model/Xst.java | 2 +- .../poi/hwpf/model/types/CHPAbstractType.java | 2 +- .../poi/hwpf/model/types/DOPAbstractType.java | 78 ++++++++++--------- .../hwpf/model/types/LSTFAbstractType.java | 2 +- .../hwpf/model/types/LVLFAbstractType.java | 2 +- .../poi/hwpf/model/types/PAPAbstractType.java | 14 ++-- .../hwpf/model/types/PICFAbstractType.java | 10 ++- .../poi/hwpf/model/types/SEPAbstractType.java | 6 +- .../poi/hwpf/model/types/TAPAbstractType.java | 66 +++++++++------- 12 files changed, 116 insertions(+), 98 deletions(-) diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java index b67559f19..b9cd19247 100644 --- a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java @@ -17,6 +17,8 @@ package org.apache.poi.hssf.record.chart; +import java.util.Arrays; + import org.apache.poi.hssf.record.RecordInputStream; import org.apache.poi.hssf.record.StandardRecord; import org.apache.poi.util.LittleEndianOutput; @@ -51,9 +53,9 @@ public final class SeriesListRecord extends StandardRecord { public String toString() { StringBuffer buffer = new StringBuffer(); - + buffer.append("[SERIESLIST]\n"); - buffer.append(" .seriesNumbers= ").append(" (").append( getSeriesNumbers() ).append(" )"); + buffer.append(" .seriesNumbers= ").append(" (").append( Arrays.toString(getSeriesNumbers()) ).append(" )"); buffer.append("\n"); buffer.append("[/SERIESLIST]\n"); diff --git a/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java b/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java index 8ada60169..edb87c862 100644 --- a/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java +++ b/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java @@ -415,7 +415,7 @@ public class DummyGraphics2d public void drawBytes(byte data[], int offset, int length, int x, int y) { System.out.println( "drawBytes(byte[],int,int,int,int):" ); - System.out.println( "data = " + data ); + System.out.println( "data = " + Arrays.toString(data) ); System.out.println( "offset = " + offset ); System.out.println( "length = " + length ); System.out.println( "x = " + x ); @@ -425,7 +425,7 @@ public class DummyGraphics2d public void drawChars(char data[], int offset, int length, int x, int y) { System.out.println( "drawChars(data,int,int,int,int):" ); - System.out.println( "data = " + data.toString() ); + System.out.println( "data = " + Arrays.toString(data) ); System.out.println( "offset = " + offset ); System.out.println( "length = " + length ); System.out.println( "x = " + x ); @@ -557,8 +557,8 @@ public class DummyGraphics2d int nPoints) { System.out.println( "drawPolygon(int[],int[],int):" ); - System.out.println( "xPoints = " + xPoints ); - System.out.println( "yPoints = " + yPoints ); + System.out.println( "xPoints = " + Arrays.toString(xPoints) ); + System.out.println( "yPoints = " + Arrays.toString(yPoints) ); System.out.println( "nPoints = " + nPoints ); g2D.drawPolygon( xPoints, yPoints, nPoints ); } @@ -567,8 +567,8 @@ public class DummyGraphics2d int nPoints) { System.out.println( "drawPolyline(int[],int[],int):" ); - System.out.println( "xPoints = " + xPoints ); - System.out.println( "yPoints = " + yPoints ); + System.out.println( "xPoints = " + Arrays.toString(xPoints) ); + System.out.println( "yPoints = " + Arrays.toString(yPoints) ); System.out.println( "nPoints = " + nPoints ); g2D.drawPolyline( xPoints, yPoints, nPoints ); } @@ -658,8 +658,8 @@ public class DummyGraphics2d int nPoints) { System.out.println( "fillPolygon(int[],int[],int):" ); - System.out.println( "xPoints = " + xPoints ); - System.out.println( "yPoints = " + yPoints ); + System.out.println( "xPoints = " + Arrays.toString(xPoints) ); + System.out.println( "yPoints = " + Arrays.toString(yPoints) ); System.out.println( "nPoints = " + nPoints ); g2D.fillPolygon( xPoints, yPoints, nPoints ); } diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java index 2f49e3a89..0c0ca4e25 100644 --- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java +++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java @@ -19,6 +19,8 @@ package org.apache.poi.hdf.model.hdftypes.definitions; +import java.util.Arrays; + import org.apache.poi.util.BitField; import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.LittleEndian; @@ -523,11 +525,11 @@ public abstract class DOPAbstractType buffer.append(" .doptypography = "); buffer.append(HexDump.toHex(getDoptypography())); - buffer.append(" (").append(getDoptypography()).append(" )\n"); + buffer.append(" (").append(Arrays.toString(getDoptypography())).append(" )\n"); buffer.append(" .dogrid = "); buffer.append(HexDump.toHex(getDogrid())); - buffer.append(" (").append(getDogrid()).append(" )\n"); + buffer.append(" (").append(Arrays.toString(getDogrid())).append(" )\n"); buffer.append(" .docinfo5 = "); buffer.append(HexDump.shortToHex(getDocinfo5())); @@ -552,7 +554,7 @@ public abstract class DOPAbstractType buffer.append(" .asumyi = "); buffer.append(HexDump.toHex(getAsumyi())); - buffer.append(" (").append(getAsumyi()).append(" )\n"); + buffer.append(" (").append(Arrays.toString(getAsumyi())).append(" )\n"); buffer.append(" .cChWS = "); buffer.append(HexDump.intToHex(getCChWS())); @@ -575,7 +577,7 @@ public abstract class DOPAbstractType buffer.append(" .Spare = "); buffer.append(HexDump.toHex(getSpare())); - buffer.append(" (").append(getSpare()).append(" )\n"); + buffer.append(" (").append(Arrays.toString(getSpare())).append(" )\n"); buffer.append(" .reserved1 = "); buffer.append(HexDump.intToHex(getReserved1())); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java b/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java index 94b8223de..69e30af57 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java @@ -144,6 +144,6 @@ public class Xst @Override public String toString() { - return "Xst [" + _cch + "; " + _rgtchar + "]"; + return "Xst [" + _cch + "; " + Arrays.toString(_rgtchar) + "]"; } } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java index d3cb2f4c5..92e001ae4 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java @@ -685,7 +685,7 @@ public abstract class CHPAbstractType builder.append(" .dttmDispFldRMark = "); builder.append(" (").append(getDttmDispFldRMark()).append(" )\n"); builder.append(" .xstDispFldRMark = "); - builder.append(" (").append(getXstDispFldRMark()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getXstDispFldRMark())).append(" )\n"); builder.append(" .fcObjp = "); builder.append(" (").append(getFcObjp()).append(" )\n"); builder.append(" .lbrCRJ = "); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java index 9979bc4ee..9c5de6792 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java @@ -18,6 +18,8 @@ package org.apache.poi.hwpf.model.types; +import java.util.Arrays; + import org.apache.poi.hdf.model.hdftypes.HDFType; import org.apache.poi.util.BitField; import org.apache.poi.util.Internal; @@ -248,12 +250,12 @@ public abstract class DOPAbstractType implements HDFType { { data[ 0x0 + offset] = field_1_formatFlags; data[ 0x1 + offset] = field_2_unused2; - LittleEndian.putShort(data, 0x2 + offset, (short)field_3_footnoteInfo); + LittleEndian.putShort(data, 0x2 + offset, field_3_footnoteInfo); data[ 0x4 + offset] = field_4_fOutlineDirtySave; data[ 0x5 + offset] = field_5_docinfo; data[ 0x6 + offset] = field_6_docinfo1; data[ 0x7 + offset] = field_7_docinfo2; - LittleEndian.putShort(data, 0x8 + offset, (short)field_8_docinfo3); + LittleEndian.putShort(data, 0x8 + offset, field_8_docinfo3); LittleEndian.putShort(data, 0xa + offset, (short)field_9_dxaTab); LittleEndian.putShort(data, 0xc + offset, (short)field_10_wSpare); LittleEndian.putShort(data, 0xe + offset, (short)field_11_dxaHotz); @@ -268,22 +270,22 @@ public abstract class DOPAbstractType implements HDFType { LittleEndian.putInt(data, 0x2a + offset, field_20_cCh); LittleEndian.putShort(data, 0x2e + offset, (short)field_21_cPg); LittleEndian.putInt(data, 0x30 + offset, field_22_cParas); - LittleEndian.putShort(data, 0x34 + offset, (short)field_23_Edn); - LittleEndian.putShort(data, 0x36 + offset, (short)field_24_Edn1); + LittleEndian.putShort(data, 0x34 + offset, field_23_Edn); + LittleEndian.putShort(data, 0x36 + offset, field_24_Edn1); LittleEndian.putInt(data, 0x38 + offset, field_25_cLines); LittleEndian.putInt(data, 0x3c + offset, field_26_cWordsFtnEnd); LittleEndian.putInt(data, 0x40 + offset, field_27_cChFtnEdn); - LittleEndian.putShort(data, 0x44 + offset, (short)field_28_cPgFtnEdn); + LittleEndian.putShort(data, 0x44 + offset, field_28_cPgFtnEdn); LittleEndian.putInt(data, 0x46 + offset, field_29_cParasFtnEdn); LittleEndian.putInt(data, 0x4a + offset, field_30_cLinesFtnEdn); LittleEndian.putInt(data, 0x4e + offset, field_31_lKeyProtDoc); - LittleEndian.putShort(data, 0x52 + offset, (short)field_32_view); + LittleEndian.putShort(data, 0x52 + offset, field_32_view); LittleEndian.putInt(data, 0x54 + offset, field_33_docinfo4); - LittleEndian.putShort(data, 0x58 + offset, (short)field_34_adt); + LittleEndian.putShort(data, 0x58 + offset, field_34_adt); System.arraycopy(field_35_doptypography, 0, data, 0x5a + offset, field_35_doptypography.length); System.arraycopy(field_36_dogrid, 0, data, 0x190 + offset, field_36_dogrid.length); - LittleEndian.putShort(data, 0x19a + offset, (short)field_37_docinfo5); - LittleEndian.putShort(data, 0x19c + offset, (short)field_38_docinfo6); + LittleEndian.putShort(data, 0x19a + offset, field_37_docinfo5); + LittleEndian.putShort(data, 0x19c + offset, field_38_docinfo6); System.arraycopy(field_39_asumyi, 0, data, 0x19e + offset, field_39_asumyi.length); LittleEndian.putInt(data, 0x1aa + offset, field_40_cChWS); LittleEndian.putInt(data, 0x1ae + offset, field_41_cChWSFtnEdn); @@ -295,10 +297,10 @@ public abstract class DOPAbstractType implements HDFType { LittleEndian.putInt(data, 0x1e0 + offset, field_47_cDBC); LittleEndian.putInt(data, 0x1e4 + offset, field_48_cDBCFtnEdn); LittleEndian.putInt(data, 0x1e8 + offset, field_49_reserved); - LittleEndian.putShort(data, 0x1ec + offset, (short)field_50_nfcFtnRef); - LittleEndian.putShort(data, 0x1ee + offset, (short)field_51_nfcEdnRef); - LittleEndian.putShort(data, 0x1f0 + offset, (short)field_52_hpsZoonFontPag); - LittleEndian.putShort(data, 0x1f2 + offset, (short)field_53_dywDispPag); + LittleEndian.putShort(data, 0x1ec + offset, field_50_nfcFtnRef); + LittleEndian.putShort(data, 0x1ee + offset, field_51_nfcEdnRef); + LittleEndian.putShort(data, 0x1f0 + offset, field_52_hpsZoonFontPag); + LittleEndian.putShort(data, 0x1f2 + offset, field_53_dywDispPag); } /** @@ -458,9 +460,9 @@ public abstract class DOPAbstractType implements HDFType { builder.append(" .adt = "); builder.append(" (").append(getAdt()).append(" )\n"); builder.append(" .doptypography = "); - builder.append(" (").append(getDoptypography()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getDoptypography())).append(" )\n"); builder.append(" .dogrid = "); - builder.append(" (").append(getDogrid()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getDogrid())).append(" )\n"); builder.append(" .docinfo5 = "); builder.append(" (").append(getDocinfo5()).append(" )\n"); builder.append(" .lvl = ").append(getLvl()).append('\n'); @@ -479,7 +481,7 @@ public abstract class DOPAbstractType implements HDFType { builder.append(" .fHaveVersions = ").append(isFHaveVersions()).append('\n'); builder.append(" .fAutoVersions = ").append(isFAutoVersions()).append('\n'); builder.append(" .asumyi = "); - builder.append(" (").append(getAsumyi()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getAsumyi())).append(" )\n"); builder.append(" .cChWS = "); builder.append(" (").append(getCChWS()).append(" )\n"); builder.append(" .cChWSFtnEdn = "); @@ -492,7 +494,7 @@ public abstract class DOPAbstractType implements HDFType { builder.append(" .fVirusLoadSafe = ").append(isFVirusLoadSafe()).append('\n'); builder.append(" .KeyVirusSession30 = ").append(getKeyVirusSession30()).append('\n'); builder.append(" .Spare = "); - builder.append(" (").append(getSpare()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getSpare())).append(" )\n"); builder.append(" .reserved1 = "); builder.append(" (").append(getReserved1()).append(" )\n"); builder.append(" .reserved2 = "); @@ -2657,7 +2659,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFNoTabForInd( boolean value ) { - field_33_docinfo4 = (int)fNoTabForInd.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fNoTabForInd.setBoolean(field_33_docinfo4, value); } /** @@ -2677,7 +2679,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFNoSpaceRaiseLower( boolean value ) { - field_33_docinfo4 = (int)fNoSpaceRaiseLower.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fNoSpaceRaiseLower.setBoolean(field_33_docinfo4, value); } /** @@ -2697,7 +2699,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFSupressSpdfAfterPageBreak( boolean value ) { - field_33_docinfo4 = (int)fSupressSpdfAfterPageBreak.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fSupressSpdfAfterPageBreak.setBoolean(field_33_docinfo4, value); } /** @@ -2717,7 +2719,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFWrapTrailSpaces( boolean value ) { - field_33_docinfo4 = (int)fWrapTrailSpaces.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fWrapTrailSpaces.setBoolean(field_33_docinfo4, value); } /** @@ -2737,7 +2739,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFMapPrintTextColor( boolean value ) { - field_33_docinfo4 = (int)fMapPrintTextColor.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fMapPrintTextColor.setBoolean(field_33_docinfo4, value); } /** @@ -2757,7 +2759,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFNoColumnBalance( boolean value ) { - field_33_docinfo4 = (int)fNoColumnBalance.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fNoColumnBalance.setBoolean(field_33_docinfo4, value); } /** @@ -2777,7 +2779,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFConvMailMergeEsc( boolean value ) { - field_33_docinfo4 = (int)fConvMailMergeEsc.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fConvMailMergeEsc.setBoolean(field_33_docinfo4, value); } /** @@ -2797,7 +2799,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFSupressTopSpacing( boolean value ) { - field_33_docinfo4 = (int)fSupressTopSpacing.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fSupressTopSpacing.setBoolean(field_33_docinfo4, value); } /** @@ -2817,7 +2819,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFOrigWordTableRules( boolean value ) { - field_33_docinfo4 = (int)fOrigWordTableRules.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fOrigWordTableRules.setBoolean(field_33_docinfo4, value); } /** @@ -2837,7 +2839,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFTransparentMetafiles( boolean value ) { - field_33_docinfo4 = (int)fTransparentMetafiles.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fTransparentMetafiles.setBoolean(field_33_docinfo4, value); } /** @@ -2857,7 +2859,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFShowBreaksInFrames( boolean value ) { - field_33_docinfo4 = (int)fShowBreaksInFrames.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fShowBreaksInFrames.setBoolean(field_33_docinfo4, value); } /** @@ -2877,7 +2879,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFSwapBordersFacingPgs( boolean value ) { - field_33_docinfo4 = (int)fSwapBordersFacingPgs.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fSwapBordersFacingPgs.setBoolean(field_33_docinfo4, value); } /** @@ -2897,7 +2899,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFSuppressTopSPacingMac5( boolean value ) { - field_33_docinfo4 = (int)fSuppressTopSPacingMac5.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fSuppressTopSPacingMac5.setBoolean(field_33_docinfo4, value); } /** @@ -2917,7 +2919,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFTruncDxaExpand( boolean value ) { - field_33_docinfo4 = (int)fTruncDxaExpand.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fTruncDxaExpand.setBoolean(field_33_docinfo4, value); } /** @@ -2937,7 +2939,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFPrintBodyBeforeHdr( boolean value ) { - field_33_docinfo4 = (int)fPrintBodyBeforeHdr.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fPrintBodyBeforeHdr.setBoolean(field_33_docinfo4, value); } /** @@ -2957,7 +2959,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFNoLeading( boolean value ) { - field_33_docinfo4 = (int)fNoLeading.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fNoLeading.setBoolean(field_33_docinfo4, value); } /** @@ -2977,7 +2979,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFMWSmallCaps( boolean value ) { - field_33_docinfo4 = (int)fMWSmallCaps.setBoolean(field_33_docinfo4, value); + field_33_docinfo4 = fMWSmallCaps.setBoolean(field_33_docinfo4, value); } /** @@ -3257,7 +3259,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFVirusPrompted( boolean value ) { - field_43_virusinfo = (int)fVirusPrompted.setBoolean(field_43_virusinfo, value); + field_43_virusinfo = fVirusPrompted.setBoolean(field_43_virusinfo, value); } /** @@ -3277,7 +3279,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setFVirusLoadSafe( boolean value ) { - field_43_virusinfo = (int)fVirusLoadSafe.setBoolean(field_43_virusinfo, value); + field_43_virusinfo = fVirusLoadSafe.setBoolean(field_43_virusinfo, value); } /** @@ -3297,7 +3299,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public void setKeyVirusSession30( int value ) { - field_43_virusinfo = (int)KeyVirusSession30.setValue(field_43_virusinfo, value); + field_43_virusinfo = KeyVirusSession30.setValue(field_43_virusinfo, value); } /** @@ -3307,7 +3309,7 @@ public abstract class DOPAbstractType implements HDFType { @Internal public int getKeyVirusSession30() { - return ( int )KeyVirusSession30.getValue(field_43_virusinfo); + return KeyVirusSession30.getValue(field_43_virusinfo); } } // END OF CLASS diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java index 70c16c722..020c235ad 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java @@ -144,7 +144,7 @@ public abstract class LSTFAbstractType builder.append(" .tplc = "); builder.append(" (").append(getTplc()).append(" )\n"); builder.append(" .rgistdPara = "); - builder.append(" (").append(getRgistdPara()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getRgistdPara())).append(" )\n"); builder.append(" .flags = "); builder.append(" (").append(getFlags()).append(" )\n"); builder.append(" .fSimpleList = ").append(isFSimpleList()).append('\n'); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java index a83b62e8d..785854313 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java @@ -191,7 +191,7 @@ public abstract class LVLFAbstractType builder.append(" .unused1 = ").append(isUnused1()).append('\n'); builder.append(" .fTentative = ").append(isFTentative()).append('\n'); builder.append(" .rgbxchNums = "); - builder.append(" (").append(getRgbxchNums()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getRgbxchNums())).append(" )\n"); builder.append(" .ixchFollow = "); builder.append(" (").append(getIxchFollow()).append(" )\n"); builder.append(" .dxaIndentSav = "); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java index f9918fc4e..1363a837a 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java @@ -18,6 +18,8 @@ package org.apache.poi.hwpf.model.types; +import java.util.Arrays; + import org.apache.poi.hwpf.model.TabDescriptor; import org.apache.poi.hwpf.usermodel.BorderCode; import org.apache.poi.hwpf.usermodel.DateAndTime; @@ -305,9 +307,9 @@ public abstract class PAPAbstractType builder.append(" .shd = "); builder.append(" (").append(getShd()).append(" )\n"); builder.append(" .anld = "); - builder.append(" (").append(getAnld()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getAnld())).append(" )\n"); builder.append(" .phe = "); - builder.append(" (").append(getPhe()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getPhe())).append(" )\n"); builder.append(" .fPropRMark = "); builder.append(" (").append(getFPropRMark()).append(" )\n"); builder.append(" .ibstPropRMark = "); @@ -317,13 +319,13 @@ public abstract class PAPAbstractType builder.append(" .itbdMac = "); builder.append(" (").append(getItbdMac()).append(" )\n"); builder.append(" .rgdxaTab = "); - builder.append(" (").append(getRgdxaTab()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getRgdxaTab())).append(" )\n"); builder.append(" .rgtbd = "); - builder.append(" (").append(getRgtbd()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getRgtbd())).append(" )\n"); builder.append(" .numrm = "); - builder.append(" (").append(getNumrm()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getNumrm())).append(" )\n"); builder.append(" .ptap = "); - builder.append(" (").append(getPtap()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getPtap())).append(" )\n"); builder.append(" .fNoAllowOverlap = "); builder.append(" (").append(getFNoAllowOverlap()).append(" )\n"); builder.append(" .ipgp = "); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java index 7a29a7100..b41b2ba83 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java @@ -19,6 +19,8 @@ package org.apache.poi.hwpf.model.types; +import java.util.Arrays; + import org.apache.poi.util.*; /** @@ -201,13 +203,13 @@ public abstract class PICFAbstractType builder.append(" .bpp = "); builder.append(" (").append(getBpp()).append(" )\n"); builder.append(" .brcTop80 = "); - builder.append(" (").append(getBrcTop80()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getBrcTop80())).append(" )\n"); builder.append(" .brcLeft80 = "); - builder.append(" (").append(getBrcLeft80()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getBrcLeft80())).append(" )\n"); builder.append(" .brcBottom80 = "); - builder.append(" (").append(getBrcBottom80()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getBrcBottom80())).append(" )\n"); builder.append(" .brcRight80 = "); - builder.append(" (").append(getBrcRight80()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getBrcRight80())).append(" )\n"); builder.append(" .dxaReserved3 = "); builder.append(" (").append(getDxaReserved3()).append(" )\n"); builder.append(" .dyaReserved3 = "); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java index c74408faa..c2f0f9ce7 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java @@ -18,6 +18,8 @@ package org.apache.poi.hwpf.model.types; +import java.util.Arrays; + import org.apache.poi.hwpf.usermodel.BorderCode; import org.apache.poi.hwpf.usermodel.DateAndTime; import org.apache.poi.util.Internal; @@ -249,7 +251,7 @@ public abstract class SEPAbstractType builder.append(" .dxaColumns = "); builder.append(" (").append(getDxaColumns()).append(" )\n"); builder.append(" .rgdxaColumn = "); - builder.append(" (").append(getRgdxaColumn()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getRgdxaColumn())).append(" )\n"); builder.append(" .dxaColumnWidth = "); builder.append(" (").append(getDxaColumnWidth()).append(" )\n"); builder.append(" .dmOrientFirst = "); @@ -259,7 +261,7 @@ public abstract class SEPAbstractType builder.append(" .unused6 = "); builder.append(" (").append(getUnused6()).append(" )\n"); builder.append(" .olstAnm = "); - builder.append(" (").append(getOlstAnm()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getOlstAnm())).append(" )\n"); builder.append("[/SEP]\n"); return builder.toString(); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java index f652399f2..cd290ed63 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java @@ -18,8 +18,14 @@ package org.apache.poi.hwpf.model.types; -import org.apache.poi.hwpf.usermodel.*; -import org.apache.poi.util.*; +import java.util.Arrays; + +import org.apache.poi.hwpf.usermodel.BorderCode; +import org.apache.poi.hwpf.usermodel.ShadingDescriptor; +import org.apache.poi.hwpf.usermodel.TableAutoformatLookSpecifier; +import org.apache.poi.hwpf.usermodel.TableCellDescriptor; +import org.apache.poi.util.BitField; +import org.apache.poi.util.Internal; /** * Table Properties. Properties descriptions quoted from official 97-2007 binary file @@ -258,9 +264,9 @@ public abstract class TAPAbstractType builder.append(" .fAdjusted = ").append(isFAdjusted()).append('\n'); builder.append(" .viewFlags_unused2 = ").append(getViewFlags_unused2()).append('\n'); builder.append(" .rgdxaCenter = "); - builder.append(" (").append(getRgdxaCenter()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getRgdxaCenter())).append(" )\n"); builder.append(" .rgdxaCenterPrint = "); - builder.append(" (").append(getRgdxaCenterPrint()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getRgdxaCenterPrint())).append(" )\n"); builder.append(" .shdTable = "); builder.append(" (").append(getShdTable()).append(" )\n"); builder.append(" .brcBottom = "); @@ -340,7 +346,7 @@ public abstract class TAPAbstractType builder.append(" .ftsCellSpacingOuterRight = "); builder.append(" (").append(getFtsCellSpacingOuterRight()).append(" )\n"); builder.append(" .rgtc = "); - builder.append(" (").append(getRgtc()).append(" )\n"); + builder.append(" (").append(Arrays.toString(getRgtc())).append(" )\n"); builder.append(" .rgshd = "); builder.append(" (").append(getRgshd()).append(" )\n"); builder.append(" .fPropRMark = "); @@ -1825,7 +1831,7 @@ public abstract class TAPAbstractType @Internal public void setFAutofit( boolean value ) { - field_13_widthAndFitsFlags = (int)fAutofit.setBoolean(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = fAutofit.setBoolean(field_13_widthAndFitsFlags, value); } /** @@ -1845,7 +1851,7 @@ public abstract class TAPAbstractType @Internal public void setFKeepFollow( boolean value ) { - field_13_widthAndFitsFlags = (int)fKeepFollow.setBoolean(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = fKeepFollow.setBoolean(field_13_widthAndFitsFlags, value); } /** @@ -1865,7 +1871,7 @@ public abstract class TAPAbstractType @Internal public void setFtsWidth( byte value ) { - field_13_widthAndFitsFlags = (int)ftsWidth.setValue(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = ftsWidth.setValue(field_13_widthAndFitsFlags, value); } /** @@ -1885,7 +1891,7 @@ public abstract class TAPAbstractType @Internal public void setFtsWidthIndent( byte value ) { - field_13_widthAndFitsFlags = (int)ftsWidthIndent.setValue(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = ftsWidthIndent.setValue(field_13_widthAndFitsFlags, value); } /** @@ -1905,7 +1911,7 @@ public abstract class TAPAbstractType @Internal public void setFtsWidthBefore( byte value ) { - field_13_widthAndFitsFlags = (int)ftsWidthBefore.setValue(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = ftsWidthBefore.setValue(field_13_widthAndFitsFlags, value); } /** @@ -1925,7 +1931,7 @@ public abstract class TAPAbstractType @Internal public void setFtsWidthAfter( byte value ) { - field_13_widthAndFitsFlags = (int)ftsWidthAfter.setValue(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = ftsWidthAfter.setValue(field_13_widthAndFitsFlags, value); } /** @@ -1945,7 +1951,7 @@ public abstract class TAPAbstractType @Internal public void setFNeverBeenAutofit( boolean value ) { - field_13_widthAndFitsFlags = (int)fNeverBeenAutofit.setBoolean(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = fNeverBeenAutofit.setBoolean(field_13_widthAndFitsFlags, value); } /** @@ -1965,7 +1971,7 @@ public abstract class TAPAbstractType @Internal public void setFInvalAutofit( boolean value ) { - field_13_widthAndFitsFlags = (int)fInvalAutofit.setBoolean(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = fInvalAutofit.setBoolean(field_13_widthAndFitsFlags, value); } /** @@ -1985,7 +1991,7 @@ public abstract class TAPAbstractType @Internal public void setWidthAndFitsFlags_empty1( byte value ) { - field_13_widthAndFitsFlags = (int)widthAndFitsFlags_empty1.setValue(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = widthAndFitsFlags_empty1.setValue(field_13_widthAndFitsFlags, value); } /** @@ -2005,7 +2011,7 @@ public abstract class TAPAbstractType @Internal public void setFVert( boolean value ) { - field_13_widthAndFitsFlags = (int)fVert.setBoolean(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = fVert.setBoolean(field_13_widthAndFitsFlags, value); } /** @@ -2025,7 +2031,7 @@ public abstract class TAPAbstractType @Internal public void setPcVert( byte value ) { - field_13_widthAndFitsFlags = (int)pcVert.setValue(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = pcVert.setValue(field_13_widthAndFitsFlags, value); } /** @@ -2045,7 +2051,7 @@ public abstract class TAPAbstractType @Internal public void setPcHorz( byte value ) { - field_13_widthAndFitsFlags = (int)pcHorz.setValue(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = pcHorz.setValue(field_13_widthAndFitsFlags, value); } /** @@ -2065,7 +2071,7 @@ public abstract class TAPAbstractType @Internal public void setWidthAndFitsFlags_empty2( short value ) { - field_13_widthAndFitsFlags = (int)widthAndFitsFlags_empty2.setValue(field_13_widthAndFitsFlags, value); + field_13_widthAndFitsFlags = widthAndFitsFlags_empty2.setValue(field_13_widthAndFitsFlags, value); } /** @@ -2085,7 +2091,7 @@ public abstract class TAPAbstractType @Internal public void setFFirstRow( boolean value ) { - field_25_internalFlags = (int)fFirstRow.setBoolean(field_25_internalFlags, value); + field_25_internalFlags = fFirstRow.setBoolean(field_25_internalFlags, value); } /** @@ -2105,7 +2111,7 @@ public abstract class TAPAbstractType @Internal public void setFLastRow( boolean value ) { - field_25_internalFlags = (int)fLastRow.setBoolean(field_25_internalFlags, value); + field_25_internalFlags = fLastRow.setBoolean(field_25_internalFlags, value); } /** @@ -2125,7 +2131,7 @@ public abstract class TAPAbstractType @Internal public void setFOutline( boolean value ) { - field_25_internalFlags = (int)fOutline.setBoolean(field_25_internalFlags, value); + field_25_internalFlags = fOutline.setBoolean(field_25_internalFlags, value); } /** @@ -2145,7 +2151,7 @@ public abstract class TAPAbstractType @Internal public void setFOrigWordTableRules( boolean value ) { - field_25_internalFlags = (int)fOrigWordTableRules.setBoolean(field_25_internalFlags, value); + field_25_internalFlags = fOrigWordTableRules.setBoolean(field_25_internalFlags, value); } /** @@ -2165,7 +2171,7 @@ public abstract class TAPAbstractType @Internal public void setFCellSpacing( boolean value ) { - field_25_internalFlags = (int)fCellSpacing.setBoolean(field_25_internalFlags, value); + field_25_internalFlags = fCellSpacing.setBoolean(field_25_internalFlags, value); } /** @@ -2185,7 +2191,7 @@ public abstract class TAPAbstractType @Internal public void setGrpfTap_unused( short value ) { - field_25_internalFlags = (int)grpfTap_unused.setValue(field_25_internalFlags, value); + field_25_internalFlags = grpfTap_unused.setValue(field_25_internalFlags, value); } /** @@ -2205,7 +2211,7 @@ public abstract class TAPAbstractType @Internal public void setFWrapToWwd( boolean value ) { - field_32_viewFlags = (int)fWrapToWwd.setBoolean(field_32_viewFlags, value); + field_32_viewFlags = fWrapToWwd.setBoolean(field_32_viewFlags, value); } /** @@ -2225,7 +2231,7 @@ public abstract class TAPAbstractType @Internal public void setFNotPageView( boolean value ) { - field_32_viewFlags = (int)fNotPageView.setBoolean(field_32_viewFlags, value); + field_32_viewFlags = fNotPageView.setBoolean(field_32_viewFlags, value); } /** @@ -2245,7 +2251,7 @@ public abstract class TAPAbstractType @Internal public void setViewFlags_unused1( boolean value ) { - field_32_viewFlags = (int)viewFlags_unused1.setBoolean(field_32_viewFlags, value); + field_32_viewFlags = viewFlags_unused1.setBoolean(field_32_viewFlags, value); } /** @@ -2265,7 +2271,7 @@ public abstract class TAPAbstractType @Internal public void setFWebView( boolean value ) { - field_32_viewFlags = (int)fWebView.setBoolean(field_32_viewFlags, value); + field_32_viewFlags = fWebView.setBoolean(field_32_viewFlags, value); } /** @@ -2285,7 +2291,7 @@ public abstract class TAPAbstractType @Internal public void setFAdjusted( boolean value ) { - field_32_viewFlags = (int)fAdjusted.setBoolean(field_32_viewFlags, value); + field_32_viewFlags = fAdjusted.setBoolean(field_32_viewFlags, value); } /** @@ -2305,7 +2311,7 @@ public abstract class TAPAbstractType @Internal public void setViewFlags_unused2( short value ) { - field_32_viewFlags = (int)viewFlags_unused2.setValue(field_32_viewFlags, value); + field_32_viewFlags = viewFlags_unused2.setValue(field_32_viewFlags, value); } /**