cvs commit: xml-xalan/java/src/org/apache/xalan/templates AVT.java AVTPart.java AVTPartSimple.java AVTPartXPath.java ElemExtensionCall.java

[sb...@locus.apache.org]

sboag       00/08/08 21:26:41

  Modified:    java/src/org/apache/xalan/templates AVT.java AVTPart.java
                        AVTPartSimple.java AVTPartXPath.java
                        ElemExtensionCall.java
  Log:
  Fix for getAttribute in ElemExtensionCall.
  
  Revision  Changes    Path
  1.3       +27 -0     xml-xalan/java/src/org/apache/xalan/templates/AVT.java
  
  Index: AVT.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVT.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AVT.java	2000/07/05 14:39:42	1.2
  +++ AVT.java	2000/08/09 04:26:40	1.3
  @@ -316,6 +316,33 @@
     }
     
     /**
  +   * Get the AVT as the original string.
  +   */
  +  public String getSimpleString()
  +  {
  +    if(null != m_simpleString)
  +    {
  +      return m_simpleString;
  +    }
  +    else if(null != m_parts)
  +    {
  +      StringBuffer buf = new StringBuffer();
  +      buf.setLength(0);
  +      int n = m_parts.size();
  +      for(int i = 0; i < n; i++)
  +      {
  +        AVTPart part = (AVTPart)m_parts.elementAt(i);
  +        buf.append(part.getSimpleString());
  +      }
  +      return buf.toString();
  +    }
  +    else
  +    {
  +      return "";
  +    }
  +  }
  +  
  +  /**
      * Evaluate the AVT and return a String.
      * @param context The current source tree context.
      * @param nsNode The current namespace context (stylesheet tree context).
  
  
  
  1.3       +5 -0      xml-xalan/java/src/org/apache/xalan/templates/AVTPart.java
  
  Index: AVTPart.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVTPart.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AVTPart.java	2000/07/05 14:39:45	1.2
  +++ AVTPart.java	2000/08/09 04:26:40	1.3
  @@ -74,6 +74,11 @@
     }
     
     /**
  +   * Get the AVT part as the original string.
  +   */
  +  public abstract String getSimpleString();
  +  
  +  /**
      * Write the evaluated value into the given 
      * string buffer.
      * @param buf Buffer to write into.
  
  
  
  1.3       +8 -0      xml-xalan/java/src/org/apache/xalan/templates/AVTPartSimple.java
  
  Index: AVTPartSimple.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVTPartSimple.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AVTPartSimple.java	2000/07/05 14:39:50	1.2
  +++ AVTPartSimple.java	2000/08/09 04:26:40	1.3
  @@ -80,6 +80,14 @@
     }
     
     /**
  +   * Get the AVT part as the original string.
  +   */
  +  public String getSimpleString()
  +  {
  +    return m_val;
  +  }
  +  
  +  /**
      * Write the value into the buffer.
      * @param buf Buffer to write into.
      * @param context The current source tree context.
  
  
  
  1.3       +8 -0      xml-xalan/java/src/org/apache/xalan/templates/AVTPartXPath.java
  
  Index: AVTPartXPath.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVTPartXPath.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AVTPartXPath.java	2000/07/05 14:39:50	1.2
  +++ AVTPartXPath.java	2000/08/09 04:26:40	1.3
  @@ -95,6 +95,14 @@
     }
     
     /**
  +   * Get the AVT part as the original string.
  +   */
  +  public String getSimpleString()
  +  {
  +    return "{"+m_xpath.getPatternString()+"}";
  +  }
  +  
  +  /**
      * Write the value into the buffer.
      * @param buf Buffer to write into.
      * @param context The current source tree context.
  
  
  
  1.6       +7 -6      xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java
  
  Index: ElemExtensionCall.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ElemExtensionCall.java	2000/08/01 04:43:55	1.5
  +++ ElemExtensionCall.java	2000/08/09 04:26:40	1.6
  @@ -85,9 +85,6 @@
     // ExtensionNSHandler nsh;
     String m_extns;
     String m_extHandlerLookup;
  -  // String localPart;
  -  Attributes m_attrs;
  -  // public Vector m_avts = null;
     transient boolean isAvailable = false;
     String m_lang;
     String m_srcURL;
  @@ -204,10 +201,14 @@
     /**
      * Return the raw value of the attribute.
      */
  -  public String getAttribute(String name)
  +  public String getAttribute(String rawName)
     {
  -    String value = m_attrs.getValue(name);  
  -    return value;
  +    AVT avt = getLiteralResultAttribute(rawName);
  +    if((null != avt) && avt.getRawName().equals(rawName))
  +    {
  +      return avt.getSimpleString();        
  +    }
  +    return null;    
     }
   
     /**