[Fudaa-cvs-commit] fudaa_devel/ctulu/src/com/memoire/xml XmlListener.java,1.1,1.2 XmlNode.java,1.1,1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15871

Modified Files:
	XmlListener.java XmlNode.java XmlParser.java XmlReader.java 
Log Message:
Update ctulu


Index: XmlListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml/XmlListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlListener.java	29 Jan 2003 11:24:20 -0000	1.1
--- XmlListener.java	12 Mar 2004 15:49:49 -0000	1.2
***************
*** 11,16 ****
  
  package com.memoire.xml;
- import  com.memoire.xml.*;
- 
  
  public interface XmlListener
--- 11,14 ----

Index: XmlNode.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml/XmlNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlNode.java	29 Jan 2003 11:24:20 -0000	1.1
--- XmlNode.java	12 Mar 2004 15:49:49 -0000	1.2
***************
*** 11,15 ****
  
  package com.memoire.xml;
- import  com.memoire.xml.*;
  
  import java.util.*;
--- 11,14 ----
***************
*** 28,32 ****
      {
        Object o=e.nextElement();
!       if(!(o instanceof XmlNode)) r+=o.toString().trim();
      }
      return r;
--- 27,31 ----
      {
        Object o=e.nextElement();
!       if(!(o instanceof XmlNode)) r+=o.toString();//.trim();
      }
      return r;
***************
*** 64,67 ****
--- 63,79 ----
    }
  
+   public int findSize()
+   {
+     int         r=0;
+     Enumeration e=children_.elements();
+     while(e.hasMoreElements())
+     {
+       r++;
+       Object o=e.nextElement();
+       if(o instanceof XmlNode) r+=((XmlNode)o).findSize();
+     }
+     return r;
+   }
+ 
    public XmlNode getNode(String _name)
    {

Index: XmlParser.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml/XmlParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlParser.java	29 Jan 2003 11:24:20 -0000	1.1
--- XmlParser.java	12 Mar 2004 15:49:49 -0000	1.2
***************
*** 11,17 ****
  
  package com.memoire.xml;
- import  com.memoire.xml.*;
  
  import java.io.*;
  import java.util.*;
  
--- 11,17 ----
  
  package com.memoire.xml;
  
  import java.io.*;
+ import java.net.*;
  import java.util.*;
  
***************
*** 33,42 ****
    public XmlParser(String _origin) throws IOException
    {
!     this(new FileReader(_origin),_origin,XML);
    }
  
    public XmlParser(String _origin,int _mode) throws IOException
    {
!     this(new FileReader(_origin),_origin,_mode);
    }
  
--- 33,56 ----
    public XmlParser(String _origin) throws IOException
    {
!     this(_origin,XML);
    }
  
    public XmlParser(String _origin,int _mode) throws IOException
    {
!     this(convert(_origin),_origin,_mode);
!   }
! 
!   private static final Reader convert(String _o) throws IOException
!   {
!     Reader r=null;
!     try
!     {
!       r=new InputStreamReader(new URL(_o).openStream());
!     }
!     catch(MalformedURLException ex)
!     {
!       r=new FileReader(_o);
!     }
!     return r;
    }
  
***************
*** 51,54 ****
--- 65,78 ----
    }
  
+   public XmlParser(URL _origin) throws IOException
+   {
+     this(new InputStreamReader(_origin.openStream()),_origin.toString(),XML);
+   }
+ 
+   public XmlParser(URL _origin, int _mode) throws IOException
+   {
+     this(new InputStreamReader(_origin.openStream()),_origin.toString(),_mode);
+   }
+ 
    public XmlParser(Reader _in, String _origin)
    {
***************
*** 58,63 ****
    public XmlParser(Reader _in, String _origin, int _mode)
    {
      in_      =_in;
!     buf_     =new char[1024];
      nbc_     =0;
      origin_  =_origin;
--- 82,90 ----
    public XmlParser(Reader _in, String _origin, int _mode)
    {
+     if(!(_in instanceof BufferedReader))
+       _in=new BufferedReader(_in);
+ 
      in_      =_in;
!     buf_     =new char[8];
      nbc_     =0;
      origin_  =_origin;
***************
*** 68,72 ****
    }
  
!   protected static final String replace(String _s, String _a, String _b)
    {
      String r=_s;
--- 95,100 ----
    }
  
!   // same as FuLib.replace
!   public static final String replace(String _s, String _a, String _b)
    {
      String r=_s;
***************
*** 194,197 ****
--- 222,233 ----
  	  tag--;
  	}
+ 	else
+ 	if((t=='[')&&peekC()=='C')
+ 	{
+ 	  putC(t);
+ 	  do { sb.append(readC()); }
+ 	  while(!sb.toString().endsWith("]]>"));
+ 	  tag--;
+ 	}
  	else putC(t);
        }
***************
*** 376,384 ****
  	    if((getMode()==HTML)
  	       &&(  "BR"   .equals(t)
  		  ||"HR"   .equals(t)
  		  ||"IMG"  .equals(t)
  		  ||"LINK" .equals(t)
  		  ||"INPUT".equals(t)
! 		  ||"META" .equals(t)))
  	      listener_.endElement(t);
  	  }
