poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r777204 [3/21] - in /poi/trunk/src/scratchpad: examples/src/org/apache/poi/hslf/examples/ examples/src/org/apache/poi/hwpf/ src/org/apache/poi/hdf/event/ src/org/apache/poi/hdf/extractor/ src/org/apache/poi/hdf/extractor/data/ src/org/apach...
Date Thu, 21 May 2009 18:15:01 GMT
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hdf.model;
 
 import java.io.InputStream;
@@ -24,7 +23,7 @@
 import org.apache.poi.hdf.event.HDFParsingListener;
 import org.apache.poi.hdf.event.EventBridge;
 
-public class HDFDocument
+public final class HDFDocument
 {
 
   HDFObjectModel _model;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,12 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-/*
- * HDFObjectFactory.java
- *
- * Created on February 24, 2002, 2:17 PM
- */
 
 package org.apache.poi.hdf.model;
 
@@ -53,7 +46,7 @@
  * that represent the data.
  * @author  andy
  */
-public class HDFObjectFactory
+public final class HDFObjectFactory
 {
 
     /** OLE stuff*/

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hdf.model;
 
 import org.apache.poi.hdf.event.HDFLowLevelParsingListener;
@@ -31,7 +30,7 @@
 import org.apache.poi.hdf.model.hdftypes.StyleSheet;
 
 
-public class HDFObjectModel implements HDFLowLevelParsingListener
+public final class HDFObjectModel implements HDFLowLevelParsingListener
 {
 
     /** "WordDocument" from the POIFS */

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hdf.model.hdftypes;
 
 import org.apache.poi.util.LittleEndian;
@@ -36,7 +35,7 @@
  *
  * @author Ryan Ackley
  */
-public class CHPFormattedDiskPage extends FormattedDiskPage
+public final class CHPFormattedDiskPage extends FormattedDiskPage
 {
 
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -27,7 +24,7 @@
  * @author Ryan Ackley
  */
 
-public class CharacterProperties extends CHPAbstractType implements Cloneable
+public final class CharacterProperties extends CHPAbstractType implements Cloneable
 {
 
   public CharacterProperties()

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -27,7 +24,7 @@
  * @author Ryan Ackley
  */
 
-public class ChpxNode extends PropertyNode
+public final class ChpxNode extends PropertyNode
 {
 
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -27,7 +24,7 @@
  * @author Ryan Ackley
  */
 
-public class DocumentProperties implements HDFType
+public final class DocumentProperties implements HDFType
 {
 
   public boolean _fFacingPages;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hdf.model.hdftypes;
 
 import org.apache.poi.util.BitField;
@@ -28,7 +27,7 @@
  *
  * @author  andy
  */
-public class FileInformationBlock extends FIBAbstractType
+public final class FileInformationBlock extends FIBAbstractType
 {
 /*
     private  short field_1_id;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -26,7 +24,7 @@
  * @author Ryan Ackley
  */
 
-public class FontTable implements HDFType
+public final class FontTable implements HDFType
 {
   String[] fontNames;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
 
 package org.apache.poi.hdf.model.hdftypes;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,12 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-/*
- * HDFType.java
- *
- * Created on February 24, 2002, 2:37 PM
- */
 
 package org.apache.poi.hdf.model.hdftypes;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -25,7 +23,7 @@
  * @author Ryan Ackley
  */
 
-public class HeaderFooter
+public final class HeaderFooter
 {
   public static final int HEADER_EVEN = 1;
   public static final int HEADER_ODD = 2;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -26,7 +23,7 @@
  * @author Ryan Ackley
  */
 
-public class LFO
+public final class LFO
 {
   int _lsid;
   int _clfolvl;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -26,7 +23,7 @@
  * @author Ryan Ackley
  */
 
-public class LFOLVL
+public final class LFOLVL
 {
   int _iStartAt;
   int _ilvl;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -26,7 +23,7 @@
  * @author Ryan Ackley
  */
 
-public class LST
+public final class LST
 {
   int _lsid;
   int _tplc;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -27,7 +24,7 @@
  */
 
 
-public class LVL
+public final class LVL
 {
   public int _iStartAt;
   public byte _nfc;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -31,7 +28,7 @@
  * @author Ryan Ackley
  */
 
-public class ListTables implements HDFType
+public final class ListTables implements HDFType
 {
 
   LFO[] _pllfo;
@@ -148,7 +145,7 @@
             lfolvl._fFormatting = StyleSheet.getFlag(lfolvl._ilvl & 0x20);
             lfolvl._ilvl = (lfolvl._ilvl & (byte)0x0f);
             lfolvlNum++;
-    
+
             if(lfolvl._fFormatting)
             {
               // The size of a LFOLVL is 8 bytes.
@@ -175,7 +172,7 @@
     lvl._fPrevSpace = StyleSheet.getFlag(code & 0x20);
     lvl._fWord6 = StyleSheet.getFlag(code & 0x40);
 
-    //  rgbxchNums - This array should be zero terminated unless it is full 
+    //  rgbxchNums - This array should be zero terminated unless it is full
     //  (all 9 levels full).
     System.arraycopy(data, offset, lvl._rgbxchNums, 0, 9);
     offset += 9;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hdf.model.hdftypes;
 
 import org.apache.poi.util.LittleEndian;
@@ -36,7 +35,7 @@
  *
  * @author Ryan Ackley
  */
-public class PAPFormattedDiskPage extends FormattedDiskPage
+public final class PAPFormattedDiskPage extends FormattedDiskPage
 {
 
     /**

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -26,7 +23,7 @@
  * @author Ryan Ackley
  */
 
-public class PapxNode extends PropertyNode
+public final class PapxNode extends PropertyNode
 {
 
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -27,7 +24,7 @@
  * @author Ryan Ackley
  */
 
-public class ParagraphProperties  extends PAPAbstractType implements Cloneable
+public final class ParagraphProperties  extends PAPAbstractType implements Cloneable
 {
 
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hdf.model.hdftypes;
 
 
@@ -29,7 +28,7 @@
  *
  * @author Ryan Ackley
  */
-public class PlexOfCps
+public final class PlexOfCps
 {
     private int _count;
     private int _offset;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hdf.model.hdftypes;
 
 
@@ -25,8 +24,7 @@
  *
  * @author Ryan Ackley
  */
-public class PropertyNode implements Comparable
-{
+public abstract class PropertyNode implements Comparable {
   private byte[] _grpprl;
   private int _fcStart;
   private int _fcEnd;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -27,7 +24,7 @@
  * @author Ryan Ackley
  */
 
-public class SectionProperties extends SEPAbstractType implements HDFType
+public final class SectionProperties extends SEPAbstractType implements HDFType
 {
   /*int _index;
   byte _bkc;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -26,7 +23,7 @@
  * @author Ryan Ackley
  */
 
-public class SepxNode extends PropertyNode
+public final class SepxNode extends PropertyNode
 {
 
   int _index;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -27,7 +24,7 @@
  * @author Ryan Ackley
  */
 
-public class StyleDescription implements HDFType
+public final class StyleDescription implements HDFType
 {
 
   private static int PARAGRAPH_STYLE = 1;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -33,7 +30,7 @@
  * @author Ryan Ackley
  */
 
-public class StyleSheet implements HDFType
+public final class StyleSheet implements HDFType
 {
 
   private static final int NIL_STYLE = 4095;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -28,7 +25,7 @@
  * @author Ryan Ackley
  */
 
-public class TableCellDescriptor extends TCAbstractType implements HDFType
+public final class TableCellDescriptor extends TCAbstractType implements HDFType
 {
 
   /*boolean _fFirstMerged;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -28,7 +25,7 @@
  * @author Ryan Ackley
  */
 
-public class TableProperties extends TAPAbstractType
+public final class TableProperties extends TAPAbstractType
 {
 
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
 
 package org.apache.poi.hdf.model.hdftypes;
 
@@ -27,7 +25,7 @@
  * @author Ryan Ackley
  */
 
-public class TextPiece extends PropertyNode implements Comparable
+public final class TextPiece extends PropertyNode implements Comparable
 {
   private boolean _usesUnicode;
   private int _length;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes.definitions;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes.definitions;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes.definitions;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes.definitions;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes.definitions;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes.definitions;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.hdftypes.definitions;
 

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.util;
 
@@ -39,7 +36,7 @@
  *
 */
 
-public class BTreeSet extends AbstractSet
+public final class BTreeSet extends AbstractSet
 {
 
     /*

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
-
 
 package org.apache.poi.hdf.model.util;
 
@@ -27,7 +24,7 @@
  * @author Ryan Ackley
  */
 
-public class NumberFormatter
+public final class NumberFormatter
 {
   private final static int ARABIC = 0;
   private final static int UPPER_ROMAN = 1;

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java Thu May 21 18:12:22 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,12 +14,12 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hdf.model.util;
 
 import org.apache.poi.hdf.model.hdftypes.FormattedDiskPage;
 
-public class ParsingState
+public final class ParsingState
 {
 
   //int _numPages;// = charPlcf.length();

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf;
 
 import java.io.FileInputStream;
@@ -40,59 +41,59 @@
  *  http://www.gnome.ru/projects/docs/slide1.png
  *  http://www.gnome.ru/projects/docs/slide2.png
  */
-public class HDGFDiagram extends POIDocument {
+public final class HDGFDiagram extends POIDocument {
 	private static final String VISIO_HEADER = "Visio (TM) Drawing\r\n";
-	
+
 	private byte[] _docstream;
-	
+
 	private short version;
 	private long docSize;
-	
+
 	private Pointer trailerPointer;
 	private TrailerStream trailer;
-	
+
 	private ChunkFactory chunkFactory;
 	private PointerFactory ptrFactory;
-	
+
 	public HDGFDiagram(POIFSFileSystem fs) throws IOException {
 		this(fs.getRoot(), fs);
 	}
 	public HDGFDiagram(DirectoryNode dir, POIFSFileSystem fs) throws IOException {
 		super(dir, fs);
-		
+
 		DocumentEntry docProps =
 			(DocumentEntry)dir.getEntry("VisioDocument");
 
 		// Grab the document stream
 		_docstream = new byte[docProps.getSize()];
 		dir.createDocumentInputStream("VisioDocument").read(_docstream);
-		
+
 		// Read in the common POI streams
 		readProperties();
-		
+
 		// Check it's really visio
 		String typeString = new String(_docstream, 0, 20);
 		if(! typeString.equals(VISIO_HEADER)) {
 			throw new IllegalArgumentException("Wasn't a valid visio document, started with " + typeString);
 		}
-		
+
 		// Grab the version number, 0x1a -> 0x1b
 		version = LittleEndian.getShort(_docstream, 0x1a);
 		// Grab the document size, 0x1c -> 0x1f
 		docSize = LittleEndian.getUInt(_docstream, 0x1c);
 		// ??? 0x20 -> 0x23
-		
+
 		// Create the Chunk+Pointer Factories for the document version
 		ptrFactory = new PointerFactory(version);
 		chunkFactory = new ChunkFactory(version);
-		
+
 		// Grab the pointer to the trailer
 		trailerPointer = ptrFactory.createPointer(_docstream, 0x24);
-		
+
 		// Now grab the trailer
 		trailer = (TrailerStream)
 			Stream.createStream(trailerPointer, _docstream, chunkFactory, ptrFactory);
-		
+
 		// Finally, find all our streams
 		trailer.findChildren(_docstream);
 	}
@@ -108,21 +109,21 @@
 	 */
 	public Stream[] getTopLevelStreams() { return trailer.getPointedToStreams(); }
 	public long getDocumentSize() { return docSize; }
-	
+
 	/**
 	 * Prints out some simple debug on the base contents of the file.
-	 * @see org.apache.poi.hdgf.dev.VSDDumper 
+	 * @see org.apache.poi.hdgf.dev.VSDDumper
 	 */
 	public void debug() throws IOException {
 		System.err.println("Trailer is at " + trailerPointer.getOffset());
 		System.err.println("Trailer has type " + trailerPointer.getType());
 		System.err.println("Trailer has length " + trailerPointer.getLength());
 		System.err.println("Trailer has format " + trailerPointer.getFormat());
-		
+
 		for(int i=0; i<trailer.getPointedToStreams().length; i++) {
 			Stream stream = trailer.getPointedToStreams()[i];
 			Pointer ptr = stream.getPointer();
-			
+
 			System.err.println("Looking at pointer " + i);
 			System.err.println("\tType is " + ptr.getType() + "\t\t" + Integer.toHexString(ptr.getType()));
 			System.err.println("\tOffset is " + ptr.getOffset() + "\t\t" + Long.toHexString(ptr.getOffset()));
@@ -131,10 +132,10 @@
 			System.err.println("\tFormat is " + ptr.getFormat() + "\t\t" + Long.toHexString(ptr.getFormat()));
 			System.err.println("\tCompressed is " + ptr.destinationCompressed());
 			System.err.println("\tStream is " + stream.getClass());
-			
+
 			if(stream instanceof PointerContainingStream) {
 				PointerContainingStream pcs = (PointerContainingStream)stream;
-				
+
 				if(pcs.getPointedToStreams() != null && pcs.getPointedToStreams().length > 0) {
 					System.err.println("\tContains " + pcs.getPointedToStreams().length + " other pointers/streams");
 					for(int j=0; j<pcs.getPointedToStreams().length; j++) {
@@ -145,7 +146,7 @@
 					}
 				}
 			}
-			
+
 			if(stream instanceof StringsStream) {
 				System.err.println("\t\t**strings**");
 				StringsStream ss = (StringsStream)stream;
@@ -153,11 +154,11 @@
 			}
 		}
 	}
-	
+
 	public void write(OutputStream out) {
 		throw new IllegalStateException("Writing is not yet implemented, see http://poi.apache.org/hdgf/");
 	}
-	
+
 	/**
 	 * For testing only
 	 */

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.chunks;
 
 import java.util.ArrayList;
@@ -27,10 +28,10 @@
 /**
  * Base of all chunks, which hold data, flags etc
  */
-public class Chunk {
-	/** 
-	 * The contents of the chunk, excluding the header, 
-	 * trailer and separator 
+public final class Chunk {
+	/**
+	 * The contents of the chunk, excluding the header,
+	 * trailer and separator
 	 */
 	private byte[] contents;
 	private ChunkHeader header;
@@ -46,17 +47,17 @@
 	//private Block[] blocks
 	/** The name of the chunk, as found from the commandDefinitions */
 	private String name;
-	
+
 	/** For logging warnings about the structure of the file */
 	private POILogger logger = POILogFactory.getLogger(Chunk.class);
-	
+
 	public Chunk(ChunkHeader header, ChunkTrailer trailer, ChunkSeparator separator, byte[] contents) {
 		this.header = header;
 		this.trailer = trailer;
 		this.separator = separator;
 		this.contents = contents;
 	}
-	
+
 	public byte[] _getContents() {
 		return contents;
 	}
@@ -102,7 +103,7 @@
 		}
 		return size;
 	}
-	
+
 	/**
 	 * Uses our CommandDefinitions to process the commands
 	 *  our chunk type has, and figure out the
@@ -112,14 +113,14 @@
 		if(commandDefinitions == null) {
 			throw new IllegalStateException("You must supply the command definitions before calling processCommands!");
 		}
-		
+
 		// Loop over the definitions, building the commands
 		//  and getting their values
 		ArrayList commands = new ArrayList();
 		for(int i=0; i<commandDefinitions.length; i++) {
 			int type = commandDefinitions[i].getType();
 			int offset = commandDefinitions[i].getOffset();
-			
+
 			// Handle virtual commands
 			if(type == 10) {
 				name = commandDefinitions[i].getName();
@@ -128,7 +129,7 @@
 				continue;
 			}
 
-			
+
 			// Build the appropriate command for the type
 			Command command;
 			if(type == 11 || type == 21) {
@@ -136,7 +137,7 @@
 			} else {
 				command = new Command(commandDefinitions[i]);
 			}
-			
+
 			// Bizarely, many of the offsets are from the start of the
 			//  header, not from the start of the chunk body
 			switch(type) {
@@ -151,15 +152,15 @@
 					offset -= 19;
 				}
 			}
-			
+
 			// Check we seem to have enough data
 			if(offset >= contents.length) {
-				logger.log(POILogger.WARN, 
+				logger.log(POILogger.WARN,
 						"Command offset " + offset + " past end of data at " + contents.length
 				);
 				continue;
 			}
-		
+
 			// Process
 			switch(type) {
 			// Types 0->7 = a flat at bit 0->7
@@ -189,7 +190,7 @@
 				if(endsAt == startsAt) {
 					endsAt = contents.length;
 				}
-				
+
 				int strLen = (endsAt-startsAt) / 2;
 				command.value = StringUtil.getFromUnicodeLE(contents, startsAt, strLen);
 				break;
@@ -203,7 +204,7 @@
 						LittleEndian.getInt(contents, offset)
 				);
 				break;
-				
+
 			// Types 11 and 21 hold the offset to the blocks
 			case 11: case 21:
 				if(offset < contents.length - 3) {
@@ -212,26 +213,26 @@
 					bcmd.setOffset(bOffset);
 				}
 				break;
-				
+
 			default:
-				logger.log(POILogger.INFO, 
+				logger.log(POILogger.INFO,
 						"Command of type " + type + " not processed!");
 			}
-			
+
 			// Add to the array
 			commands.add(command);
 		}
-		
+
 		// Save the commands we liked the look of
 		this.commands = (Command[])commands.toArray(
 							new Command[commands.size()] );
-		
+
 		// Now build up the blocks, if we had a command that tells
 		//  us where a block is
 	}
-	
+
 	/**
-	 * A command in the visio file. In order to make things fun, 
+	 * A command in the visio file. In order to make things fun,
 	 *  all the chunk actually stores is the value of the command.
 	 * You have to have your own lookup table to figure out what
 	 *  the commands are based on the chunk type.
@@ -239,7 +240,7 @@
 	public static class Command {
 		protected Object value;
 		private CommandDefinition definition;
-		
+
 		private Command(CommandDefinition definition, Object value) {
 			this.definition = definition;
 			this.value = value;
@@ -247,7 +248,7 @@
 		private Command(CommandDefinition definition) {
 			this(definition, null);
 		}
-		
+
 		public CommandDefinition getDefinition() { return definition; }
 		public Object getValue() { return value; }
 	}

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.chunks;
 
 import java.io.BufferedReader;
@@ -34,32 +35,32 @@
  * Makes use of chunks_parse_cmds.tbl from vsdump to be able
  *  to process the chunk value area
  */
-public class ChunkFactory {
+public final class ChunkFactory {
 	/** The version of the currently open document */
 	private int version;
 	/**
 	 * Key is a Chunk's type, value is an array of its CommandDefinitions
 	 */
 	private Hashtable chunkCommandDefinitions = new Hashtable();
-	/** 
-	 * What the name is of the chunk table definitions file? 
+	/**
+	 * What the name is of the chunk table definitions file?
 	 * This file comes from the scratchpad resources directory.
 	 */
-	private static String chunkTableName = 
+	private static String chunkTableName =
 		"/org/apache/poi/hdgf/chunks_parse_cmds.tbl";
-	
+
 	/** For logging problems we spot with the file */
 	private POILogger logger = POILogFactory.getLogger(ChunkFactory.class);
-	
+
 	public ChunkFactory(int version) throws IOException {
 		this.version = version;
-		
+
 		processChunkParseCommands();
 	}
-	
-	/** 
+
+	/**
 	 * Open chunks_parse_cmds.tbl and process it, to get the definitions
-	 *  of all the different possible chunk commands. 
+	 *  of all the different possible chunk commands.
 	 */
 	private void processChunkParseCommands() throws IOException {
 		String line;
@@ -67,7 +68,7 @@
 		if(cpd == null) {
 			throw new IllegalStateException("Unable to find HDGF chunk definition on the classpath - " + chunkTableName);
 		}
-		
+
 		BufferedReader inp = new BufferedReader(new InputStreamReader(cpd));
 		while( (line = inp.readLine()) != null ) {
 			if(line.startsWith("#")) continue;
@@ -81,28 +82,28 @@
 			}
 			int chunkType = Integer.parseInt(line.substring(6));
 			ArrayList defsL = new ArrayList();
-			
+
 			// Data entries
 			while( ! (line = inp.readLine()).startsWith("end") ) {
 				StringTokenizer st = new StringTokenizer(line, " ");
 				int defType = Integer.parseInt(st.nextToken());
 				int offset = Integer.parseInt(st.nextToken());
 				String name = st.nextToken("\uffff").substring(1);
-				
+
 				CommandDefinition def = new CommandDefinition(defType,offset,name);
 				defsL.add(def);
 			}
-			
+
 			CommandDefinition[] defs = (CommandDefinition[])
 				defsL.toArray(new CommandDefinition[defsL.size()]);
-			
+
 			// Add to the hashtable
 			chunkCommandDefinitions.put(new Integer(chunkType), defs);
 		}
 		inp.close();
 		cpd.close();
 	}
-	
+
 	public int getVersion() { return version; }
 
 	/**
@@ -112,25 +113,25 @@
 	 */
 	public Chunk createChunk(byte[] data, int offset) {
 		// Create the header
-		ChunkHeader header = 
+		ChunkHeader header =
 			ChunkHeader.createChunkHeader(version, data, offset);
 		// Sanity check
 		if(header.length < 0) {
 			throw new IllegalArgumentException("Found a chunk with a negative length, which isn't allowed");
 		}
-		
+
 		// How far up to look
 		int endOfDataPos = offset + header.getLength() + header.getSizeInBytes();
-		
+
 		// Check we have enough data, and tweak the header size
 		//  as required
 		if(endOfDataPos > data.length) {
 			logger.log(POILogger.WARN,
 				"Header called for " + header.getLength() +" bytes, but that would take us passed the end of the data!");
-			
+
 			endOfDataPos = data.length;
 			header.length = data.length - offset - header.getSizeInBytes();
-			
+
 			if(header.hasTrailer()) {
 				header.length -= 8;
 				endOfDataPos  -= 8;
@@ -140,7 +141,7 @@
 				endOfDataPos  -= 4;
 			}
 		}
-		
+
 
 		// Create the trailer and separator, if required
 		ChunkTrailer trailer = null;
@@ -167,20 +168,20 @@
 		byte[] contents = new byte[header.getLength()];
 		System.arraycopy(data, offset+header.getSizeInBytes(), contents, 0, contents.length);
 		Chunk chunk = new Chunk(header, trailer, separator, contents);
-		
+
 		// Feed in the stuff from  chunks_parse_cmds.tbl
 		CommandDefinition[] defs = (CommandDefinition[])
 			chunkCommandDefinitions.get(new Integer(header.getType()));
 		if(defs == null) defs = new CommandDefinition[0];
 		chunk.commandDefinitions = defs;
-		
+
 		// Now get the chunk to process its commands
 		chunk.processCommands();
-		
+
 		// All done
 		return chunk;
 	}
-	
+
 	/**
 	 * The definition of a Command, which a chunk may hold.
 	 * The Command holds the value, this describes it.
@@ -194,7 +195,7 @@
 			this.offset = offset;
 			this.name = name;
 		}
-		
+
 		public String getName() {
 			return name;
 		}

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.chunks;
 
 import org.apache.poi.util.LittleEndian;
@@ -26,7 +27,7 @@
 	protected int id;
 	protected int length;
 	protected int unknown1;
-	
+
 	/**
 	 * Creates the appropriate ChunkHeader for the Chunk Header at
 	 *  the given location, for the given document version.
@@ -45,24 +46,24 @@
 			ch.length   = (int)LittleEndian.getUInt(data, offset + 12);
 			ch.unknown2 = LittleEndian.getShort(data, offset + 16);
 			ch.unknown3 = (short)LittleEndian.getUnsignedByte(data, offset + 18);
-			
+
 			return ch;
 		} else if(documentVersion == 5 || documentVersion == 4) {
 			ChunkHeaderV4V5 ch = new ChunkHeaderV4V5();
-			
+
 			ch.type = (int)LittleEndian.getShort(data, offset + 0);
 			ch.id   = (int)LittleEndian.getShort(data, offset + 2);
 			ch.unknown2 = (short)LittleEndian.getUnsignedByte(data, offset + 4);
 			ch.unknown3 = (short)LittleEndian.getUnsignedByte(data, offset + 5);
 			ch.unknown1 = (short)LittleEndian.getShort(data, offset + 6);
 			ch.length   = (int)LittleEndian.getUInt(data, offset + 8);
-			
+
 			return ch;
 		} else {
 			throw new IllegalArgumentException("Visio files with versions below 4 are not supported, yours was " + documentVersion);
 		}
 	}
-	
+
 	/**
 	 * Returns the size of a chunk header for the given document version.
 	 */
@@ -75,11 +76,11 @@
 			return ChunkHeaderV4V5.getHeaderSize();
 		}
 	}
-	
+
 	public abstract int getSizeInBytes();
 	public abstract boolean hasTrailer();
 	public abstract boolean hasSeparator();
-	
+
 	/**
 	 * Returns the ID/IX of the chunk
 	 */

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java Thu May 21 18:12:22 2009
@@ -14,20 +14,21 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.chunks;
 
 /**
  * A chunk header from v11+
  */
-public class ChunkHeaderV11 extends ChunkHeaderV6 {
+public final class ChunkHeaderV11 extends ChunkHeaderV6 {
 	/**
 	 * Does the chunk have a separator?
 	 */
 	public boolean hasSeparator() {
-		// For some reason, there are two types that don't have a 
+		// For some reason, there are two types that don't have a
 		//  separator despite the flags that indicate they do
 		if(type == 0x1f || type == 0xc9) { return false; }
-		
+
 		// If there's a trailer, there's a separator
 		if(hasTrailer()) { return true; }
 
@@ -35,7 +36,7 @@
 		if(unknown2 == 2 && unknown3 == 0x54 && type == 0xaa) { return true; }
 		if(unknown2 == 3 && unknown3 != 0x50) { return true; }
 		if(type == 0x69) { return true; }
-		
+
 		return false;
 	}
 }

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java Thu May 21 18:12:22 2009
@@ -14,12 +14,13 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.chunks;
 
 /**
  * A chunk header from v4 or v5
  */
-public class ChunkHeaderV4V5 extends ChunkHeader {
+public final class ChunkHeaderV4V5 extends ChunkHeader {
 	protected short unknown2;
 	protected short unknown3;
 
@@ -29,15 +30,15 @@
 	public short getUnknown3() {
 		return unknown3;
 	}
-	
+
 	protected static int getHeaderSize() {
 		return 12;
 	}
-	
+
 	public int getSizeInBytes() {
 		return getHeaderSize();
 	}
-	
+
 	/**
 	 * Does the chunk have a trailer?
 	 */
@@ -45,7 +46,7 @@
 		// V4 and V5 never has trailers
 		return false;
 	}
-	
+
 	/**
 	 * Does the chunk have a separator?
 	 */

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.chunks;
 
 /**
@@ -29,7 +30,7 @@
 	public short getUnknown3() {
 		return unknown3;
 	}
-	
+
 	protected static int getHeaderSize() {
 		// Looks like it ought to be 19...
 		return 19;
@@ -37,7 +38,7 @@
 	public int getSizeInBytes() {
 		return getHeaderSize();
 	}
-	
+
 	/**
 	 * Does the chunk have a trailer?
 	 */

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java Thu May 21 18:12:22 2009
@@ -14,20 +14,21 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.chunks;
 
 /**
  * A separator between the trailer of one chunk, and the
  *  header of the next one
  */
-public class ChunkSeparator {
+public final class ChunkSeparator {
 	protected byte[] separatorData;
-	
+
 	public ChunkSeparator(byte[] data, int offset) {
 		separatorData = new byte[4];
 		System.arraycopy(data, offset, separatorData, 0, 4);
 	}
-	
+
 	public String toString() {
 		return "<ChunkSeparator of length " + separatorData.length + ">";
 	}

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java Thu May 21 18:12:22 2009
@@ -14,19 +14,20 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.chunks;
 
 /**
  * A trailer that follows a chunk
  */
-public class ChunkTrailer {
+public final class ChunkTrailer {
 	protected byte[] trailerData;
-	
+
 	public ChunkTrailer(byte[] data, int offset) {
 		trailerData = new byte[8];
 		System.arraycopy(data, offset, trailerData, 0, 8);
 	}
-	
+
 	public String toString() {
 		return "<ChunkTrailer of length " + trailerData.length + ">";
 	}

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.dev;
 
 import java.io.FileInputStream;
@@ -31,27 +32,27 @@
  * Developer helper class to dump out the pointer+stream structure
  *  of a Visio file
  */
-public class VSDDumper {
+public final class VSDDumper {
 	public static void main(String[] args) throws Exception {
 		if(args.length == 0) {
 			System.err.println("Use:");
 			System.err.println("  VSDDumper <filename>");
 			System.exit(1);
 		}
-		
+
 		HDGFDiagram hdgf = new HDGFDiagram(
 				new POIFSFileSystem(new FileInputStream(args[0]))
 		);
-		
+
 		System.out.println("Opened " + args[0]);
 		System.out.println("The document claims a size of " +
-				hdgf.getDocumentSize() + "   (" + 
+				hdgf.getDocumentSize() + "   (" +
 				Long.toHexString(hdgf.getDocumentSize()) + ")");
 		System.out.println();
-		
+
 		dumpStream(hdgf.getTrailerStream(), 0);
 	}
-	
+
 	public static void dumpStream(Stream stream, int indent) {
 		String ind = "";
 		for(int i=0; i<indent; i++) {
@@ -59,8 +60,8 @@
 		}
 		String ind2 = ind  + "    ";
 		String ind3 = ind2 + "    ";
-		
-		
+
+
 		Pointer ptr = stream.getPointer();
 		System.out.println(ind + "Stream at\t" + ptr.getOffset() +
 				" - " + Integer.toHexString(ptr.getOffset()));
@@ -77,7 +78,7 @@
 		}
 		System.out.println(ind + "  Compressed is\t" + ptr.destinationCompressed());
 		System.out.println(ind + "  Stream is\t" + stream.getClass().getName());
-		
+
 		byte[] db = stream._getStore()._getContents();
 		String ds = "";
 		if(db.length >= 8) {
@@ -87,12 +88,12 @@
 			}
 		}
 		System.out.println(ind + "  First few bytes are\t" + ds);
-		
+
 		if(stream instanceof PointerContainingStream) {
 			PointerContainingStream pcs = (PointerContainingStream)stream;
-			System.out.println(ind + "  Has " + 
+			System.out.println(ind + "  Has " +
 					pcs.getPointedToStreams().length + " children:");
-			
+
 			for(int i=0; i<pcs.getPointedToStreams().length; i++) {
 				dumpStream(pcs.getPointedToStreams()[i], (indent+1));
 			}
@@ -101,7 +102,7 @@
 			ChunkStream cs = (ChunkStream)stream;
 			System.out.println(ind + "  Has " + cs.getChunks().length +
 					" chunks:");
-			
+
 			for(int i=0; i<cs.getChunks().length; i++) {
 				Chunk chunk = cs.getChunks()[i];
 				System.out.println(ind2 + "" + chunk.getName());
@@ -111,7 +112,7 @@
 				System.out.println(ind2 + "  Holds " + chunk.getCommands().length + " commands");
 				for(int j=0; j<chunk.getCommands().length; j++) {
 					Command command = chunk.getCommands()[j];
-					System.out.println(ind3 + "" + 
+					System.out.println(ind3 + "" +
 							command.getDefinition().getName() +
 							" " + command.getValue()
 					);

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java Thu May 21 18:12:22 2009
@@ -1,44 +1,43 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hdgf.exceptions;
-
-/**
- * The superclass of all HDGF exceptions
- *
- * @author Yegor Kozlov
- */
-public class HDGFException extends RuntimeException {
-
-    public HDGFException() {
-	    super();
-    }
-
-   public HDGFException(String message) {
-	    super(message);
-    }
-
-   public HDGFException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public HDGFException(Throwable cause) {
-        super(cause);
-    }
-
-}
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hdgf.exceptions;
+
+/**
+ * The superclass of all HDGF exceptions
+ *
+ * @author Yegor Kozlov
+ */
+public final class HDGFException extends RuntimeException {
+
+    public HDGFException() {
+	    super();
+    }
+
+   public HDGFException(String message) {
+	    super(message);
+    }
+
+   public HDGFException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public HDGFException(Throwable cause) {
+        super(cause);
+    }
+
+}

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.extractor;
 
 import java.io.FileInputStream;
@@ -36,7 +37,7 @@
  * Can opperate on the command line (outputs to stdout), or
  *  can return the text for you (eg for use with Lucene).
  */
-public class VisioTextExtractor extends POIOLE2TextExtractor {
+public final class VisioTextExtractor extends POIOLE2TextExtractor {
 	private HDGFDiagram hdgf;
 	private POIFSFileSystem fs;
 
@@ -54,7 +55,7 @@
 	public VisioTextExtractor(InputStream inp) throws IOException {
 		this(new POIFSFileSystem(inp));
 	}
-	
+
 	/**
 	 * Locates all the text entries in the file, and returns their
 	 *  contents.
@@ -77,7 +78,7 @@
 			ChunkStream cs = (ChunkStream)stream;
 			for(int i=0; i<cs.getChunks().length; i++) {
 				Chunk chunk = cs.getChunks()[i];
-				if(chunk != null && 
+				if(chunk != null &&
 						chunk.getName() != null &&
 						chunk.getName().equals("Text") &&
 						chunk.getCommands().length > 0) {
@@ -90,7 +91,7 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * Returns the textual contents of the file.
 	 * Each textual object's text will be separated
@@ -108,17 +109,17 @@
 		}
 		return text.toString();
 	}
-	
+
 	public static void main(String[] args) throws Exception {
 		if(args.length == 0) {
 			System.err.println("Use:");
 			System.err.println("   VisioTextExtractor <file.vsd>");
 			System.exit(1);
 		}
-		
-		VisioTextExtractor extractor = 
+
+		VisioTextExtractor extractor =
 			new VisioTextExtractor(new FileInputStream(args[0]));
-		
+
 		// Print not PrintLn as already has \n added to it
 		System.out.print(extractor.getText());
 	}

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java Thu May 21 18:12:22 2009
@@ -14,10 +14,11 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.pointers;
 
 /**
- * Base class of pointers, which hold metadata and offsets about 
+ * Base class of pointers, which hold metadata and offsets about
  *  blocks elsewhere in the file
  */
 public abstract class Pointer {
@@ -26,7 +27,7 @@
 	protected int offset;
 	protected int length;
 	protected short format;
-	
+
 	public int getAddress() {
 		return address;
 	}
@@ -42,7 +43,7 @@
 	public int getType() {
 		return type;
 	}
-	
+
 	public abstract int getSizeInBytes();
 	public abstract boolean destinationHasStrings();
 	public abstract boolean destinationHasPointers();

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.pointers;
 
 import org.apache.poi.util.LittleEndian;
@@ -22,13 +23,13 @@
  * Factor class to create the appropriate pointers, based on the version
  *  of the file
  */
-public class PointerFactory {
+public final class PointerFactory {
 	private int version;
 	public PointerFactory(int version) {
 		this.version = version;
 	}
 	public int getVersion() { return version; }
-	
+
 	public Pointer createPointer(byte[] data, int offset) {
 		Pointer p;
 		if(version >= 6) {
@@ -38,7 +39,7 @@
 			p.offset = (int)LittleEndian.getUInt(data, offset+8);
 			p.length = (int)LittleEndian.getUInt(data, offset+12);
 			p.format = LittleEndian.getShort(data, offset+16);
-			
+
 			return p;
 		} else if(version == 5) {
 			throw new RuntimeException("TODO");

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java Thu May 21 18:12:22 2009
@@ -14,12 +14,13 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.pointers;
 
 /**
- * A Pointer from v6+ 
+ * A Pointer from v6+
  */
-public class PointerV6 extends Pointer {
+public final class PointerV6 extends Pointer {
 	public boolean destinationHasStrings() {
 		return (0x40 <= format && format < 0x50);
 	}
@@ -31,12 +32,12 @@
 	public boolean destinationHasChunks() {
 		return (0xd0 <= format && format < 0xdf);
 	}
-	
+
 	public boolean destinationCompressed() {
 		// Apparently, it's the second least significant bit
 		return (format & 2) > 0;
 	}
-	
+
 	/**
 	 * With v6 pointers, the on-disk size is 18 bytes
 	 */

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.streams;
 
 import java.util.ArrayList;
@@ -23,32 +24,32 @@
 import org.apache.poi.hdgf.chunks.ChunkHeader;
 import org.apache.poi.hdgf.pointers.Pointer;
 
-public class ChunkStream extends Stream {
+public final class ChunkStream extends Stream {
 	private ChunkFactory chunkFactory;
 	/** All the Chunks we contain */
 	private Chunk[] chunks;
-	
+
 	protected ChunkStream(Pointer pointer, StreamStore store, ChunkFactory chunkFactory) {
 		super(pointer, store);
 		this.chunkFactory = chunkFactory;
-		
+
 		// For compressed stores, we require all of the data
 		store.copyBlockHeaderToContents();
 	}
-	
+
 	public Chunk[] getChunks() { return chunks; }
-	
+
 	/**
 	 * Process the contents of the stream out into chunks
 	 */
 	public void findChunks() {
 		ArrayList chunksA = new ArrayList();
-		
+
 		if(getPointer().getOffset() == 0x64b3) {
 			int i = 0;
 			i++;
 		}
-		
+
 		int pos = 0;
 		byte[] contents = getStore().getContents();
 		while(pos < contents.length) {
@@ -57,14 +58,14 @@
 			if(pos+headerSize <= contents.length) {
 				Chunk chunk = chunkFactory.createChunk(contents, pos);
 				chunksA.add(chunk);
-				
+
 				pos += chunk.getOnDiskSize();
 			} else {
 				System.err.println("Needed " + headerSize + " bytes to create the next chunk header, but only found " + (contents.length-pos) + " bytes, ignoring rest of data");
 				pos = contents.length;
 			}
 		}
-		
+
 		chunks = (Chunk[])chunksA.toArray(new Chunk[chunksA.size()]);
 	}
 }

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java?rev=777204&r1=777203&r2=777204&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java Thu May 21 18:12:22 2009
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.hdgf.streams;
 
 import java.io.ByteArrayInputStream;
@@ -25,26 +26,26 @@
  * A StreamStore where the data on-disk is compressed,
  *  using the crazy Visio LZW
  */
-public class CompressedStreamStore extends StreamStore {
+public final class CompressedStreamStore extends StreamStore {
 	/** The raw, compressed contents */
 	private byte[] compressedContents;
-	/** 
+	/**
 	 * We're not sure what this is, but it comes before the
 	 *  real contents in the de-compressed data
 	 */
 	private byte[] blockHeader = new byte[4];
 	private boolean blockHeaderInContents = false;
-	
+
 	protected byte[] _getCompressedContents() { return compressedContents; }
 	protected byte[] _getBlockHeader() { return blockHeader; }
-	
+
 	/**
 	 * Creates a new compressed StreamStore, which will handle
 	 *  the decompression.
 	 */
 	protected CompressedStreamStore(byte[] data, int offset, int length) throws IOException {
 		this(decompress(data,offset,length));
-		
+
 		compressedContents = new byte[length];
 		System.arraycopy(data, offset, compressedContents, 0, length);
 	}
@@ -55,7 +56,7 @@
 		super(decompressedData[1], 0, decompressedData[1].length);
 		blockHeader = decompressedData[0];
 	}
-	
+
 	/**
 	 * Some kinds of streams expect their 4 byte header to be
 	 *  on the front of the contents.
@@ -63,31 +64,31 @@
 	 */
 	protected void copyBlockHeaderToContents() {
 		if(blockHeaderInContents) return;
-		
+
 		prependContentsWith(blockHeader);
 		blockHeaderInContents = true;
 	}
-	
+
 
 	/**
 	 * Decompresses the given data, returning it as header + contents
 	 */
 	public static byte[][] decompress(byte[] data, int offset, int length) throws IOException {
 		ByteArrayInputStream bais = new ByteArrayInputStream(data, offset, length);
-		
+
 		// Decompress
 		HDGFLZW lzw = new HDGFLZW();
 		byte[] decompressed = lzw.decode(bais);
-		
+
 		// Split into header and contents
 		byte[][] ret = new byte[2][];
 		ret[0] = new byte[4];
 		ret[1] = new byte[decompressed.length - 4];
-		
+
 		System.arraycopy(decompressed, 0, ret[0], 0, 4);
 		System.arraycopy(decompressed, 4, ret[1], 0, ret[1].length);
-		
+
 		// All done
 		return ret;
 	}
-}
\ No newline at end of file
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message