You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@poi.apache.org by sa...@apache.org on 2004/03/15 03:57:36 UTC

cvs commit: jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model CHPX.java PAPX.java

sackley     2004/03/14 18:57:36

  Modified:    src/scratchpad/src/org/apache/poi/hwpf/model CHPX.java
                        PAPX.java
  Log:
  javadoc and a minor fix
  
  Revision  Changes    Path
  1.2       +8 -10     jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java
  
  Index: CHPX.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CHPX.java	2 Mar 2004 06:22:01 -0000	1.1
  +++ CHPX.java	15 Mar 2004 02:57:36 -0000	1.2
  @@ -65,7 +65,7 @@
    * @author Ryan Ackley
    */
   
  -public class CHPX extends CachedPropertyNode
  +public class CHPX extends PropertyNode
   {
   
     public CHPX(int fcStart, int fcEnd, byte[] grpprl)
  @@ -84,17 +84,15 @@
       return ((SprmBuffer)_buf).toByteArray();
     }
   
  +  public SprmBuffer getSprmBuf()
  +  {
  +    return (SprmBuffer)_buf;
  +  }
  +
     public CharacterProperties getCharacterProperties(StyleSheet ss, short istd)
     {
  -    CharacterProperties props = (CharacterProperties)super.getCacheContents();
  -    if (props == null)
  -    {
  -      CharacterProperties baseStyle = ss.getCharacterStyle(istd);
  -      props = CharacterSprmUncompressor.uncompressCHP(baseStyle, getGrpprl(), 0);
  -      super.fillCache(props);
  -    }
  +    CharacterProperties baseStyle = ss.getCharacterStyle(istd);
  +    CharacterProperties props = CharacterSprmUncompressor.uncompressCHP(baseStyle, getGrpprl(), 0);
       return props;
     }
  -
  -
   }
  
  
  
  1.4       +9 -11     jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
  
  Index: PAPX.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PAPX.java	12 Mar 2004 12:34:32 -0000	1.3
  +++ PAPX.java	15 Mar 2004 02:57:36 -0000	1.4
  @@ -69,7 +69,7 @@
    * @author Ryan Ackley
    */
   
  -public class PAPX extends CachedPropertyNode
  +public class PAPX extends PropertyNode
   {
   
     private ParagraphHeight _phe;
  @@ -153,19 +153,17 @@
       }
     }
   
  -  public ParagraphProperties getParagraphProperties(StyleSheet ss)
  +  public SprmBuffer getSprmBuf()
     {
  +    return (SprmBuffer)_buf;
  +  }
   
  -    ParagraphProperties props = (ParagraphProperties)super.getCacheContents();
  -    if (props == null)
  -    {
  -      short istd = getIstd();
  -      ParagraphProperties baseStyle = ss.getParagraphStyle(istd);
  -      props = ParagraphSprmUncompressor.uncompressPAP(baseStyle, getGrpprl(), 2);
  -      super.fillCache(props);
  -    }
  +  public ParagraphProperties getParagraphProperties(StyleSheet ss)
  +  {
  +    short istd = getIstd();
  +    ParagraphProperties baseStyle = ss.getParagraphStyle(istd);
  +    ParagraphProperties props = ParagraphSprmUncompressor.uncompressPAP(baseStyle, getGrpprl(), 2);
       return props;
  -
     }
   
     public boolean equals(Object o)
  
  
  

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