made DrawingSelectionRecord into a plain BIFF record (not an escher holder aggregate...

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

diff --git a/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java b/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
index 687c11314b76bec273c155c052a03697681da3b9..85997e91390e84b74f1648a1d27fadd43479ba99 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
@@ -17,25 +17,129 @@
 
 package org.apache.poi.hssf.record;
 
-public final class DrawingSelectionRecord extends AbstractEscherHolderRecord {
-    public static final short sid = 0xED;
-
-    public DrawingSelectionRecord()
-    {
-    }
-
-    public DrawingSelectionRecord( RecordInputStream in )
-    {
-        super( in );
-    }
-
-    protected String getRecordName()
-    {
-        return "MSODRAWINGSELECTION";
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
+import org.apache.poi.util.HexDump;
+import org.apache.poi.util.LittleEndianByteArrayOutputStream;
+import org.apache.poi.util.LittleEndianInput;
+import org.apache.poi.util.LittleEndianOutput;
+
+/**
+ * MsoDrawingSelection (0x00ED)<p/>
+ * Reference:
+ * [MS-OGRAPH].pdf sec 2.4.69
+ * 
+ * @author Josh Micich
+ */
+public final class DrawingSelectionRecord extends Record {
+       public static final short sid = 0x00ED;
+
+       /**
+        * From [MS-ODRAW].pdf sec 2.2.1<br/>
+        * TODO - make EscherRecordHeader {@link LittleEndianInput} aware and refactor with this
+        */
+       private static final class OfficeArtRecordHeader {
+               public static final int ENCODED_SIZE = 8;
+               /**
+                * lower 4 bits is 'version' usually 0x01 or 0x0F (for containers)<br/>
+                * upper 12 bits is 'instance'
+                */
+               private final int _verAndInstance;
+               /** value should be between 0xF000 and 0xFFFF */
+               private final int _type;
+               private final int _length;
+
+               public OfficeArtRecordHeader(LittleEndianInput in) {
+                       _verAndInstance = in.readUShort();
+                       _type = in.readUShort();
+                       _length = in.readInt();
+               }
+
+               public void serialize(LittleEndianOutput out) {
+                       out.writeShort(_verAndInstance);
+                       out.writeShort(_type);
+                       out.writeInt(_length);
+               }
+
+               public String debugFormatAsString() {
+                       StringBuffer sb = new StringBuffer(32);
+                       sb.append("ver+inst=").append(HexDump.shortToHex(_verAndInstance));
+                       sb.append(" type=").append(HexDump.shortToHex(_type));
+                       sb.append(" len=").append(HexDump.intToHex(_length));
+                       return sb.toString();
+               }
+       }
+
+       // [MS-OGRAPH].pdf says that the data of this record is an OfficeArtFDGSL structure
+       // as described in[MS-ODRAW].pdf sec 2.2.33
+       private OfficeArtRecordHeader _header;
+       private int _cpsp;
+       /** a MSODGSLK enum value for the current selection mode */
+       private int _dgslk;
+       private int _spidFocus;
+       /** selected shape IDs (e.g. from EscherSpRecord.ShapeId) */
+       private int[] _shapeIds;
+
+       public DrawingSelectionRecord(RecordInputStream in) {
+               _header = new OfficeArtRecordHeader(in);
+               _cpsp = in.readInt();
+               _dgslk = in.readInt();
+               _spidFocus = in.readInt();
+               int nShapes = in.available() / 4;
+               int[] shapeIds = new int[nShapes];
+               for (int i = 0; i < nShapes; i++) {
+                       shapeIds[i] = in.readInt();
+               }
+               _shapeIds = shapeIds;
+       }
+
+       public short getSid() {
+               return sid;
+       }
+
+       protected int getDataSize() {
+               return OfficeArtRecordHeader.ENCODED_SIZE 
+                       + 12 // 3 int fields
+                       + _shapeIds.length * 4;
+       }
+
+       public int serialize(int offset, byte[] data) {
+               int dataSize = getDataSize();
+               int recSize = 4 + dataSize;
+               LittleEndianOutput out = new LittleEndianByteArrayOutputStream(data, offset, recSize);
+               out.writeShort(sid);
+               out.writeShort(dataSize);
+               _header.serialize(out);
+               out.writeInt(_cpsp);
+               out.writeInt(_dgslk);
+               out.writeInt(_spidFocus);
+               for (int i = 0; i < _shapeIds.length; i++) {
+                       out.writeInt(_shapeIds[i]);
+               }
+               return recSize;
+       }
+
+       public Object clone() {
+               // currently immutable
+               return this;
+       }
+
+       public String toString() {
+               StringBuffer sb = new StringBuffer();
+
+               sb.append("[MSODRAWINGSELECTION]\n");
+               sb.append("    .rh       =(").append(_header.debugFormatAsString()).append(")\n");
+               sb.append("    .cpsp     =").append(HexDump.intToHex(_cpsp)).append('\n');
+               sb.append("    .dgslk    =").append(HexDump.intToHex(_dgslk)).append('\n');
+               sb.append("    .spidFocus=").append(HexDump.intToHex(_spidFocus)).append('\n');
+               sb.append("    .shapeIds =(");
+               for (int i = 0; i < _shapeIds.length; i++) {
+                       if (i > 0) {
+                               sb.append(", ");
+                       }
+                       sb.append(HexDump.intToHex(_shapeIds[i]));
+               }
+               sb.append(")\n");
+
+               sb.append("[/MSODRAWINGSELECTION]\n");
+               return sb.toString();
+       }
 }