--- 412,422 ----
  	    if((getMode()==HTML)
  	       &&(  "BR"   .equals(t)
+ 		  ||"FRAME".equals(t)
  		  ||"HR"   .equals(t)
  		  ||"IMG"  .equals(t)
  		  ||"LINK" .equals(t)
  		  ||"INPUT".equals(t)
! 		  ||"META" .equals(t)
! 		  ||"PARAM".equals(t)))
  	      listener_.endElement(t);
  	  }
***************
*** 398,406 ****
  	  if(  (getMode()==HTML)
  	     &&(  "BR"   .equals(e)
  		||"HR"   .equals(e)
  		||"IMG"  .equals(e)
  		||"LINK" .equals(e)
  		||"INPUT".equals(e)
! 		||"META" .equals(e)))
  	      ;
  	  else
--- 436,446 ----
  	  if(  (getMode()==HTML)
  	     &&(  "BR"   .equals(e)
+ 		||"FRAME".equals(e)
  		||"HR"   .equals(e)
  		||"IMG"  .equals(e)
  		||"LINK" .equals(e)
  		||"INPUT".equals(e)
! 		||"META" .equals(e)
! 		||"PARAM".equals(e)))
  	      ;
  	  else
***************
*** 415,422 ****
  	}
  	else
          if("<!".equals(e))
          {
  	  //System.err.println("DECLARATION");
! 	  do { e=readToken(); } while(!">".equals(e));
  	}
  	else
--- 455,469 ----
  	}
  	else
+         if(e.startsWith("<![CDATA["))
+         {
+ 	  //System.err.println("BINARY DATA");
+ 	  listener_.text(e.substring(9,e.length()-3));
+ 	}
+ 	else
          if("<!".equals(e))
          {
  	  //System.err.println("DECLARATION");
! 	  do { e=readToken(); }
! 	  while(!">".equals(e));
  	}
  	else

Index: XmlReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/xml/XmlReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlReader.java	29 Jan 2003 11:24:20 -0000	1.1
--- XmlReader.java	12 Mar 2004 15:49:49 -0000	1.2
***************
*** 11,15 ****
  
  package com.memoire.xml;
- import  com.memoire.xml.*;
  
  import java.util.*;
--- 11,14 ----
***************
*** 24,55 ****
  
      Integer I90=new Integer(90);
      Integer I80=new Integer(80);
      Integer I70=new Integer(70);
      Integer I60=new Integer(60);
      Integer I55=new Integer(55);
      Integer I50=new Integer(50);
      Integer I45=new Integer(45);
      Integer I42=new Integer(42);
      Integer I40=new Integer(40);
      Integer I30=new Integer(30);
      Integer I20=new Integer(20);
      Integer I10=new Integer(10);
  
!     ORDER.put("HTML",I90);
  
!     ORDER.put("HEAD",I80);
!     ORDER.put("BODY",I80);
  
!     ORDER.put("APPLET",I70);
  
!     ORDER.put("DIV",I60);
  
!     ORDER.put("TABLE",I55);
  
!     ORDER.put("TR",I50);
  
!     ORDER.put("TD",I45);
  
!     ORDER.put("P",I42);
  
      ORDER.put("UL",I40);
--- 23,79 ----
  
      Integer I90=new Integer(90);
+     Integer I95=new Integer(95);
      Integer I80=new Integer(80);
+     Integer I75=new Integer(75);
      Integer I70=new Integer(70);
+     Integer I65=new Integer(65);
      Integer I60=new Integer(60);
      Integer I55=new Integer(55);
      Integer I50=new Integer(50);
      Integer I45=new Integer(45);
+     Integer I44=new Integer(44);
+     Integer I43=new Integer(43);
      Integer I42=new Integer(42);
      Integer I40=new Integer(40);
      Integer I30=new Integer(30);
      Integer I20=new Integer(20);
+     Integer I15=new Integer(15);
      Integer I10=new Integer(10);
+     Integer I05=new Integer(05);
  
!     ORDER.put("SCRIPT"    ,I95);
  
!     ORDER.put("HTML"      ,I90);
  
!     ORDER.put("HEAD"      ,I80);
!     ORDER.put("BODY"      ,I80);
  
