You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by ro...@locus.apache.org on 2000/03/15 18:59:15 UTC

cvs commit: xml-xalan/src/org/apache/xalan/xslt ElemNumber.java ExtensionNSHandler.java

robweir     00/03/15 09:59:15

  Modified:    src/org/apache/xalan/xpath Tag: Bxalan_1_0_0
                        KeyDeclaration.java
               src/org/apache/xalan/xpath/xml Tag: Bxalan_1_0_0
                        StringToStringTable.java
               src/org/apache/xalan/xslt Tag: Bxalan_1_0_0 ElemNumber.java
                        ExtensionNSHandler.java
  Log:
  Fixes for compiled/serialized stylesheets
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +17 -10    xml-xalan/src/org/apache/xalan/xpath/KeyDeclaration.java
  
  Index: KeyDeclaration.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/KeyDeclaration.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- KeyDeclaration.java	2000/03/06 20:13:28	1.4
  +++ KeyDeclaration.java	2000/03/15 17:59:12	1.4.2.1
  @@ -59,14 +59,21 @@
   /**
    * <meta name="usage" content="internal"/>
    * Holds the attribute declarations for the xsl:keys element.
  - */
public class KeyDeclaration
{
  public String m_name;
  -  public XPath m_match;
  -  public XPath m_use;
  -  public static int UNBUILT = -1;
  -  public static int BUILDING = 0;
  -  public static int BUILT = 1;
  -  public int m_buildState = UNBUILT;
  + */
  +  public class KeyDeclaration implements java.io.Serializable
  +  {
  +	  public String m_name;
  +	  public XPath m_match;
  +	  public XPath m_use;
  +	  public static int UNBUILT = -1;
  +	  public static int BUILDING = 0;
  +	  public static int BUILT = 1;
  +	  public int m_buildState = UNBUILT;
     
  -  public KeyDeclaration(String name, XPath matchPattern, XPath use)
  {
  -    m_name = name;
    m_match = matchPattern;
  -    m_use = use;
  }
}
  +	  public KeyDeclaration(String name, XPath matchPattern, XPath use)
  +	  {
  +		m_name = name;
  +		m_match = matchPattern;
  +		m_use = use;
  +	  }
  +}
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +1 -1      xml-xalan/src/org/apache/xalan/xpath/xml/StringToStringTable.java
  
  Index: StringToStringTable.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/StringToStringTable.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- StringToStringTable.java	2000/03/06 20:13:45	1.5
  +++ StringToStringTable.java	2000/03/15 17:59:13	1.5.2.1
  @@ -61,7 +61,7 @@
    * A very simple lookup table that stores a list of strings, the even 
    * number strings being keys, and the odd number strings being values.
    */
  -public class StringToStringTable
  +public class StringToStringTable implements java.io.Serializable
   {
     private int m_blocksize;
     private String m_map[];
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.2  +1 -1      xml-xalan/src/org/apache/xalan/xslt/ElemNumber.java
  
  Index: ElemNumber.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemNumber.java,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- ElemNumber.java	2000/03/15 15:29:25	1.11.2.1
  +++ ElemNumber.java	2000/03/15 17:59:14	1.11.2.2
  @@ -129,7 +129,7 @@
     public AVT m_groupingSeparator_avt = null;
     public AVT m_groupingSize_avt = null;
   
  -  private XSLTResourceBundle thisBundle;
  +  private transient XSLTResourceBundle thisBundle;
   
     /**
      * Table to help in converting decimals to roman numerals.
  
  
  
  1.8.2.1   +2 -2      xml-xalan/src/org/apache/xalan/xslt/ExtensionNSHandler.java
  
  Index: ExtensionNSHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ExtensionNSHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- ExtensionNSHandler.java	2000/03/02 10:23:05	1.8
  +++ ExtensionNSHandler.java	2000/03/15 17:59:15	1.8.2.1
  @@ -76,9 +76,9 @@
    *
    * @author Sanjiva Weerawarana (sanjiva@watson.ibm.com)
    */
  -public class ExtensionNSHandler extends ExtensionFunctionHandler
  +public class ExtensionNSHandler extends ExtensionFunctionHandler implements Serializable
   {
  -  XSLTEngineImpl xslp;        // xsl processor for whom I'm working
  +  transient XSLTEngineImpl xslp;        // xsl processor for whom I'm working
     Hashtable elements = new Hashtable (); // ext. elements of this namespace
     boolean componentDescLoaded; // true when info from the component desc
     // has been loaded. This gets set as soon