svn commit: r1133554 [2/5] - in /tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm: ./ accessor/ assertion/ core/ exception/ lzx/

[ol...@apache.org]

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItspHeader.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItspHeader.java?rev=1133554&r1=1133553&r2=1133554&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItspHeader.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItspHeader.java Wed Jun  8 21:00:27 2011
@@ -42,507 +42,507 @@ import org.apache.tika.parser.chm.except
  * 
  */
 public class ChmItspHeader implements ChmAccessor<ChmItspHeader> {
-	// TODO: refactor all unmarshals
-	private static final long serialVersionUID = 1962394421998181341L;
-	private byte[] signature = new String(ChmConstants.ITSP).getBytes(); /*
-																		 * 0
-																		 * (ITSP
-																		 * )
-																		 */
-	private int version; /* 4 */
-	private int header_len; /* 8 */
-	private int unknown_000c; /* c */
-	private long block_len; /* 10 */
-	private int blockidx_intvl; /* 14 */
-	private int index_depth; /* 18 */
-	private int index_root; /* 1c */
-	private int index_head; /* 20 */
-	private int unknown_0024; /* 24 */
-	private long num_blocks; /* 28 */
-	private int unknown_002c; /* 2c */
-	private long lang_id; /* 30 */
-	private byte[] system_uuid = new byte[ChmConstants.BYTE_ARRAY_LENGHT]; /* 34 */
-	private byte[] unknown_0044 = new byte[ChmConstants.BYTE_ARRAY_LENGHT]; /* 44 */
-
-	/* local usage */
-	private int dataRemained;
-	private int currentPlace = 0;
-
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("[ signature:=" + new String(getSignature())
-				+ System.getProperty("line.separator"));
-		sb.append("version:=\t" + getVersion()
-				+ System.getProperty("line.separator"));
-		sb.append("header_len:=\t" + getHeader_len()
-				+ System.getProperty("line.separator"));
-		sb.append("unknown_00c:=\t" + getUnknown_000c()
-				+ System.getProperty("line.separator"));
-		sb.append("block_len:=\t" + getBlock_len() + " [directory chunk size]"
-				+ System.getProperty("line.separator"));
-		sb.append("blockidx_intvl:=" + getBlockidx_intvl()
-				+ ", density of quickref section, usually 2"
-				+ System.getProperty("line.separator"));
-		sb.append("index_depth:=\t"
-				+ getIndex_depth()
-				+ ", depth of the index tree - 1 there is no index, 2 if there is one level of PMGI chunk"
-				+ System.getProperty("line.separator"));
-		sb.append("index_root:=\t" + getIndex_root()
-				+ ", chunk number of root index chunk, -1 if there is none"
-				+ System.getProperty("line.separator"));
-		sb.append("index_head:=\t" + getIndex_head()
-				+ ", chunk number of first PMGL (listing) chunk"
-				+ System.getProperty("line.separator"));
-		sb.append("unknown_0024:=\t" + getUnknown_0024()
-				+ ", chunk number of last PMGL (listing) chunk"
-				+ System.getProperty("line.separator"));
-		sb.append("num_blocks:=\t" + getNum_blocks() + ", -1 (unknown)"
-				+ System.getProperty("line.separator"));
-		sb.append("unknown_002c:=\t" + getUnknown_002c()
-				+ ", number of directory chunks (total)"
-				+ System.getProperty("line.separator"));
-		sb.append("lang_id:=\t" + getLang_id() + " - "
-				+ ChmCommons.getLanguage(getLang_id())
-				+ System.getProperty("line.separator"));
-		sb.append("system_uuid:=" + getSystem_uuid()
-				+ System.getProperty("line.separator"));
-		sb.append("unknown_0044:=" + getUnknown_0044() + " ]");
-		return sb.toString();
-	}
-
-	/**
-	 * Copies 4 bits from data[]
-	 * 
-	 * @param data
-	 * @param chmItspHeader
-	 * @param count
-	 */
-	private void unmarshalCharArray(byte[] data, ChmItspHeader chmItspHeader,
-			int count) {
-		ChmAssert.assertByteArrayNotNull(data);
-		ChmAssert.assertChmAccessorNotNull(chmItspHeader);
-		this.setDataRemained(data.length);
-		System.arraycopy(data, 0, chmItspHeader.signature, 0, count);
-		this.setCurrentPlace(this.getCurrentPlace() + count);
-		this.setDataRemained(this.getDataRemained() - count);
-	}
-
-	private int unmarshalInt32(byte[] data, int dataLenght, int dest) {
-		ChmAssert.assertByteArrayNotNull(data);
-		if (4 > this.getDataRemained())
-			throw new ChmParsingException("4 > dataLenght");
-		dest = data[this.getCurrentPlace()]
-				| data[this.getCurrentPlace() + 1] << 8
-				| data[this.getCurrentPlace() + 2] << 16
-				| data[this.getCurrentPlace() + 3] << 24;
-
-		this.setCurrentPlace(this.getCurrentPlace() + 4);
-		this.setDataRemained(this.getDataRemained() - 4);
-		return dest;
-	}
-
-	private long unmarshalUInt32(byte[] data, int dataLenght, long dest) {
-		ChmAssert.assertByteArrayNotNull(data);
-		if (4 > dataLenght)
-			throw new ChmParsingException("4 > dataLenght");
-		dest = data[this.getCurrentPlace()]
-				| data[this.getCurrentPlace() + 1] << 8
-				| data[this.getCurrentPlace() + 2] << 16
-				| data[this.getCurrentPlace() + 3] << 24;
-
-		setDataRemained(this.getDataRemained() - 4);
-		this.setCurrentPlace(this.getCurrentPlace() + 4);
-		return dest;
-	}
-
-	private byte[] unmarshalUuid(byte[] data, int dataLenght, byte[] dest,
-			int count) {
-		System.arraycopy(data, this.getCurrentPlace(), dest, 0, count);
-		this.setCurrentPlace(this.getCurrentPlace() + count);
-		this.setDataRemained(this.getDataRemained() - count);
-		return dest;
-	}
-
-	/**
-	 * Returns how many bytes remained
-	 * 
-	 * @return int
-	 */
-	private int getDataRemained() {
-		return dataRemained;
-	}
-
-	/**
-	 * Sets how many bytes remained
-	 * 
-	 * @param dataRemained
-	 */
-	private void setDataRemained(int dataRemained) {
-		this.dataRemained = dataRemained;
-	}
-
-	/**
-	 * Returns a place holder
-	 * 
-	 * @return current place
-	 */
-	private int getCurrentPlace() {
-		return currentPlace;
-	}
-
-	/**
-	 * Sets current place
-	 * 
-	 * @param currentPlace
-	 */
-	private void setCurrentPlace(int currentPlace) {
-		this.currentPlace = currentPlace;
-	}
-
-	/**
-	 * Returns a signature of the header
-	 * 
-	 * @return itsp signature
-	 */
-	public byte[] getSignature() {
-		return signature;
-	}
-
-	/**
-	 * Sets itsp signature
-	 * 
-	 * @param signature
-	 */
-	protected void setSignature(byte[] signature) {
-		this.signature = signature;
-	}
-
-	/**
-	 * Returns version of itsp header
-	 * 
-	 * @return version
-	 */
-	public int getVersion() {
-		return version;
-	}
-
-	/**
-	 * Sets a version of itsp header
-	 * 
-	 * @param version
-	 */
-	protected void setVersion(int version) {
-		this.version = version;
-	}
-
-	/**
-	 * Returns header length
-	 * 
-	 * @return header length
-	 */
-	public int getHeader_len() {
-		return header_len;
-	}
-
-	/**
-	 * Sets itsp header length
-	 * 
-	 * @param header_len
-	 */
-	protected void setHeader_len(int header_len) {
-		this.header_len = header_len;
-	}
-
-	/**
-	 * Returns 000c unknown bytes
-	 */
-	public int getUnknown_000c() {
-		return unknown_000c;
-	}
-
-	/**
-	 * Sets 000c unknown bytes Unknown means here that those guys who cracked
-	 * the chm format do not know what's it purposes for
-	 * 
-	 * @param unknown_000c
-	 */
-	protected void setUnknown_000c(int unknown_000c) {
-		this.unknown_000c = unknown_000c;
-	}
-
-	/**
-	 * Returns block's length
-	 * 
-	 * @return block_length
-	 */
-	public long getBlock_len() {
-		return block_len;
-	}
-
-	/**
-	 * Sets block length
-	 * 
-	 * @param block_len
-	 */
-	protected void setBlock_len(long block_len) {
-		this.block_len = block_len;
-	}
-
-	/**
-	 * Returns block index interval
-	 * 
-	 * @return blockidx_intvl
-	 */
-	public int getBlockidx_intvl() {
-		return blockidx_intvl;
-	}
-
-	/**
-	 * Sets block index interval
-	 * 
-	 * @param blockidx_intvl
-	 */
-	protected void setBlockidx_intvl(int blockidx_intvl) {
-		this.blockidx_intvl = blockidx_intvl;
-	}
-
-	/**
-	 * Returns an index depth
-	 * 
-	 * @return index_depth
-	 */
-	public int getIndex_depth() {
-		return index_depth;
-	}
-
-	/**
-	 * Sets an index depth
-	 * 
-	 * @param index_depth
-	 */
-	protected void setIndex_depth(int index_depth) {
-		this.index_depth = index_depth;
-	}
-
-	/**
-	 * Returns index root
-	 * 
-	 * @return index_root
-	 */
-	public int getIndex_root() {
-		return index_root;
-	}
-
-	/**
-	 * Sets an index root
-	 * 
-	 * @param index_root
-	 */
-	protected void setIndex_root(int index_root) {
-		this.index_root = index_root;
-	}
-
-	/**
-	 * Returns an index head
-	 * 
-	 * @return index_head
-	 */
-	public int getIndex_head() {
-		return index_head;
-	}
-
-	/**
-	 * Sets an index head
-	 * 
-	 * @param index_head
-	 */
-	protected void setIndex_head(int index_head) {
-		this.index_head = index_head;
-	}
-
-	/**
-	 * Returns 0024 unknown bytes
-	 * 
-	 * @return unknown_0024
-	 */
-	public int getUnknown_0024() {
-		return unknown_0024;
-	}
-
-	/**
-	 * Sets 0024 unknown bytes
-	 * 
-	 * @param unknown_0024
-	 */
-	protected void setUnknown_0024(int unknown_0024) {
-		this.unknown_0024 = unknown_0024;
-	}
-
-	/**
-	 * Returns number of blocks
-	 * 
-	 * @return num_blocks
-	 */
-	public long getNum_blocks() {
-		return num_blocks;
-	}
-
-	/**
-	 * Sets number of blocks containing in the chm file
-	 * 
-	 * @param num_blocks
-	 */
-	protected void setNum_blocks(long num_blocks) {
-		this.num_blocks = num_blocks;
-	}
-
-	/**
-	 * Returns 002c unknown bytes
-	 * 
-	 * @return unknown_002c
-	 */
-	public int getUnknown_002c() {
-		return unknown_002c;
-	}
-
-	/**
-	 * Sets 002c unknown bytes
-	 * 
-	 * @param unknown_002c
-	 */
-	protected void setUnknown_002c(int unknown_002c) {
-		this.unknown_002c = unknown_002c;
-	}
-
-	/**
-	 * Returns language id
-	 * 
-	 * @return lang_id
-	 */
-	public long getLang_id() {
-		return lang_id;
-	}
-
-	/**
-	 * Sets language id
-	 * 
-	 * @param lang_id
-	 */
-	protected void setLang_id(long lang_id) {
-		this.lang_id = lang_id;
-	}
-
-	/**
-	 * Returns system uuid
-	 * 
-	 * @return system_uuid
-	 */
-	public byte[] getSystem_uuid() {
-		return system_uuid;
-	}
-
-	/**
-	 * Sets system uuid
-	 * 
-	 * @param system_uuid
-	 */
-	protected void setSystem_uuid(byte[] system_uuid) {
-		this.system_uuid = system_uuid;
-	}
-
-	/**
-	 * Returns 0044 unknown bytes
-	 * 
-	 * @return unknown_0044
-	 */
-	public byte[] getUnknown_0044() {
-		return unknown_0044;
-	}
-
-	/**
-	 * Sets 0044 unknown bytes
-	 * 
-	 * @param unknown_0044
-	 */
-	protected void setUnknown_0044(byte[] unknown_0044) {
-		this.unknown_0044 = unknown_0044;
-	}
-
-	// @Override
-	public void parse(byte[] data, ChmItspHeader chmItspHeader) {
-		/* we only know how to deal with the 0x58 and 0x60 byte structures */
-		if (data.length != ChmConstants.CHM_ITSP_V1_LEN)
-			throw new ChmParsingException(
-					"we only know how to deal with the 0x58 and 0x60 byte structures");
-
-		/* unmarshal common fields */
-		chmItspHeader.unmarshalCharArray(data, chmItspHeader,
-				ChmConstants.CHM_SIGNATURE_LEN);
-		// ChmCommons.unmarshalCharArray(data, chmItspHeader,
-		// ChmConstants.CHM_SIGNATURE_LEN);
-		chmItspHeader.setVersion(chmItspHeader.unmarshalInt32(data,
-				chmItspHeader.getDataRemained(), chmItspHeader.getVersion()));
-		chmItspHeader
-				.setHeader_len(chmItspHeader.unmarshalInt32(data,
-						chmItspHeader.getDataRemained(),
-						chmItspHeader.getHeader_len()));
-		chmItspHeader.setUnknown_000c(chmItspHeader.unmarshalInt32(data,
-				chmItspHeader.getDataRemained(),
-				chmItspHeader.getUnknown_000c()));
-		chmItspHeader.setBlock_len(chmItspHeader.unmarshalUInt32(data,
-				chmItspHeader.getDataRemained(), chmItspHeader.getBlock_len()));
-		chmItspHeader.setBlockidx_intvl(chmItspHeader.unmarshalInt32(data,
-				chmItspHeader.getDataRemained(),
-				chmItspHeader.getBlockidx_intvl()));
-		chmItspHeader
-				.setIndex_depth(chmItspHeader.unmarshalInt32(data,
-						chmItspHeader.getDataRemained(),
-						chmItspHeader.getIndex_depth()));
-		chmItspHeader
-				.setIndex_root(chmItspHeader.unmarshalInt32(data,
-						chmItspHeader.getDataRemained(),
-						chmItspHeader.getIndex_root()));
-		chmItspHeader
-				.setIndex_head(chmItspHeader.unmarshalInt32(data,
-						chmItspHeader.getDataRemained(),
-						chmItspHeader.getIndex_head()));
-		chmItspHeader.setUnknown_0024(chmItspHeader.unmarshalInt32(data,
-				chmItspHeader.getDataRemained(),
-				chmItspHeader.getUnknown_0024()));
-		chmItspHeader
-				.setNum_blocks(chmItspHeader.unmarshalUInt32(data,
-						chmItspHeader.getDataRemained(),
-						chmItspHeader.getNum_blocks()));
-		chmItspHeader.setUnknown_002c((chmItspHeader.unmarshalInt32(data,
-				chmItspHeader.getDataRemained(),
-				chmItspHeader.getUnknown_002c())));
-		chmItspHeader.setLang_id(chmItspHeader.unmarshalUInt32(data,
-				chmItspHeader.getDataRemained(), chmItspHeader.getLang_id()));
-		chmItspHeader
-				.setSystem_uuid(chmItspHeader.unmarshalUuid(data,
-						chmItspHeader.getDataRemained(),
-						chmItspHeader.getSystem_uuid(),
-						ChmConstants.BYTE_ARRAY_LENGHT));
-		chmItspHeader
-				.setUnknown_0044(chmItspHeader.unmarshalUuid(data,
-						chmItspHeader.getDataRemained(),
-						chmItspHeader.getUnknown_0044(),
-						ChmConstants.BYTE_ARRAY_LENGHT));
-
-		/* Checks validity of the itsp header */
-		if (!new String(chmItspHeader.getSignature()).equals(ChmConstants.ITSP))
-			throw new ChmParsingException("seems not valid signature");
-
-		if (chmItspHeader.getVersion() != ChmConstants.CHM_VER_1)
-			throw new ChmParsingException("!=ChmConstants.CHM_VER_1");
-
-		if (chmItspHeader.getHeader_len() != ChmConstants.CHM_ITSP_V1_LEN)
-			throw new ChmParsingException("!= ChmConstants.CHM_ITSP_V1_LEN");
-	}
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-	}
+    // TODO: refactor all unmarshals
+    private static final long serialVersionUID = 1962394421998181341L;
+    private byte[] signature = new String(ChmConstants.ITSP).getBytes(); /*
+                                                                          * 0
+                                                                          * (ITSP
+                                                                          * )
+                                                                          */
+    private int version; /* 4 */
+    private int header_len; /* 8 */
+    private int unknown_000c; /* c */
+    private long block_len; /* 10 */
+    private int blockidx_intvl; /* 14 */
+    private int index_depth; /* 18 */
+    private int index_root; /* 1c */
+    private int index_head; /* 20 */
+    private int unknown_0024; /* 24 */
+    private long num_blocks; /* 28 */
+    private int unknown_002c; /* 2c */
+    private long lang_id; /* 30 */
+    private byte[] system_uuid = new byte[ChmConstants.BYTE_ARRAY_LENGHT]; /* 34 */
+    private byte[] unknown_0044 = new byte[ChmConstants.BYTE_ARRAY_LENGHT]; /* 44 */
+
+    /* local usage */
+    private int dataRemained;
+    private int currentPlace = 0;
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("[ signature:=" + new String(getSignature())
+                + System.getProperty("line.separator"));
+        sb.append("version:=\t" + getVersion()
+                + System.getProperty("line.separator"));
+        sb.append("header_len:=\t" + getHeader_len()
+                + System.getProperty("line.separator"));
+        sb.append("unknown_00c:=\t" + getUnknown_000c()
+                + System.getProperty("line.separator"));
+        sb.append("block_len:=\t" + getBlock_len() + " [directory chunk size]"
+                + System.getProperty("line.separator"));
+        sb.append("blockidx_intvl:=" + getBlockidx_intvl()
+                + ", density of quickref section, usually 2"
+                + System.getProperty("line.separator"));
+        sb.append("index_depth:=\t"
+                + getIndex_depth()
+                + ", depth of the index tree - 1 there is no index, 2 if there is one level of PMGI chunk"
+                + System.getProperty("line.separator"));
+        sb.append("index_root:=\t" + getIndex_root()
+                + ", chunk number of root index chunk, -1 if there is none"
+                + System.getProperty("line.separator"));
+        sb.append("index_head:=\t" + getIndex_head()
+                + ", chunk number of first PMGL (listing) chunk"
+                + System.getProperty("line.separator"));
+        sb.append("unknown_0024:=\t" + getUnknown_0024()
+                + ", chunk number of last PMGL (listing) chunk"
+                + System.getProperty("line.separator"));
+        sb.append("num_blocks:=\t" + getNum_blocks() + ", -1 (unknown)"
+                + System.getProperty("line.separator"));
+        sb.append("unknown_002c:=\t" + getUnknown_002c()
+                + ", number of directory chunks (total)"
+                + System.getProperty("line.separator"));
+        sb.append("lang_id:=\t" + getLang_id() + " - "
+                + ChmCommons.getLanguage(getLang_id())
+                + System.getProperty("line.separator"));
+        sb.append("system_uuid:=" + getSystem_uuid()
+                + System.getProperty("line.separator"));
+        sb.append("unknown_0044:=" + getUnknown_0044() + " ]");
+        return sb.toString();
+    }
+
+    /**
+     * Copies 4 bits from data[]
+     * 
+     * @param data
+     * @param chmItspHeader
+     * @param count
+     */
+    private void unmarshalCharArray(byte[] data, ChmItspHeader chmItspHeader,
+            int count) {
+        ChmAssert.assertByteArrayNotNull(data);
+        ChmAssert.assertChmAccessorNotNull(chmItspHeader);
+        this.setDataRemained(data.length);
+        System.arraycopy(data, 0, chmItspHeader.signature, 0, count);
+        this.setCurrentPlace(this.getCurrentPlace() + count);
+        this.setDataRemained(this.getDataRemained() - count);
+    }
+
+    private int unmarshalInt32(byte[] data, int dataLenght, int dest) {
+        ChmAssert.assertByteArrayNotNull(data);
+        if (4 > this.getDataRemained())
+            throw new ChmParsingException("4 > dataLenght");
+        dest = data[this.getCurrentPlace()]
+                | data[this.getCurrentPlace() + 1] << 8
+                | data[this.getCurrentPlace() + 2] << 16
+                | data[this.getCurrentPlace() + 3] << 24;
+
+        this.setCurrentPlace(this.getCurrentPlace() + 4);
+        this.setDataRemained(this.getDataRemained() - 4);
+        return dest;
+    }
+
+    private long unmarshalUInt32(byte[] data, int dataLenght, long dest) {
+        ChmAssert.assertByteArrayNotNull(data);
+        if (4 > dataLenght)
+            throw new ChmParsingException("4 > dataLenght");
+        dest = data[this.getCurrentPlace()]
+                | data[this.getCurrentPlace() + 1] << 8
+                | data[this.getCurrentPlace() + 2] << 16
+                | data[this.getCurrentPlace() + 3] << 24;
+
+        setDataRemained(this.getDataRemained() - 4);
+        this.setCurrentPlace(this.getCurrentPlace() + 4);
+        return dest;
+    }
+
+    private byte[] unmarshalUuid(byte[] data, int dataLenght, byte[] dest,
+            int count) {
+        System.arraycopy(data, this.getCurrentPlace(), dest, 0, count);
+        this.setCurrentPlace(this.getCurrentPlace() + count);
+        this.setDataRemained(this.getDataRemained() - count);
+        return dest;
+    }
+
+    /**
+     * Returns how many bytes remained
+     * 
+     * @return int
+     */
+    private int getDataRemained() {
+        return dataRemained;
+    }
+
+    /**
+     * Sets how many bytes remained
+     * 
+     * @param dataRemained
+     */
+    private void setDataRemained(int dataRemained) {
+        this.dataRemained = dataRemained;
+    }
+
+    /**
+     * Returns a place holder
+     * 
+     * @return current place
+     */
+    private int getCurrentPlace() {
+        return currentPlace;
+    }
+
+    /**
+     * Sets current place
+     * 
+     * @param currentPlace
+     */
+    private void setCurrentPlace(int currentPlace) {
+        this.currentPlace = currentPlace;
+    }
+
+    /**
+     * Returns a signature of the header
+     * 
+     * @return itsp signature
+     */
+    public byte[] getSignature() {
+        return signature;
+    }
+
+    /**
+     * Sets itsp signature
+     * 
+     * @param signature
+     */
+    protected void setSignature(byte[] signature) {
+        this.signature = signature;
+    }
+
+    /**
+     * Returns version of itsp header
+     * 
+     * @return version
+     */
+    public int getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets a version of itsp header
+     * 
+     * @param version
+     */
+    protected void setVersion(int version) {
+        this.version = version;
+    }
+
+    /**
+     * Returns header length
+     * 
+     * @return header length
+     */
+    public int getHeader_len() {
+        return header_len;
+    }
+
+    /**
+     * Sets itsp header length
+     * 
+     * @param header_len
+     */
+    protected void setHeader_len(int header_len) {
+        this.header_len = header_len;
+    }
+
+    /**
+     * Returns 000c unknown bytes
+     */
+    public int getUnknown_000c() {
+        return unknown_000c;
+    }
+
+    /**
+     * Sets 000c unknown bytes Unknown means here that those guys who cracked
+     * the chm format do not know what's it purposes for
+     * 
+     * @param unknown_000c
+     */
+    protected void setUnknown_000c(int unknown_000c) {
+        this.unknown_000c = unknown_000c;
+    }
+
+    /**
+     * Returns block's length
+     * 
+     * @return block_length
+     */
+    public long getBlock_len() {
+        return block_len;
+    }
+
+    /**
+     * Sets block length
+     * 
+     * @param block_len
+     */
+    protected void setBlock_len(long block_len) {
+        this.block_len = block_len;
+    }
+
+    /**
+     * Returns block index interval
+     * 
+     * @return blockidx_intvl
+     */
+    public int getBlockidx_intvl() {
+        return blockidx_intvl;
+    }
+
+    /**
+     * Sets block index interval
+     * 
+     * @param blockidx_intvl
+     */
+    protected void setBlockidx_intvl(int blockidx_intvl) {
+        this.blockidx_intvl = blockidx_intvl;
+    }
+
+    /**
+     * Returns an index depth
+     * 
+     * @return index_depth
+     */
+    public int getIndex_depth() {
+        return index_depth;
+    }
+
+    /**
+     * Sets an index depth
+     * 
+     * @param index_depth
+     */
+    protected void setIndex_depth(int index_depth) {
+        this.index_depth = index_depth;
+    }
+
+    /**
+     * Returns index root
+     * 
+     * @return index_root
+     */
+    public int getIndex_root() {
+        return index_root;
+    }
+
+    /**
+     * Sets an index root
+     * 
+     * @param index_root
+     */
+    protected void setIndex_root(int index_root) {
+        this.index_root = index_root;
+    }
+
+    /**
+     * Returns an index head
+     * 
+     * @return index_head
+     */
+    public int getIndex_head() {
+        return index_head;
+    }
+
+    /**
+     * Sets an index head
+     * 
+     * @param index_head
+     */
+    protected void setIndex_head(int index_head) {
+        this.index_head = index_head;
+    }
+
+    /**
+     * Returns 0024 unknown bytes
+     * 
+     * @return unknown_0024
+     */
+    public int getUnknown_0024() {
+        return unknown_0024;
+    }
+
+    /**
+     * Sets 0024 unknown bytes
+     * 
+     * @param unknown_0024
+     */
+    protected void setUnknown_0024(int unknown_0024) {
+        this.unknown_0024 = unknown_0024;
+    }
+
+    /**
+     * Returns number of blocks
+     * 
+     * @return num_blocks
+     */
+    public long getNum_blocks() {
+        return num_blocks;
+    }
+
+    /**
+     * Sets number of blocks containing in the chm file
+     * 
+     * @param num_blocks
+     */
+    protected void setNum_blocks(long num_blocks) {
+        this.num_blocks = num_blocks;
+    }
+
+    /**
+     * Returns 002c unknown bytes
+     * 
+     * @return unknown_002c
+     */
+    public int getUnknown_002c() {
+        return unknown_002c;
+    }
+
+    /**
+     * Sets 002c unknown bytes
+     * 
+     * @param unknown_002c
+     */
+    protected void setUnknown_002c(int unknown_002c) {
+        this.unknown_002c = unknown_002c;
+    }
+
+    /**
+     * Returns language id
+     * 
+     * @return lang_id
+     */
+    public long getLang_id() {
+        return lang_id;
+    }
+
+    /**
+     * Sets language id
+     * 
+     * @param lang_id
+     */
+    protected void setLang_id(long lang_id) {
+        this.lang_id = lang_id;
+    }
+
+    /**
+     * Returns system uuid
+     * 
+     * @return system_uuid
+     */
+    public byte[] getSystem_uuid() {
+        return system_uuid;
+    }
+
+    /**
+     * Sets system uuid
+     * 
+     * @param system_uuid
+     */
+    protected void setSystem_uuid(byte[] system_uuid) {
+        this.system_uuid = system_uuid;
+    }
+
+    /**
+     * Returns 0044 unknown bytes
+     * 
+     * @return unknown_0044
+     */
+    public byte[] getUnknown_0044() {
+        return unknown_0044;
+    }
+
+    /**
+     * Sets 0044 unknown bytes
+     * 
+     * @param unknown_0044
+     */
+    protected void setUnknown_0044(byte[] unknown_0044) {
+        this.unknown_0044 = unknown_0044;
+    }
+
+    // @Override
+    public void parse(byte[] data, ChmItspHeader chmItspHeader) {
+        /* we only know how to deal with the 0x58 and 0x60 byte structures */
+        if (data.length != ChmConstants.CHM_ITSP_V1_LEN)
+            throw new ChmParsingException(
+                    "we only know how to deal with the 0x58 and 0x60 byte structures");
+
+        /* unmarshal common fields */
+        chmItspHeader.unmarshalCharArray(data, chmItspHeader,
+                ChmConstants.CHM_SIGNATURE_LEN);
+        // ChmCommons.unmarshalCharArray(data, chmItspHeader,
+        // ChmConstants.CHM_SIGNATURE_LEN);
+        chmItspHeader.setVersion(chmItspHeader.unmarshalInt32(data,
+                chmItspHeader.getDataRemained(), chmItspHeader.getVersion()));
+        chmItspHeader
+                .setHeader_len(chmItspHeader.unmarshalInt32(data,
+                        chmItspHeader.getDataRemained(),
+                        chmItspHeader.getHeader_len()));
+        chmItspHeader.setUnknown_000c(chmItspHeader.unmarshalInt32(data,
+                chmItspHeader.getDataRemained(),
+                chmItspHeader.getUnknown_000c()));
+        chmItspHeader.setBlock_len(chmItspHeader.unmarshalUInt32(data,
+                chmItspHeader.getDataRemained(), chmItspHeader.getBlock_len()));
+        chmItspHeader.setBlockidx_intvl(chmItspHeader.unmarshalInt32(data,
+                chmItspHeader.getDataRemained(),
+                chmItspHeader.getBlockidx_intvl()));
+        chmItspHeader
+                .setIndex_depth(chmItspHeader.unmarshalInt32(data,
+                        chmItspHeader.getDataRemained(),
+                        chmItspHeader.getIndex_depth()));
+        chmItspHeader
+                .setIndex_root(chmItspHeader.unmarshalInt32(data,
+                        chmItspHeader.getDataRemained(),
+                        chmItspHeader.getIndex_root()));
+        chmItspHeader
+                .setIndex_head(chmItspHeader.unmarshalInt32(data,
+                        chmItspHeader.getDataRemained(),
+                        chmItspHeader.getIndex_head()));
+        chmItspHeader.setUnknown_0024(chmItspHeader.unmarshalInt32(data,
+                chmItspHeader.getDataRemained(),
+                chmItspHeader.getUnknown_0024()));
+        chmItspHeader
+                .setNum_blocks(chmItspHeader.unmarshalUInt32(data,
+                        chmItspHeader.getDataRemained(),
+                        chmItspHeader.getNum_blocks()));
+        chmItspHeader.setUnknown_002c((chmItspHeader.unmarshalInt32(data,
+                chmItspHeader.getDataRemained(),
+                chmItspHeader.getUnknown_002c())));
+        chmItspHeader.setLang_id(chmItspHeader.unmarshalUInt32(data,
+                chmItspHeader.getDataRemained(), chmItspHeader.getLang_id()));
+        chmItspHeader
+                .setSystem_uuid(chmItspHeader.unmarshalUuid(data,
+                        chmItspHeader.getDataRemained(),
+                        chmItspHeader.getSystem_uuid(),
+                        ChmConstants.BYTE_ARRAY_LENGHT));
+        chmItspHeader
+                .setUnknown_0044(chmItspHeader.unmarshalUuid(data,
+                        chmItspHeader.getDataRemained(),
+                        chmItspHeader.getUnknown_0044(),
+                        ChmConstants.BYTE_ARRAY_LENGHT));
+
+        /* Checks validity of the itsp header */
+        if (!new String(chmItspHeader.getSignature()).equals(ChmConstants.ITSP))
+            throw new ChmParsingException("seems not valid signature");
+
+        if (chmItspHeader.getVersion() != ChmConstants.CHM_VER_1)
+            throw new ChmParsingException("!=ChmConstants.CHM_VER_1");
+
+        if (chmItspHeader.getHeader_len() != ChmConstants.CHM_ITSP_V1_LEN)
+            throw new ChmParsingException("!= ChmConstants.CHM_ITSP_V1_LEN");
+    }
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+    }
 }

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcControlData.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcControlData.java?rev=1133554&r1=1133553&r2=1133554&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcControlData.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcControlData.java Wed Jun  8 21:00:27 2011
@@ -36,278 +36,278 @@ import org.apache.tika.parser.chm.except
  * 
  */
 public class ChmLzxcControlData implements ChmAccessor<ChmLzxcControlData> {
-	private static final long serialVersionUID = -7897854774939631565L;
-	/* class' members */
-	private long size; /* 0 */
-	private byte[] signature = new String(ChmConstants.LZXC).getBytes(); /*
-																		 * 4
-																		 * (LZXC
-																		 * )
-																		 */
-	private long version; /* 8 */
-	private long resetInterval; /* c */
-	private long windowSize; /* 10 */
-	private long windowsPerReset; /* 14 */
-	private long unknown_18; /* 18 */
-
-	/* local usage */
-	private int dataRemained;
-	private int currentPlace = 0;
-
-	/**
-	 * Returns a remained data
-	 * 
-	 * @return dataRemained
-	 */
-	private int getDataRemained() {
-		return dataRemained;
-	}
-
-	/**
-	 * Sets a remained data
-	 * 
-	 * @param dataRemained
-	 */
-	private void setDataRemained(int dataRemained) {
-		this.dataRemained = dataRemained;
-	}
-
-	/**
-	 * Returns a place holder
-	 * 
-	 * @return current_place
-	 */
-	private int getCurrentPlace() {
-		return currentPlace;
-	}
-
-	/**
-	 * Sets a place holder
-	 * 
-	 * @param current_place
-	 */
-	private void setCurrentPlace(int currentPlace) {
-		this.currentPlace = currentPlace;
-	}
-
-	/**
-	 * Returns a size of control data
-	 * 
-	 * @return size
-	 */
-	public long getSize() {
-		return size;
-	}
-
-	/**
-	 * Sets a size of control data
-	 * 
-	 * @param size
-	 */
-	protected void setSize(long size) {
-		this.size = size;
-	}
-
-	/**
-	 * Returns a signature of control data block
-	 * 
-	 * @return signature
-	 */
-	public byte[] getSignature() {
-		return signature;
-	}
-
-	/**
-	 * Sets a signature of control data block
-	 * 
-	 * @param signature
-	 */
-	protected void setSignature(byte[] signature) {
-		this.signature = signature;
-	}
-
-	/**
-	 * Returns a version of control data block
-	 * 
-	 * @return version
-	 */
-	public long getVersion() {
-		return version;
-	}
-
-	/**
-	 * Sets version of control data block
-	 * 
-	 * @param version
-	 */
-	protected void setVersion(long version) {
-		this.version = version;
-	}
-
-	/**
-	 * Returns reset interval
-	 * 
-	 * @return reset_interval
-	 */
-	public long getResetInterval() {
-		return resetInterval;
-	}
-
-	/**
-	 * Sets a reset interval
-	 * 
-	 * @param resetInterval
-	 */
-	protected void setResetInterval(long resetInterval) {
-		this.resetInterval = resetInterval;
-	}
-
-	/**
-	 * Returns a window size
-	 * 
-	 * @return window_size
-	 */
-	public long getWindowSize() {
-		return windowSize;
-	}
-
-	/**
-	 * Sets a window size
-	 * 
-	 * @param window_size
-	 */
-	protected void setWindowSize(long windowSize) {
-		this.windowSize = windowSize;
-	}
-
-	/**
-	 * Returns windows per reset
-	 * 
-	 * @return
-	 */
-	public long getWindowsPerReset() {
-		return windowsPerReset;
-	}
-
-	/**
-	 * Sets windows per reset
-	 * 
-	 * @param windows_per_reset
-	 */
-	protected void setWindowsPerReset(long windowsPerReset) {
-		this.windowsPerReset = windowsPerReset;
-	}
-
-	/**
-	 * Returns unknown 18 bytes
-	 * 
-	 * @return unknown_18
-	 */
-	public long getUnknown_18() {
-		return unknown_18;
-	}
-
-	/**
-	 * Sets unknown 18 bytes
-	 * 
-	 * @param unknown_18
-	 */
-	protected void setUnknown_18(long unknown_18) {
-		this.unknown_18 = unknown_18;
-	}
-
-	private long unmarshalUInt32(byte[] data, long dest) {
-		assert (data != null && data.length > 0);
-		if (4 > getDataRemained())
-			throw new ChmParsingException("4 > dataLenght");
-		dest = data[this.getCurrentPlace()]
-				| data[this.getCurrentPlace() + 1] << 8
-				| data[this.getCurrentPlace() + 2] << 16
-				| data[this.getCurrentPlace() + 3] << 24;
-
-		setDataRemained(this.getDataRemained() - 4);
-		this.setCurrentPlace(this.getCurrentPlace() + 4);
-		return dest;
-	}
-
-	private void unmarshalCharArray(byte[] data,
-			ChmLzxcControlData chmLzxcControlData, int count) {
-		ChmAssert.assertByteArrayNotNull(data);
-		ChmAssert.assertChmAccessorNotNull(chmLzxcControlData);
-		ChmAssert.assertPositiveInt(count);
-		System.arraycopy(data, 4, chmLzxcControlData.getSignature(), 0, count);
-		this.setCurrentPlace(this.getCurrentPlace() + count);
-		this.setDataRemained(this.getDataRemained() - count);
-	}
-
-	/**
-	 * Returns textual representation of ChmLzxcControlData
-	 */
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("size(unknown):=" + this.getSize() + ", ");
-		sb.append("signature(Compression type identifier):="
-				+ new String(this.getSignature()) + ", ");
-		sb.append("version(Possibly numeric code for LZX):="
-				+ this.getVersion() + System.getProperty("line.separator"));
-		sb.append("resetInterval(The Huffman reset interval):="
-				+ this.getResetInterval() + ", ");
-		sb.append("windowSize:=" + this.getWindowSize() + ", ");
-		sb.append("windowsPerReset(unknown (sometimes 2, sometimes 1, sometimes 0):="
-				+ this.getWindowsPerReset() + ", ");
-		sb.append("unknown_18:=" + this.getUnknown_18()
-				+ System.getProperty("line.separator"));
-		return sb.toString();
-	}
-
-	// @Override
-	public void parse(byte[] data, ChmLzxcControlData chmLzxcControlData) {
-		if (data == null || (data.length < ChmConstants.CHM_LZXC_MIN_LEN))
-			throw new ChmParsingException("we want at least 0x18 bytes");
-		chmLzxcControlData.setDataRemained(data.length);
-		chmLzxcControlData.setSize(unmarshalUInt32(data,
-				chmLzxcControlData.getSize()));
-		chmLzxcControlData.unmarshalCharArray(data, chmLzxcControlData,
-				ChmConstants.CHM_SIGNATURE_LEN);
-		chmLzxcControlData.setVersion(unmarshalUInt32(data,
-				chmLzxcControlData.getVersion()));
-		chmLzxcControlData.setResetInterval(unmarshalUInt32(data,
-				chmLzxcControlData.getResetInterval()));
-		chmLzxcControlData.setWindowSize(unmarshalUInt32(data,
-				chmLzxcControlData.getWindowSize()));
-		chmLzxcControlData.setWindowsPerReset(unmarshalUInt32(data,
-				chmLzxcControlData.getWindowsPerReset()));
-
-		if (data.length >= ChmConstants.CHM_LZXC_V2_LEN)
-			chmLzxcControlData.setUnknown_18(unmarshalUInt32(data,
-					chmLzxcControlData.getUnknown_18()));
-		else
-			chmLzxcControlData.setUnknown_18(0);
-
-		if (chmLzxcControlData.getVersion() == 2) {
-			chmLzxcControlData.setWindowSize(getWindowSize()
-					* ChmConstants.CHM_WINDOW_SIZE_BLOCK);
-		}
-
-		if (chmLzxcControlData.getWindowSize() == 0
-				|| chmLzxcControlData.getResetInterval() == 0)
-			throw new ChmParsingException(
-					"window size / resetInterval should be more than zero");
-
-		if (chmLzxcControlData.getWindowSize() == 1)
-			throw new ChmParsingException(
-					"window size / resetInterval should be more than 1");
-
-		/* checks a signature */
-		if (!new String(chmLzxcControlData.getSignature())
-				.equals(ChmConstants.LZXC))
-			throw new ChmParsingException(
-					"the signature does not seem to be correct");
-	}
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-	}
+    private static final long serialVersionUID = -7897854774939631565L;
+    /* class' members */
+    private long size; /* 0 */
+    private byte[] signature = new String(ChmConstants.LZXC).getBytes(); /*
+                                                                          * 4
+                                                                          * (LZXC
+                                                                          * )
+                                                                          */
+    private long version; /* 8 */
+    private long resetInterval; /* c */
+    private long windowSize; /* 10 */
+    private long windowsPerReset; /* 14 */
+    private long unknown_18; /* 18 */
+
+    /* local usage */
+    private int dataRemained;
+    private int currentPlace = 0;
+
+    /**
+     * Returns a remained data
+     * 
+     * @return dataRemained
+     */
+    private int getDataRemained() {
+        return dataRemained;
+    }
+
+    /**
+     * Sets a remained data
+     * 
+     * @param dataRemained
+     */
+    private void setDataRemained(int dataRemained) {
+        this.dataRemained = dataRemained;
+    }
+
+    /**
+     * Returns a place holder
+     * 
+     * @return current_place
+     */
+    private int getCurrentPlace() {
+        return currentPlace;
+    }
+
+    /**
+     * Sets a place holder
+     * 
+     * @param current_place
+     */
+    private void setCurrentPlace(int currentPlace) {
+        this.currentPlace = currentPlace;
+    }
+
+    /**
+     * Returns a size of control data
+     * 
+     * @return size
+     */
+    public long getSize() {
+        return size;
+    }
+
+    /**
+     * Sets a size of control data
+     * 
+     * @param size
+     */
+    protected void setSize(long size) {
+        this.size = size;
+    }
+
+    /**
+     * Returns a signature of control data block
+     * 
+     * @return signature
+     */
+    public byte[] getSignature() {
+        return signature;
+    }
+
+    /**
+     * Sets a signature of control data block
+     * 
+     * @param signature
+     */
+    protected void setSignature(byte[] signature) {
+        this.signature = signature;
+    }
+
+    /**
+     * Returns a version of control data block
+     * 
+     * @return version
+     */
+    public long getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets version of control data block
+     * 
+     * @param version
+     */
+    protected void setVersion(long version) {
+        this.version = version;
+    }
+
+    /**
+     * Returns reset interval
+     * 
+     * @return reset_interval
+     */
+    public long getResetInterval() {
+        return resetInterval;
+    }
+
+    /**
+     * Sets a reset interval
+     * 
+     * @param resetInterval
+     */
+    protected void setResetInterval(long resetInterval) {
+        this.resetInterval = resetInterval;
+    }
+
+    /**
+     * Returns a window size
+     * 
+     * @return window_size
+     */
+    public long getWindowSize() {
+        return windowSize;
+    }
+
+    /**
+     * Sets a window size
+     * 
+     * @param window_size
+     */
+    protected void setWindowSize(long windowSize) {
+        this.windowSize = windowSize;
+    }
+
+    /**
+     * Returns windows per reset
+     * 
+     * @return
+     */
+    public long getWindowsPerReset() {
+        return windowsPerReset;
+    }
+
+    /**
+     * Sets windows per reset
+     * 
+     * @param windows_per_reset
+     */
+    protected void setWindowsPerReset(long windowsPerReset) {
+        this.windowsPerReset = windowsPerReset;
+    }
+
+    /**
+     * Returns unknown 18 bytes
+     * 
+     * @return unknown_18
+     */
+    public long getUnknown_18() {
+        return unknown_18;
+    }
+
+    /**
+     * Sets unknown 18 bytes
+     * 
+     * @param unknown_18
+     */
+    protected void setUnknown_18(long unknown_18) {
+        this.unknown_18 = unknown_18;
+    }
+
+    private long unmarshalUInt32(byte[] data, long dest) {
+        assert (data != null && data.length > 0);
+        if (4 > getDataRemained())
+            throw new ChmParsingException("4 > dataLenght");
+        dest = data[this.getCurrentPlace()]
+                | data[this.getCurrentPlace() + 1] << 8
+                | data[this.getCurrentPlace() + 2] << 16
+                | data[this.getCurrentPlace() + 3] << 24;
+
+        setDataRemained(this.getDataRemained() - 4);
+        this.setCurrentPlace(this.getCurrentPlace() + 4);
+        return dest;
+    }
+
+    private void unmarshalCharArray(byte[] data,
+            ChmLzxcControlData chmLzxcControlData, int count) {
+        ChmAssert.assertByteArrayNotNull(data);
+        ChmAssert.assertChmAccessorNotNull(chmLzxcControlData);
+        ChmAssert.assertPositiveInt(count);
+        System.arraycopy(data, 4, chmLzxcControlData.getSignature(), 0, count);
+        this.setCurrentPlace(this.getCurrentPlace() + count);
+        this.setDataRemained(this.getDataRemained() - count);
+    }
+
+    /**
+     * Returns textual representation of ChmLzxcControlData
+     */
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("size(unknown):=" + this.getSize() + ", ");
+        sb.append("signature(Compression type identifier):="
+                + new String(this.getSignature()) + ", ");
+        sb.append("version(Possibly numeric code for LZX):="
+                + this.getVersion() + System.getProperty("line.separator"));
+        sb.append("resetInterval(The Huffman reset interval):="
+                + this.getResetInterval() + ", ");
+        sb.append("windowSize:=" + this.getWindowSize() + ", ");
+        sb.append("windowsPerReset(unknown (sometimes 2, sometimes 1, sometimes 0):="
+                + this.getWindowsPerReset() + ", ");
+        sb.append("unknown_18:=" + this.getUnknown_18()
+                + System.getProperty("line.separator"));
+        return sb.toString();
+    }
+
+    // @Override
+    public void parse(byte[] data, ChmLzxcControlData chmLzxcControlData) {
+        if (data == null || (data.length < ChmConstants.CHM_LZXC_MIN_LEN))
+            throw new ChmParsingException("we want at least 0x18 bytes");
+        chmLzxcControlData.setDataRemained(data.length);
+        chmLzxcControlData.setSize(unmarshalUInt32(data,
+                chmLzxcControlData.getSize()));
+        chmLzxcControlData.unmarshalCharArray(data, chmLzxcControlData,
+                ChmConstants.CHM_SIGNATURE_LEN);
+        chmLzxcControlData.setVersion(unmarshalUInt32(data,
+                chmLzxcControlData.getVersion()));
+        chmLzxcControlData.setResetInterval(unmarshalUInt32(data,
+                chmLzxcControlData.getResetInterval()));
+        chmLzxcControlData.setWindowSize(unmarshalUInt32(data,
+                chmLzxcControlData.getWindowSize()));
+        chmLzxcControlData.setWindowsPerReset(unmarshalUInt32(data,
+                chmLzxcControlData.getWindowsPerReset()));
+
+        if (data.length >= ChmConstants.CHM_LZXC_V2_LEN)
+            chmLzxcControlData.setUnknown_18(unmarshalUInt32(data,
+                    chmLzxcControlData.getUnknown_18()));
+        else
+            chmLzxcControlData.setUnknown_18(0);
+
+        if (chmLzxcControlData.getVersion() == 2) {
+            chmLzxcControlData.setWindowSize(getWindowSize()
+                    * ChmConstants.CHM_WINDOW_SIZE_BLOCK);
+        }
+
+        if (chmLzxcControlData.getWindowSize() == 0
+                || chmLzxcControlData.getResetInterval() == 0)
+            throw new ChmParsingException(
+                    "window size / resetInterval should be more than zero");
+
+        if (chmLzxcControlData.getWindowSize() == 1)
+            throw new ChmParsingException(
+                    "window size / resetInterval should be more than 1");
+
+        /* checks a signature */
+        if (!new String(chmLzxcControlData.getSignature())
+                .equals(ChmConstants.LZXC))
+            throw new ChmParsingException(
+                    "the signature does not seem to be correct");
+    }
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+    }
 }

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcResetTable.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcResetTable.java?rev=1133554&r1=1133553&r2=1133554&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcResetTable.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcResetTable.java Wed Jun  8 21:00:27 2011
@@ -34,320 +34,320 @@ import org.apache.tika.parser.chm.except
  * 
  */
 public class ChmLzxcResetTable implements ChmAccessor<ChmLzxcResetTable> {
-	private static final long serialVersionUID = -8209574429411707460L;
-	/* class members */
-	private long version; // 0000: DWORD 2 unknown (possibly a version number)
-	private long block_count; // 0004: DWORD Number of entries in reset table
-	private long unknown; // 0008: DWORD 8 unknown
-	private long table_offset; // 000C: DWORD $28 Length of table header (area
-								// before table entries)
-	private long uncompressed_len; // 0010: QWORD Uncompressed Length
-	private long compressed_len; // 0018: QWORD Compressed Length
-	private long block_len; // 0020: QWORD 0x8000 block size for locations below
-	private long[] block_address;
-
-	/* local usage */
-	private int dataRemained;
-	private int currentPlace = 0;
-
-	private int getDataRemained() {
-		return dataRemained;
-	}
-
-	private void setDataRemained(int dataRemained) {
-		this.dataRemained = dataRemained;
-	}
-
-	/**
-	 * Returns block addresses
-	 * 
-	 * @return block addresses
-	 */
-	public long[] getBlockAddress() {
-		return block_address;
-	}
-
-	/**
-	 * Sets block addresses
-	 * 
-	 * @param block_address
-	 */
-	public void setBlockAddress(long[] block_address) {
-		this.block_address = block_address;
-	}
-
-	private int getCurrentPlace() {
-		return currentPlace;
-	}
-
-	private void setCurrentPlace(int currentPlace) {
-		this.currentPlace = currentPlace;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("version:=" + getVersion()
-				+ System.getProperty("line.separator"));
-		sb.append("block_count:=" + getBlockCount()
-				+ System.getProperty("line.separator"));
-		sb.append("unknown:=" + getUnknown()
-				+ System.getProperty("line.separator"));
-		sb.append("table_offset:=" + getTableOffset()
-				+ System.getProperty("line.separator"));
-		sb.append("uncompressed_len:=" + getUncompressedLen()
-				+ System.getProperty("line.separator"));
-		sb.append("compressed_len:=" + getCompressedLen()
-				+ System.getProperty("line.separator"));
-		sb.append("block_len:=" + getBlockLen()
-				+ System.getProperty("line.separator"));
-		sb.append("block_addresses:=" + Arrays.toString(getBlockAddress()));
-		return sb.toString();
-	}
-
-	/**
-	 * Enumerates chm block addresses
-	 * 
-	 * @param data
-	 * 
-	 * @return byte[] of addresses
-	 */
-	private long[] enumerateBlockAddresses(byte[] data) {
-		ChmAssert.assertByteArrayNotNull(data);
-		/* we have limit of number of blocks to be extracted */
-		if (getBlockCount() > 5000)
-			setBlockCount(5000);
-
-		if (getBlockCount() < 0 && (getDataRemained() / 8) > 0)
-			setBlockCount(getDataRemained() / 8);
-
-		long[] addresses = new long[(int) getBlockCount()];
-		int rem = getDataRemained() / 8;
-		for (int i = 0; i < rem; i++) {
-			long num = -1;
-
-			try {
-				addresses[i] = unmarshalUint64(data, num);
-			} catch (Exception e) {
-				// System.err.println(e.getMessage());
-			}
-		}
-		return addresses;
-	}
-
-	/**
-	 * Validates parameters such as byte[] and chm lzxc reset table
-	 * 
-	 * @param data
-	 * @param chmLzxcResetTable
-	 * 
-	 * @return boolean
-	 */
-	private boolean validateParamaters(byte[] data,
-			ChmLzxcResetTable chmLzxcResetTable) {
-		int goodParameter = 0;
-		ChmAssert.assertByteArrayNotNull(data);
-		++goodParameter;
-		ChmAssert.assertChmAccessorNotNull(chmLzxcResetTable);
-		++goodParameter;
-		return (goodParameter == 2);
-	}
-
-	private long unmarshalUInt32(byte[] data, long dest) {
-		ChmAssert.assertByteArrayNotNull(data);
-		dest = data[this.getCurrentPlace()]
-				| data[this.getCurrentPlace() + 1] << 8
-				| data[this.getCurrentPlace() + 2] << 16
-				| data[this.getCurrentPlace() + 3] << 24;
-
-		setDataRemained(this.getDataRemained() - 4);
-		this.setCurrentPlace(this.getCurrentPlace() + 4);
-		return dest;
-	}
-
-	private long unmarshalUint64(byte[] data, long dest) {
-		ChmAssert.assertByteArrayNotNull(data);
-		byte[] temp = new byte[8];
-		int i, j;// counters
-
-		for (i = 8, j = 7; i > 0; i--) {
-			if (data.length > this.getCurrentPlace()) {
-				temp[j--] = data[this.getCurrentPlace()];
-				this.setCurrentPlace(this.getCurrentPlace() + 1);
-			} else
-				throw new ChmParsingException(
-						"data is too small to calculate address block");
-		}
-		dest = new BigInteger(temp).longValue();
-		this.setDataRemained(this.getDataRemained() - 8);
-		return dest;
-	}
-
-	/**
-	 * Returns the version
-	 * 
-	 * @return - long
-	 */
-	public long getVersion() {
-		return version;
-	}
-
-	/**
-	 * Sets the version
-	 * 
-	 * @param version
-	 *            - long
-	 */
-	public void setVersion(long version) {
-		this.version = version;
-	}
-
-	/**
-	 * Gets a block count
-	 * 
-	 * @return - int
-	 */
-	public long getBlockCount() {
-		return block_count;
-	}
-
-	/**
-	 * Sets a block count
-	 * 
-	 * @param block_count
-	 *            - long
-	 */
-	public void setBlockCount(long block_count) {
-		this.block_count = block_count;
-	}
-
-	/**
-	 * Gets unknown
-	 * 
-	 * @return - long
-	 */
-	public long getUnknown() {
-		return unknown;
-	}
-
-	/**
-	 * Sets an unknown
-	 * 
-	 * @param unknown
-	 *            - long
-	 */
-	public void setUnknown(long unknown) {
-		this.unknown = unknown;
-	}
-
-	/**
-	 * Gets a table offset
-	 * 
-	 * @return - long
-	 */
-	public long getTableOffset() {
-		return table_offset;
-	}
-
-	/**
-	 * Sets a table offset
-	 * 
-	 * @param table_offset
-	 *            - long
-	 */
-	public void setTableOffset(long table_offset) {
-		this.table_offset = table_offset;
-	}
-
-	/**
-	 * Gets uncompressed length
-	 * 
-	 * @return - {@link BigInteger }
-	 */
-	public long getUncompressedLen() {
-		return uncompressed_len;
-	}
-
-	/**
-	 * Sets uncompressed length
-	 * 
-	 * @param uncompressed_len
-	 *            - {@link BigInteger}
-	 */
-	public void setUncompressedLen(long uncompressed_len) {
-		this.uncompressed_len = uncompressed_len;
-	}
-
-	/**
-	 * Gets compressed length
-	 * 
-	 * @return - {@link BigInteger}
-	 */
-	public long getCompressedLen() {
-		return compressed_len;
-	}
-
-	/**
-	 * Sets compressed length
-	 * 
-	 * @param compressed_len
-	 *            - {@link BigInteger}
-	 */
-	public void setCompressedLen(long compressed_len) {
-		this.compressed_len = compressed_len;
-	}
-
-	/**
-	 * Gets a block length
-	 * 
-	 * @return - {@link BigInteger}
-	 */
-	public long getBlockLen() {
-		return block_len;
-	}
-
-	/**
-	 * Sets a block length
-	 * 
-	 * @param block_len
-	 *            - {@link BigInteger}
-	 */
-	public void setBlockLlen(long block_len) {
-		this.block_len = block_len;
-	}
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-
-	}
-
-	// @Override
-	public void parse(byte[] data, ChmLzxcResetTable chmLzxcResetTable) {
-		setDataRemained(data.length);
-		if (validateParamaters(data, chmLzxcResetTable)) {
-			/* unmarshal fields */
-			chmLzxcResetTable.setVersion(unmarshalUInt32(data,
-					chmLzxcResetTable.getVersion()));
-			chmLzxcResetTable.setBlockCount(unmarshalUInt32(data,
-					chmLzxcResetTable.getBlockCount()));
-			chmLzxcResetTable.setUnknown(unmarshalUInt32(data,
-					chmLzxcResetTable.getUnknown()));
-			chmLzxcResetTable.setTableOffset(unmarshalUInt32(data,
-					chmLzxcResetTable.getTableOffset()));
-			chmLzxcResetTable.setUncompressedLen(unmarshalUint64(data,
-					chmLzxcResetTable.getUncompressedLen()));
-			chmLzxcResetTable.setCompressedLen(unmarshalUint64(data,
-					chmLzxcResetTable.getCompressedLen()));
-			chmLzxcResetTable.setBlockLlen(unmarshalUint64(data,
-					chmLzxcResetTable.getBlockLen()));
-			chmLzxcResetTable.setBlockAddress(enumerateBlockAddresses(data));
-		}
-
-		/* checks chmLzxcResetTable */
-		if (chmLzxcResetTable.getVersion() != ChmConstants.CHM_VER_2)
-			throw new ChmParsingException(
-					"does not seem currect version of chmLzxcResetTable");
-	}
+    private static final long serialVersionUID = -8209574429411707460L;
+    /* class members */
+    private long version; // 0000: DWORD 2 unknown (possibly a version number)
+    private long block_count; // 0004: DWORD Number of entries in reset table
+    private long unknown; // 0008: DWORD 8 unknown
+    private long table_offset; // 000C: DWORD $28 Length of table header (area
+                               // before table entries)
+    private long uncompressed_len; // 0010: QWORD Uncompressed Length
+    private long compressed_len; // 0018: QWORD Compressed Length
+    private long block_len; // 0020: QWORD 0x8000 block size for locations below
+    private long[] block_address;
+
+    /* local usage */
+    private int dataRemained;
+    private int currentPlace = 0;
+
+    private int getDataRemained() {
+        return dataRemained;
+    }
+
+    private void setDataRemained(int dataRemained) {
+        this.dataRemained = dataRemained;
+    }
+
+    /**
+     * Returns block addresses
+     * 
+     * @return block addresses
+     */
+    public long[] getBlockAddress() {
+        return block_address;
+    }
+
+    /**
+     * Sets block addresses
+     * 
+     * @param block_address
+     */
+    public void setBlockAddress(long[] block_address) {
+        this.block_address = block_address;
+    }
+
+    private int getCurrentPlace() {
+        return currentPlace;
+    }
+
+    private void setCurrentPlace(int currentPlace) {
+        this.currentPlace = currentPlace;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("version:=" + getVersion()
+                + System.getProperty("line.separator"));
+        sb.append("block_count:=" + getBlockCount()
+                + System.getProperty("line.separator"));
+        sb.append("unknown:=" + getUnknown()
+                + System.getProperty("line.separator"));
+        sb.append("table_offset:=" + getTableOffset()
+                + System.getProperty("line.separator"));
+        sb.append("uncompressed_len:=" + getUncompressedLen()
+                + System.getProperty("line.separator"));
+        sb.append("compressed_len:=" + getCompressedLen()
+                + System.getProperty("line.separator"));
+        sb.append("block_len:=" + getBlockLen()
+                + System.getProperty("line.separator"));
+        sb.append("block_addresses:=" + Arrays.toString(getBlockAddress()));
+        return sb.toString();
+    }
+
+    /**
+     * Enumerates chm block addresses
+     * 
+     * @param data
+     * 
+     * @return byte[] of addresses
+     */
+    private long[] enumerateBlockAddresses(byte[] data) {
+        ChmAssert.assertByteArrayNotNull(data);
+        /* we have limit of number of blocks to be extracted */
+        if (getBlockCount() > 5000)
+            setBlockCount(5000);
+
+        if (getBlockCount() < 0 && (getDataRemained() / 8) > 0)
+            setBlockCount(getDataRemained() / 8);
+
+        long[] addresses = new long[(int) getBlockCount()];
+        int rem = getDataRemained() / 8;
+        for (int i = 0; i < rem; i++) {
+            long num = -1;
+
+            try {
+                addresses[i] = unmarshalUint64(data, num);
+            } catch (Exception e) {
+                // System.err.println(e.getMessage());
+            }
+        }
+        return addresses;
+    }
+
+    /**
+     * Validates parameters such as byte[] and chm lzxc reset table
+     * 
+     * @param data
+     * @param chmLzxcResetTable
+     * 
+     * @return boolean
+     */
+    private boolean validateParamaters(byte[] data,
+            ChmLzxcResetTable chmLzxcResetTable) {
+        int goodParameter = 0;
+        ChmAssert.assertByteArrayNotNull(data);
+        ++goodParameter;
+        ChmAssert.assertChmAccessorNotNull(chmLzxcResetTable);
+        ++goodParameter;
+        return (goodParameter == 2);
+    }
+
+    private long unmarshalUInt32(byte[] data, long dest) {
+        ChmAssert.assertByteArrayNotNull(data);
+        dest = data[this.getCurrentPlace()]
+                | data[this.getCurrentPlace() + 1] << 8
+                | data[this.getCurrentPlace() + 2] << 16
+                | data[this.getCurrentPlace() + 3] << 24;
+
+        setDataRemained(this.getDataRemained() - 4);
+        this.setCurrentPlace(this.getCurrentPlace() + 4);
+        return dest;
+    }
+
+    private long unmarshalUint64(byte[] data, long dest) {
+        ChmAssert.assertByteArrayNotNull(data);
+        byte[] temp = new byte[8];
+        int i, j;// counters
+
+        for (i = 8, j = 7; i > 0; i--) {
+            if (data.length > this.getCurrentPlace()) {
+                temp[j--] = data[this.getCurrentPlace()];
+                this.setCurrentPlace(this.getCurrentPlace() + 1);
+            } else
+                throw new ChmParsingException(
+                        "data is too small to calculate address block");
+        }
+        dest = new BigInteger(temp).longValue();
+        this.setDataRemained(this.getDataRemained() - 8);
+        return dest;
+    }
+
+    /**
+     * Returns the version
+     * 
+     * @return - long
+     */
+    public long getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the version
+     * 
+     * @param version
+     *            - long
+     */
+    public void setVersion(long version) {
+        this.version = version;
+    }
+
+    /**
+     * Gets a block count
+     * 
+     * @return - int
+     */
+    public long getBlockCount() {
+        return block_count;
+    }
+
+    /**
+     * Sets a block count
+     * 
+     * @param block_count
+     *            - long
+     */
+    public void setBlockCount(long block_count) {
+        this.block_count = block_count;
+    }
+
+    /**
+     * Gets unknown
+     * 
+     * @return - long
+     */
+    public long getUnknown() {
+        return unknown;
+    }
+
+    /**
+     * Sets an unknown
+     * 
+     * @param unknown
+     *            - long
+     */
+    public void setUnknown(long unknown) {
+        this.unknown = unknown;
+    }
+
+    /**
+     * Gets a table offset
+     * 
+     * @return - long
+     */
+    public long getTableOffset() {
+        return table_offset;
+    }
+
+    /**
+     * Sets a table offset
+     * 
+     * @param table_offset
+     *            - long
+     */
+    public void setTableOffset(long table_offset) {
+        this.table_offset = table_offset;
+    }
+
+    /**
+     * Gets uncompressed length
+     * 
+     * @return - {@link BigInteger }
+     */
+    public long getUncompressedLen() {
+        return uncompressed_len;
+    }
+
+    /**
+     * Sets uncompressed length
+     * 
+     * @param uncompressed_len
+     *            - {@link BigInteger}
+     */
+    public void setUncompressedLen(long uncompressed_len) {
+        this.uncompressed_len = uncompressed_len;
+    }
+
+    /**
+     * Gets compressed length
+     * 
+     * @return - {@link BigInteger}
+     */
+    public long getCompressedLen() {
+        return compressed_len;
+    }
+
+    /**
+     * Sets compressed length
+     * 
+     * @param compressed_len
+     *            - {@link BigInteger}
+     */
+    public void setCompressedLen(long compressed_len) {
+        this.compressed_len = compressed_len;
+    }
+
+    /**
+     * Gets a block length
+     * 
+     * @return - {@link BigInteger}
+     */
+    public long getBlockLen() {
+        return block_len;
+    }
+
+    /**
+     * Sets a block length
+     * 
+     * @param block_len
+     *            - {@link BigInteger}
+     */
+    public void setBlockLlen(long block_len) {
+        this.block_len = block_len;
+    }
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+
+    }
+
+    // @Override
+    public void parse(byte[] data, ChmLzxcResetTable chmLzxcResetTable) {
+        setDataRemained(data.length);
+        if (validateParamaters(data, chmLzxcResetTable)) {
+            /* unmarshal fields */
+            chmLzxcResetTable.setVersion(unmarshalUInt32(data,
+                    chmLzxcResetTable.getVersion()));
+            chmLzxcResetTable.setBlockCount(unmarshalUInt32(data,
+                    chmLzxcResetTable.getBlockCount()));
+            chmLzxcResetTable.setUnknown(unmarshalUInt32(data,
+                    chmLzxcResetTable.getUnknown()));
+            chmLzxcResetTable.setTableOffset(unmarshalUInt32(data,
+                    chmLzxcResetTable.getTableOffset()));
+            chmLzxcResetTable.setUncompressedLen(unmarshalUint64(data,
+                    chmLzxcResetTable.getUncompressedLen()));
+            chmLzxcResetTable.setCompressedLen(unmarshalUint64(data,
+                    chmLzxcResetTable.getCompressedLen()));
+            chmLzxcResetTable.setBlockLlen(unmarshalUint64(data,
+                    chmLzxcResetTable.getBlockLen()));
+            chmLzxcResetTable.setBlockAddress(enumerateBlockAddresses(data));
+        }
+
+        /* checks chmLzxcResetTable */
+        if (chmLzxcResetTable.getVersion() != ChmConstants.CHM_VER_2)
+            throw new ChmParsingException(
+                    "does not seem currect version of chmLzxcResetTable");
+    }
 }

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmgiHeader.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmgiHeader.java?rev=1133554&r1=1133553&r2=1133554&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmgiHeader.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmgiHeader.java Wed Jun  8 21:00:27 2011
@@ -45,137 +45,135 @@ import org.apache.tika.parser.chm.except
  * 
  */
 public class ChmPmgiHeader implements ChmAccessor<ChmPmgiHeader> {
-	private static final long serialVersionUID = -2092282339894303701L;
-	private byte[] signature = new String(ChmConstants.CHM_PMGI_MARKER)
-			.getBytes(); /* 0 (PMGI) */
-	private long free_space; /* 4 */
-
-	/* local usage */
-	private int dataRemained;
-	private int currentPlace = 0;
-
-	private int getDataRemained() {
-		return dataRemained;
-	}
-
-	private void setDataRemained(int dataRemained) {
-		this.dataRemained = dataRemained;
-	}
-
-	private int getCurrentPlace() {
-		return currentPlace;
-	}
-
-	private void setCurrentPlace(int currentPlace) {
-		this.currentPlace = currentPlace;
-	}
-
-	private void unmarshalCharArray(byte[] data, ChmPmgiHeader chmPmgiHeader,
-			int count) {
-		int index = -1;
-		ChmAssert.assertByteArrayNotNull(data);
-		ChmAssert.assertChmAccessorNotNull(chmPmgiHeader);
-		ChmAssert.assertPositiveInt(count);
-		this.setDataRemained(data.length);
-		index = ChmCommons.indexOf(data,
-				ChmConstants.CHM_PMGI_MARKER.getBytes());
-		if (index >= 0)
-			System.arraycopy(data, index, chmPmgiHeader.getSignature(), 0,
-					count);
-		else
-			System.err.println(ChmPmgiHeader.class.getName()
-					+ " does not exist a PMGI, use PMGL instead");
-		this.setCurrentPlace(this.getCurrentPlace() + count);
-		this.setDataRemained(this.getDataRemained() - count);
-	}
-
-	private long unmarshalUInt32(byte[] data, long dest) {
-		ChmAssert.assertByteArrayNotNull(data);
-
-		if (4 > getDataRemained())
-			throw new ChmParsingException("4 > dataLenght");
-		dest = data[this.getCurrentPlace()]
-				| data[this.getCurrentPlace() + 1] << 8
-				| data[this.getCurrentPlace() + 2] << 16
-				| data[this.getCurrentPlace() + 3] << 24;
-
-		setDataRemained(this.getDataRemained() - 4);
-		this.setCurrentPlace(this.getCurrentPlace() + 4);
-		return dest;
-	}
-
-	/**
-	 * Returns pmgi signature if exists
-	 * 
-	 * @return signature
-	 */
-	public byte[] getSignature() {
-		return signature;
-	}
-
-	/**
-	 * Sets pmgi signature
-	 * 
-	 * @param signature
-	 */
-	protected void setSignature(byte[] signature) {
-		this.signature = signature;
-	}
-
-	/**
-	 * Returns pmgi free space
-	 * 
-	 * @return free_space
-	 */
-	public long getFreeSpace() {
-		return free_space;
-	}
-
-	/**
-	 * Sets pmgi free space
-	 * 
-	 * @param free_space
-	 */
-	protected void setFreeSpace(long free_space) {
-		this.free_space = free_space;
-	}
-
-	/**
-	 * Returns textual representation of the pmgi header
-	 */
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("signature:=" + new String(getSignature()) + ", ");
-		sb.append("free space:=" + getFreeSpace()
-				+ System.getProperty("line.separator"));
-		return sb.toString();
-	}
-
-	// @Override
-	public void parse(byte[] data, ChmPmgiHeader chmPmgiHeader) {
-		/* we only know how to deal with a 0x8 byte structures */
-		if (data.length < ChmConstants.CHM_PMGI_LEN)
-			throw new ChmParsingException(
-					"we only know how to deal with a 0x8 byte structures");
-
-		/* unmarshal fields */
-		chmPmgiHeader.unmarshalCharArray(data, chmPmgiHeader,
-				ChmConstants.CHM_SIGNATURE_LEN);
-		chmPmgiHeader.setFreeSpace(chmPmgiHeader.unmarshalUInt32(data,
-				chmPmgiHeader.getFreeSpace()));
-
-		/* check structure */
-		if (!Arrays.equals(chmPmgiHeader.getSignature(),
-				ChmConstants.CHM_PMGI_MARKER.getBytes()))
-			throw new ChmParsingException(
-					"it does not seem to be valid a PMGI signature, check ChmItsp index_root if it was -1, means no PMGI, use PMGL insted");
-
-	}
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
+    private static final long serialVersionUID = -2092282339894303701L;
+    private byte[] signature = new String(ChmConstants.CHM_PMGI_MARKER).getBytes(); /* 0 (PMGI) */
+    private long free_space; /* 4 */
+
+    /* local usage */
+    private int dataRemained;
+    private int currentPlace = 0;
+
+    private int getDataRemained() {
+        return dataRemained;
+    }
+
+    private void setDataRemained(int dataRemained) {
+        this.dataRemained = dataRemained;
+    }
+
+    private int getCurrentPlace() {
+        return currentPlace;
+    }
+
+    private void setCurrentPlace(int currentPlace) {
+        this.currentPlace = currentPlace;
+    }
+
+    private void unmarshalCharArray(byte[] data, ChmPmgiHeader chmPmgiHeader,
+            int count) {
+        int index = -1;
+        ChmAssert.assertByteArrayNotNull(data);
+        ChmAssert.assertChmAccessorNotNull(chmPmgiHeader);
+        ChmAssert.assertPositiveInt(count);
+        this.setDataRemained(data.length);
+        index = ChmCommons.indexOf(data,
+                ChmConstants.CHM_PMGI_MARKER.getBytes());
+        if (index >= 0)
+            System.arraycopy(data, index, chmPmgiHeader.getSignature(), 0, count);
+        else
+            System.err.println(ChmPmgiHeader.class.getName()
+                    + " does not exist a PMGI, use PMGL instead");
+        this.setCurrentPlace(this.getCurrentPlace() + count);
+        this.setDataRemained(this.getDataRemained() - count);
+    }
+
+    private long unmarshalUInt32(byte[] data, long dest) {
+        ChmAssert.assertByteArrayNotNull(data);
+
+        if (4 > getDataRemained())
+            throw new ChmParsingException("4 > dataLenght");
+        dest = data[this.getCurrentPlace()]
+                | data[this.getCurrentPlace() + 1] << 8
+                | data[this.getCurrentPlace() + 2] << 16
+                | data[this.getCurrentPlace() + 3] << 24;
+
+        setDataRemained(this.getDataRemained() - 4);
+        this.setCurrentPlace(this.getCurrentPlace() + 4);
+        return dest;
+    }
+
+    /**
+     * Returns pmgi signature if exists
+     * 
+     * @return signature
+     */
+    public byte[] getSignature() {
+        return signature;
+    }
+
+    /**
+     * Sets pmgi signature
+     * 
+     * @param signature
+     */
+    protected void setSignature(byte[] signature) {
+        this.signature = signature;
+    }
+
+    /**
+     * Returns pmgi free space
+     * 
+     * @return free_space
+     */
+    public long getFreeSpace() {
+        return free_space;
+    }
+
+    /**
+     * Sets pmgi free space
+     * 
+     * @param free_space
+     */
+    protected void setFreeSpace(long free_space) {
+        this.free_space = free_space;
+    }
+
+    /**
+     * Returns textual representation of the pmgi header
+     */
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("signature:=" + new String(getSignature()) + ", ");
+        sb.append("free space:=" + getFreeSpace()
+                + System.getProperty("line.separator"));
+        return sb.toString();
+    }
+
+    // @Override
+    public void parse(byte[] data, ChmPmgiHeader chmPmgiHeader) {
+        /* we only know how to deal with a 0x8 byte structures */
+        if (data.length < ChmConstants.CHM_PMGI_LEN)
+            throw new ChmParsingException(
+                    "we only know how to deal with a 0x8 byte structures");
+
+        /* unmarshal fields */
+        chmPmgiHeader.unmarshalCharArray(data, chmPmgiHeader,
+                ChmConstants.CHM_SIGNATURE_LEN);
+        chmPmgiHeader.setFreeSpace(chmPmgiHeader.unmarshalUInt32(data,
+                chmPmgiHeader.getFreeSpace()));
+
+        /* check structure */
+        if (!Arrays.equals(chmPmgiHeader.getSignature(),
+                ChmConstants.CHM_PMGI_MARKER.getBytes()))
+            throw new ChmParsingException(
+                    "it does not seem to be valid a PMGI signature, check ChmItsp index_root if it was -1, means no PMGI, use PMGL insted");
+
+    }
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
 