!     ORDER.put("FRAMESET"  ,I75);
!     ORDER.put("NOFRAMES"  ,I75);
!     ORDER.put("NOSCRIPT"  ,I75);
  
!     ORDER.put("FRAME"     ,I70);
  
!     ORDER.put("APPLET"    ,I65);
  
!     ORDER.put("DIV"       ,I60);
!     ORDER.put("BLOCKQUOTE",I60);
  
!     ORDER.put("TABLE"     ,I55);
! 
!     ORDER.put("TR"        ,I50);
! 
!     ORDER.put("TD"        ,I45);
! 
!     ORDER.put("FONT"      ,I44);
! 
!     ORDER.put("H1",I43);
!     ORDER.put("H2",I43);
!     ORDER.put("H3",I43);
!     ORDER.put("H4",I43);
!     ORDER.put("H5",I43);
!     ORDER.put("H6",I43);
! 
!     ORDER.put("P" ,I42);
  
      ORDER.put("UL",I40);
***************
*** 58,65 ****
      ORDER.put("LI",I20);
  
!     ORDER.put("A",I10);
!     ORDER.put("IMG",I10);
!     ORDER.put("B",I10);
!     ORDER.put("I",I10);
    }
  
--- 82,93 ----
      ORDER.put("LI",I20);
  
!     ORDER.put("A" ,I15);
! 
!     ORDER.put("EM",I10);
!     ORDER.put("B" ,I10);
!     ORDER.put("I" ,I10);
! 
!     ORDER.put("IMG"  ,I05);
!     ORDER.put("PARAM",I65);
    }
  
***************
*** 93,97 ****
    public void startElement(String _tag)
    {
!     //System.err.println("START "+_tag);
  
      XmlNode n=new XmlNode();
--- 121,125 ----
    public void startElement(String _tag)
    {
!     // System.err.println("START "+_tag);
  
      XmlNode n=new XmlNode();
***************
*** 103,107 ****
      {
        if(  (mode_==XmlParser.HTML)
! 	 &&current_.tag_.equals(_tag)&&!_tag.equals("FONT"))
  	missingTag(_tag);
      }
--- 131,137 ----
      {
        if(  (mode_==XmlParser.HTML)
! 	 &&current_.tag_.equals(_tag)
! 	 &&!_tag.equals("FONT")
! 	 &&!_tag.equals("FRAMESET"))
  	missingTag(_tag);
      }
***************
*** 115,123 ****
    {
      if(  !_tag.equals("P")
         &&!_tag.equals("LI")
         &&!_tag.equals("OPTION")
         &&!_tag.equals("PARAM")
         &&!_tag.equals("A"))
!       System.err.println("MISSING END: "+_tag);
  
      endElement(_tag);
--- 145,154 ----
    {
      if(  !_tag.equals("P")
+        &&!_tag.equals("BLOCKQUOTE")
         &&!_tag.equals("LI")
         &&!_tag.equals("OPTION")
         &&!_tag.equals("PARAM")
         &&!_tag.equals("A"))
!       System.err.println("XRD: missing end "+_tag);
  
      endElement(_tag);
***************
*** 128,132 ****
      if(nodes_.size()==0)
      {
!       System.err.println("END NEEDED "+_tag);
        return;
      }
--- 159,163 ----
      if(nodes_.size()==0)
      {
!       System.err.println("XRD: end needed "+_tag);
        return;
      }
***************
*** 134,137 ****
--- 165,170 ----
      XmlNode n=(XmlNode)nodes_.peek();
  
+     //if(n.tag_.equals("item")) System.err.println(n);
+ 
      if(_tag.equals(n.tag_))
      {
***************
*** 177,181 ****
        else
        {
! 	error("block: "+n.tag_+" /"+_tag);
  	//dump();
        }
--- 210,214 ----
        else
        {
! 	error("XRD: block "+n.tag_+" /"+_tag);
  	//dump();
        }
***************
*** 209,213 ****
    public void error(String _message)
    {
!     System.err.println("ERROR "+_message+" ["+lineno_+":"+charno_+"]");
      //System.exit(1);
    }
--- 242,246 ----
    public void error(String _message)
    {
!     System.err.println("XRD: error "+_message+" ["+lineno_+":"+charno_+"]");
      //System.exit(1);
    }

[Fudaa-cvs-commit] fudaa_devel/ctulu/src/com/memoire/xml XmlListener.java,1.1,1.2 XmlNode.java,1.1,1

https://gitlab.com/fudaa

[Fudaa-cvs-commit] fudaa_devel/ctulu/src/com/memoire/xml XmlListener.java,1.1,1.2 XmlNode.java,1.1,1.2 XmlParser.java,1.1,1.2 XmlReader.java,1.1,1.2