jkesselm    2003/02/12 08:23:41

  Modified:    java/src/org/apache/xml/dtm/ref/xni2dtm Tag: xslt20
                        FuncData.java
  Log:
  Merge in progress. (Just reconciling comments in preparation for first XDM 
checkin.)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1.2.2 +6 -6      
xml-xalan/java/src/org/apache/xml/dtm/ref/xni2dtm/Attic/FuncData.java
  
  Index: FuncData.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/xni2dtm/Attic/FuncData.java,v
  retrieving revision 1.1.2.1.2.1
  retrieving revision 1.1.2.1.2.2
  diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
  --- FuncData.java     30 Jan 2003 00:39:58 -0000      1.1.2.1.2.1
  +++ FuncData.java     12 Feb 2003 16:23:41 -0000      1.1.2.1.2.2
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -10,7 +10,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -18,7 +18,7 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:  
  + *    if any, must include the following acknowledgment:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself,
  @@ -26,7 +26,7 @@
    *
    * 4. The names "Xalan" and "Apache Software Foundation" must
    *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written 
  + *    software without prior written permission. For written
    *    permission, please contact [EMAIL PROTECTED]
    *
    * 5. Products derived from this software may not be called "Apache",
  @@ -57,7 +57,7 @@
   package org.apache.xml.dtm.ref.xni2dtm;
   
   import org.apache.xml.dtm.DTM;
  -import org.apache.xml.dtm.DTMSequence;
  +import org.apache.xml.xdm.XDMSequence;
   import org.apache.xpath.XPathContext;
   import org.w3c.dom.Node;
   
  @@ -77,7 +77,7 @@
        private static final boolean JJK_DUMMY_CODE=true; // debugging hook
        
        
  -     public static DTMSequence 
data(org.apache.xalan.extensions.ExpressionContext context,
  +     public static XDMSequence 
data(org.apache.xalan.extensions.ExpressionContext context,
                Node root) 
        {
                // This happens to work in current code. It isn't really
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to