[Htmlparser-cvs] htmlparser/src/org/htmlparser/lexer/nodes RemarkNode.java,1.10,1.11 StringNode.java,1.11,1.12 TagNode.java,1.20,1.21

[<der...@us...>]

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/nodes
In directory sc8-pr-cvs1:/tmp/cvs-serv16662/lexer/nodes

Modified Files:
	RemarkNode.java StringNode.java TagNode.java 
Log Message:
Remove deprecated method calls:
elementBegin()->getStartPosition()
elementEnd()->getEndPosition()



Index: RemarkNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/nodes/RemarkNode.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RemarkNode.java	26 Oct 2003 19:46:18 -0000	1.10
--- RemarkNode.java	1 Nov 2003 01:36:56 -0000	1.11
***************
*** 62,67 ****
          String ret;
  
!         start = elementBegin () + 4;
!         end = elementEnd () - 3;
          if (start >= end)
              ret = "";
--- 62,67 ----
          String ret;
  
!         start = getStartPosition () + 4;
!         end = getEndPosition () - 3;
          if (start >= end)
              ret = "";
***************
*** 77,82 ****
      }
      
!     public String toHtml() {
!         return (mPage.getText (elementBegin (), elementEnd ()));
      }
      /**
--- 77,83 ----
      }
      
!     public String toHtml()
!     {
!         return (mPage.getText (getStartPosition (), getEndPosition ()));
      }
      /**
***************
*** 88,93 ****
          Cursor end;
  
!         start = new Cursor (getPage (), elementBegin ());
!         end = new Cursor (getPage (), elementEnd ());
          return ("Rem (" + start.toString () + "," + end.toString () + "): " + getText ());
      }
--- 89,94 ----
          Cursor end;
  
!         start = new Cursor (getPage (), getStartPosition ());
!         end = new Cursor (getPage (), getEndPosition ());
          return ("Rem (" + start.toString () + "," + end.toString () + "): " + getText ());
      }

Index: StringNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/nodes/StringNode.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StringNode.java	26 Oct 2003 19:46:18 -0000	1.11
--- StringNode.java	1 Nov 2003 01:36:56 -0000	1.12
***************
*** 90,94 ****
      public String toHtml ()
      {
!         return (mPage.getText (elementBegin (), elementEnd ()));
      }
  
--- 90,94 ----
      public String toHtml ()
      {
!         return (mPage.getText (getStartPosition (), getEndPosition ()));
      }
  
***************
*** 98,103 ****
          Cursor end;
  
!         start = new Cursor (getPage (), elementBegin ());
!         end = new Cursor (getPage (), elementEnd ());
          return ("Txt (" + start.toString () + "," + end.toString () + "): " + getText ());
      }
--- 98,103 ----
          Cursor end;
  
!         start = new Cursor (getPage (), getStartPosition ());
!         end = new Cursor (getPage (), getEndPosition ());
          return ("Txt (" + start.toString () + "," + end.toString () + "): " + getText ());
      }

Index: TagNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/nodes/TagNode.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TagNode.java	27 Oct 2003 02:18:04 -0000	1.20
--- TagNode.java	1 Nov 2003 01:36:56 -0000	1.21
***************
*** 577,582 ****
              output = (TagNode)lexer.nextNode ();
              mPage = output.getPage ();
!             nodeBegin = output.elementBegin ();
!             nodeEnd = output.elementEnd ();
              mAttributes = output.getAttributesEx ();
          }
--- 577,582 ----
              output = (TagNode)lexer.nextNode ();
              mPage = output.getPage ();
!             nodeBegin = output.getStartPosition ();
!             nodeEnd = output.getEndPosition ();
              mAttributes = output.getAttributesEx ();
          }
***************
*** 642,647 ****
          else
              type = "Tag";
!         start = new Cursor (getPage (), elementBegin ());
!         end = new Cursor (getPage (), elementEnd ());
          return (type + " (" + start.toString () + "," + end.toString () + "): " + getText ());
      }
--- 642,647 ----
          else
              type = "Tag";
!         start = new Cursor (getPage (), getStartPosition ());
!         end = new Cursor (getPage (), getEndPosition ());
          return (type + " (" + start.toString () + "," + end.toString () + "): " + getText ());
      }