-	}
+    }
 }

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmglHeader.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmglHeader.java?rev=1133554&r1=1133553&r2=1133554&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmglHeader.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmglHeader.java Wed Jun  8 21:00:27 2011
@@ -53,154 +53,154 @@ import org.apache.tika.parser.chm.except
  * 
  */
 public class ChmPmglHeader implements ChmAccessor<ChmPmglHeader> {
-	private static final long serialVersionUID = -6139486487475923593L;
-	private byte[] signature = new String(ChmConstants.PMGL).getBytes(); /*
-																		 * 0
-																		 * (PMGL
-																		 * )
-																		 */
-	private long free_space; /* 4 */
-	private long unknown_0008; /* 8 */
-	private int block_prev; /* c */
-	private int block_next; /* 10 */
-
-	/* local usage */
-	private int dataRemained;
-	private int currentPlace = 0;
-
-	private int getDataRemained() {
-		return dataRemained;
-	}
-
-	private void setDataRemained(int dataRemained) {
-		this.dataRemained = dataRemained;
-	}
-
-	private int getCurrentPlace() {
-		return currentPlace;
-	}
-
-	private void setCurrentPlace(int currentPlace) {
-		this.currentPlace = currentPlace;
-	}
-
-	public long getFreeSpace() {
-		return free_space;
-	}
-
-	public void setFreeSpace(long free_space) {
-		this.free_space = free_space;
-	}
-
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("signatute:=" + new String(getSignature()) + ", ");
-		sb.append("free space:=" + getFreeSpace() + ", ");
-		sb.append("unknown0008:=" + getUnknown0008() + ", ");
-		sb.append("prev block:=" + getBlockPrev() + ", ");
-		sb.append("next block:=" + getBlockNext()
-				+ System.getProperty("line.separator"));
-		return sb.toString();
-	}
-
-	protected void unmarshalCharArray(byte[] data, ChmPmglHeader chmPmglHeader,
-			int count) {
-		ChmAssert.assertByteArrayNotNull(data);
-		this.setDataRemained(data.length);
-		System.arraycopy(data, 0, chmPmglHeader.signature, 0, count);
-		this.setCurrentPlace(this.getCurrentPlace() + count);
-		this.setDataRemained(this.getDataRemained() - count);
-	}
-
-	private int unmarshalInt32(byte[] data, int dest) {
-		ChmAssert.assertByteArrayNotNull(data);
-		if (4 > this.getDataRemained())
-			throw new ChmParsingException("4 > dataLenght");
-		dest = data[this.getCurrentPlace()]
-				| data[this.getCurrentPlace() + 1] << 8
-				| data[this.getCurrentPlace() + 2] << 16
-				| data[this.getCurrentPlace() + 3] << 24;
-
-		this.setCurrentPlace(this.getCurrentPlace() + 4);
-		this.setDataRemained(this.getDataRemained() - 4);
-		return dest;
-	}
-
-	private long unmarshalUInt32(byte[] data, long dest) {
-		ChmAssert.assertByteArrayNotNull(data);
-		if (4 > getDataRemained())
-			throw new ChmParsingException("4 > dataLenght");
-		dest = data[this.getCurrentPlace()]
-				| data[this.getCurrentPlace() + 1] << 8
-				| data[this.getCurrentPlace() + 2] << 16
-				| data[this.getCurrentPlace() + 3] << 24;
-
-		setDataRemained(this.getDataRemained() - 4);
-		this.setCurrentPlace(this.getCurrentPlace() + 4);
-		return dest;
-	}
-
-	// @Override
-	public void parse(byte[] data, ChmPmglHeader chmPmglHeader) {
-		if (data.length < ChmConstants.CHM_PMGL_LEN)
-			throw new ChmParsingException(ChmPmglHeader.class.getName()
-					+ " we only know how to deal with a 0x14 byte structures");
-
-		/* unmarshal fields */
-		chmPmglHeader.unmarshalCharArray(data, chmPmglHeader,
-				ChmConstants.CHM_SIGNATURE_LEN);
-		chmPmglHeader.setFreeSpace(chmPmglHeader.unmarshalUInt32(data,
-				chmPmglHeader.getFreeSpace()));
-		chmPmglHeader.setUnknown0008(chmPmglHeader.unmarshalUInt32(data,
-				chmPmglHeader.getUnknown0008()));
-		chmPmglHeader.setBlockPrev(chmPmglHeader.unmarshalInt32(data,
-				chmPmglHeader.getBlockPrev()));
-		chmPmglHeader.setBlockNext(chmPmglHeader.unmarshalInt32(data,
-				chmPmglHeader.getBlockNext()));
-
-		/* check structure */
-		if (!new String(chmPmglHeader.getSignature()).equals(ChmConstants.PMGL))
-			throw new ChmParsingException(ChmPmglHeader.class.getName()
-					+ " pmgl != pmgl.signature");
-
-	}
-
-	public byte[] getSignature() {
-		return signature;
-	}
-
-	protected void setSignature(byte[] signature) {
-		this.signature = signature;
-	}
-
-	public long getUnknown0008() {
-		return unknown_0008;
-	}
-
-	protected void setUnknown0008(long unknown_0008) {
-		this.unknown_0008 = unknown_0008;
-	}
-
-	public int getBlockPrev() {
-		return block_prev;
-	}
-
-	protected void setBlockPrev(int block_prev) {
-		this.block_prev = block_prev;
-	}
-
-	public int getBlockNext() {
-		return block_next;
-	}
-
-	protected void setBlockNext(int block_next) {
-		this.block_next = block_next;
-	}
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
+    private static final long serialVersionUID = -6139486487475923593L;
+    private byte[] signature = new String(ChmConstants.PMGL).getBytes(); /*
+                                                                          * 0
+                                                                          * (PMGL
+                                                                          * )
+                                                                          */
+    private long free_space; /* 4 */
+    private long unknown_0008; /* 8 */
+    private int block_prev; /* c */
+    private int block_next; /* 10 */
+
+    /* local usage */
+    private int dataRemained;
+    private int currentPlace = 0;
+
+    private int getDataRemained() {
+        return dataRemained;
+    }
+
+    private void setDataRemained(int dataRemained) {
+        this.dataRemained = dataRemained;
+    }
+
+    private int getCurrentPlace() {
+        return currentPlace;
+    }
+
+    private void setCurrentPlace(int currentPlace) {
+        this.currentPlace = currentPlace;
+    }
+
+    public long getFreeSpace() {
+        return free_space;
+    }
+
+    public void setFreeSpace(long free_space) {
+        this.free_space = free_space;
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("signatute:=" + new String(getSignature()) + ", ");
+        sb.append("free space:=" + getFreeSpace() + ", ");
+        sb.append("unknown0008:=" + getUnknown0008() + ", ");
+        sb.append("prev block:=" + getBlockPrev() + ", ");
+        sb.append("next block:=" + getBlockNext()
+                + System.getProperty("line.separator"));
+        return sb.toString();
+    }
+
+    protected void unmarshalCharArray(byte[] data, ChmPmglHeader chmPmglHeader,
+            int count) {
+        ChmAssert.assertByteArrayNotNull(data);
+        this.setDataRemained(data.length);
+        System.arraycopy(data, 0, chmPmglHeader.signature, 0, count);
+        this.setCurrentPlace(this.getCurrentPlace() + count);
+        this.setDataRemained(this.getDataRemained() - count);
+    }
+
+    private int unmarshalInt32(byte[] data, int dest) {
+        ChmAssert.assertByteArrayNotNull(data);
+        if (4 > this.getDataRemained())
+            throw new ChmParsingException("4 > dataLenght");
+        dest = data[this.getCurrentPlace()]
+                | data[this.getCurrentPlace() + 1] << 8
+                | data[this.getCurrentPlace() + 2] << 16
+                | data[this.getCurrentPlace() + 3] << 24;
+
+        this.setCurrentPlace(this.getCurrentPlace() + 4);
+        this.setDataRemained(this.getDataRemained() - 4);
+        return dest;
+    }
+
+    private long unmarshalUInt32(byte[] data, long dest) {
+        ChmAssert.assertByteArrayNotNull(data);
+        if (4 > getDataRemained())
+            throw new ChmParsingException("4 > dataLenght");
+        dest = data[this.getCurrentPlace()]
+                | data[this.getCurrentPlace() + 1] << 8
+                | data[this.getCurrentPlace() + 2] << 16
+                | data[this.getCurrentPlace() + 3] << 24;
+
+        setDataRemained(this.getDataRemained() - 4);
+        this.setCurrentPlace(this.getCurrentPlace() + 4);
+        return dest;
+    }
+
+    // @Override
+    public void parse(byte[] data, ChmPmglHeader chmPmglHeader) {
+        if (data.length < ChmConstants.CHM_PMGL_LEN)
+            throw new ChmParsingException(ChmPmglHeader.class.getName()
+                    + " we only know how to deal with a 0x14 byte structures");
+
+        /* unmarshal fields */
+        chmPmglHeader.unmarshalCharArray(data, chmPmglHeader,
+                ChmConstants.CHM_SIGNATURE_LEN);
+        chmPmglHeader.setFreeSpace(chmPmglHeader.unmarshalUInt32(data,
+                chmPmglHeader.getFreeSpace()));
+        chmPmglHeader.setUnknown0008(chmPmglHeader.unmarshalUInt32(data,
+                chmPmglHeader.getUnknown0008()));
+        chmPmglHeader.setBlockPrev(chmPmglHeader.unmarshalInt32(data,
+                chmPmglHeader.getBlockPrev()));
+        chmPmglHeader.setBlockNext(chmPmglHeader.unmarshalInt32(data,
+                chmPmglHeader.getBlockNext()));
+
+        /* check structure */
+        if (!new String(chmPmglHeader.getSignature()).equals(ChmConstants.PMGL))
+            throw new ChmParsingException(ChmPmglHeader.class.getName()
+                    + " pmgl != pmgl.signature");
+
+    }
+
+    public byte[] getSignature() {
+        return signature;
+    }
+
+    protected void setSignature(byte[] signature) {
+        this.signature = signature;
+    }
+
+    public long getUnknown0008() {
+        return unknown_0008;
+    }
+
+    protected void setUnknown0008(long unknown_0008) {
+        this.unknown_0008 = unknown_0008;
+    }
+
+    public int getBlockPrev() {
+        return block_prev;
+    }
+
+    protected void setBlockPrev(int block_prev) {
+        this.block_prev = block_prev;
+    }
+
+    public int getBlockNext() {
+        return block_next;
+    }
+
+    protected void setBlockNext(int block_next) {
+        this.block_next = block_next;
+    }
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
 
-	}
+    }
 }