Clean-up toString() and inner class

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

src/java/org/apache/poi/hssf/record/MulRKRecord.java

@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -16,56 +15,38 @@
    limitations under the License.
 ==================================================================== */
 
-
-/*
- * MulRKRecord.java
- *
- * Created on November 9, 2001, 4:53 PM
- */
 package org.apache.poi.hssf.record;
 
-import java.util.ArrayList;
-
 import org.apache.poi.hssf.util.RKUtil;
+import org.apache.poi.util.HexDump;
 
 /**
+ * MULRK (0x00BD) <p/>
+ * 
  * Used to store multiple RK numbers on a row.  1 MulRk = Multiple Cell values.
  * HSSF just converts this into multiple NUMBER records.  READ-ONLY SUPPORT!<P>
  * REFERENCE:  PG 330 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
  * @author Andrew C. Oliver (acoliver at apache dot org)
  * @version 2.0-pre
  */
+public final class MulRKRecord extends Record {
+	public final static short sid = 0x00BD;
 
-public class MulRKRecord
-    extends Record
-{
-    public final static short sid = 0xbd;
-    //private short             field_1_row;
 	private int	 field_1_row;
 	private short   field_2_first_col;
-    private ArrayList         field_3_rks;
+	private RkRec[] field_3_rks;
 	private short   field_4_last_col;
 
-    /** Creates new MulRKRecord */
-
-    public MulRKRecord()
-    {
-    }
-
 	/**
 	 * Constructs a MulRK record and sets its fields appropriately.
 	 *
 	 * @param in the RecordInputstream to read the record from
 	 */
-
+	public MulRKRecord(RecordInputStream in) {
-    public MulRKRecord(RecordInputStream in)
-    {
 		super(in);
 	}
 
-    //public short getRow()
+	public int getRow() {
-    public int getRow()
-    {
 		return field_1_row;
 	}
 
@@ -73,9 +54,7 @@ public class MulRKRecord
 	 * starting column (first cell this holds in the row)
 	 * @return first column number
 	 */
-
+	public short getFirstColumn() {
-    public short getFirstColumn()
-    {
 		return field_2_first_col;
 	}
 
@@ -83,9 +62,7 @@ public class MulRKRecord
 	 * ending column (last cell this holds in the row)
 	 * @return first column number
 	 */
-
+	public short getLastColumn() {
-    public short getLastColumn()
-    {
 		return field_4_last_col;
 	}
 
@@ -93,9 +70,7 @@ public class MulRKRecord
 	 * get the number of columns this contains (last-first +1)
 	 * @return number of columns (last - first +1)
 	 */
-
+	public int getNumColumns() {
-    public int getNumColumns()
-    {
 		return field_4_last_col - field_2_first_col + 1;
 	}
 
@@ -103,62 +78,40 @@ public class MulRKRecord
 	 * returns the xf index for column (coffset = column - field_2_first_col)
 	 * @return the XF index for the column
 	 */
-
+	public short getXFAt(int coffset) {
-    public short getXFAt(int coffset)
+		return field_3_rks[coffset].xf;
-    {
-        return (( RkRec ) field_3_rks.get(coffset)).xf;
 	}
 
 	/**
 	 * returns the rk number for column (coffset = column - field_2_first_col)
 	 * @return the value (decoded into a double)
 	 */
-
+	public double getRKNumberAt(int coffset) {
-    public double getRKNumberAt(int coffset)
+		return RKUtil.decodeNumber(field_3_rks[coffset].rk);
-    {
-        return RKUtil.decodeNumber((( RkRec ) field_3_rks.get(coffset)).rk);
 	}
 
 	/**
 	 * @param in the RecordInputstream to read the record from
 	 */
-    protected void fillFields(RecordInputStream in)
+	protected void fillFields(RecordInputStream in) {
-    {
-        //field_1_row       = LittleEndian.getShort(data, 0 + offset);
 		field_1_row = in.readUShort();
 		field_2_first_col = in.readShort();
-        field_3_rks       = parseRKs(in);
+		field_3_rks = RkRec.parseRKs(in);
 		field_4_last_col = in.readShort();
 	}
 
-    private ArrayList parseRKs(RecordInputStream in)
-    {
-        ArrayList retval = new ArrayList();
-        while ((in.remaining()-2) > 0) {
-            RkRec rec = new RkRec();
 
-            rec.xf = in.readShort();
+	public String toString() {
-            rec.rk = in.readInt();
-            retval.add(rec);
-        }
-        return retval;
-    }
-
-    public String toString()
-    {
 		StringBuffer buffer = new StringBuffer();
 
 		buffer.append("[MULRK]\n");
-        buffer.append("firstcol  = ")
+		buffer.append("	.row	 = ").append(HexDump.shortToHex(getRow())).append("\n");
-            .append(Integer.toHexString(getFirstColumn())).append("\n");
+		buffer.append("	.firstcol= ").append(HexDump.shortToHex(getFirstColumn())).append("\n");
-        buffer.append(" lastcol  = ")
+		buffer.append("	.lastcol = ").append(HexDump.shortToHex(getLastColumn())).append("\n");
-            .append(Integer.toHexString(getLastColumn())).append("\n");
+
-        for (int k = 0; k < getNumColumns(); k++)
+		for (int k = 0; k < getNumColumns(); k++) {
-        {
+			buffer.append("	xf[").append(k).append("] = ").append(HexDump.shortToHex(getXFAt(k))).append("\n");
-            buffer.append("xf").append(k).append("        = ")
+			buffer.append("	rk[").append(k).append("] = ").append(getRKNumberAt(k)).append("\n");
-                .append(Integer.toHexString(getXFAt(k))).append("\n");
-            buffer.append("rk").append(k).append("        = ")
-                .append(getRKNumberAt(k)).append("\n");
 		}
 		buffer.append("[/MULRK]\n");
 		return buffer.toString();
@@ -189,10 +142,24 @@ public class MulRKRecord
 		throw new RecordFormatException(
 			"Sorry, you can't serialize a MulRK in this release");
 	}
+
+	private static final class RkRec {
+		public static final int ENCODED_SIZE = 6;
+		public final short xf;
+		public final int   rk;
+
+		private RkRec(RecordInputStream in) {
+			xf = in.readShort();
+			rk = in.readInt();
 		}
 
-class RkRec
+		public static RkRec[] parseRKs(RecordInputStream in) {
-{
+			int nItems = (in.remaining()-2) / ENCODED_SIZE;
-    public short xf;
+			RkRec[] retval = new RkRec[nItems];
-    public int   rk;
+			for (int i=0; i<nItems; i++) {
+				retval[i] = new RkRec(in);
+			}
+			return retval;
+		}
+	}
 }