[Htmlparser-cvs] htmlparser/src/org/htmlparser/beans BeanyBaby.java,1.22,1.23 LinkBean.java,1.29,1.30

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

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20668

Modified Files:
	BeanyBaby.java LinkBean.java 
Log Message:
Fix bean example, stop sharing connections.



Index: LinkBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/LinkBean.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** LinkBean.java	16 May 2004 17:59:57 -0000	1.29
--- LinkBean.java	12 Mar 2005 21:39:45 -0000	1.30
***************
*** 36,44 ****
  
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
  import org.htmlparser.tags.LinkTag;
  import org.htmlparser.util.EncodingChangeException;
  import org.htmlparser.util.ParserException;
- import org.htmlparser.visitors.ObjectFindingVisitor;
  
  /**
--- 36,46 ----
  
  import org.htmlparser.Node;
+ import org.htmlparser.NodeFilter;
  import org.htmlparser.Parser;
+ import org.htmlparser.filters.NodeClassFilter;
  import org.htmlparser.tags.LinkTag;
  import org.htmlparser.util.EncodingChangeException;
+ import org.htmlparser.util.NodeList;
  import org.htmlparser.util.ParserException;
  
  /**
***************
*** 84,113 ****
      //
  
!     protected URL[] extractLinks (String url) throws ParserException
      {
!         Parser parser;
!         ObjectFindingVisitor visitor;
          Vector vector;
          LinkTag link;
          URL[] ret;
  
!         parser = new Parser (url);
!         visitor = new ObjectFindingVisitor (LinkTag.class);
          try
          {
!             parser.visitAllNodesWith (visitor);
          }
          catch (EncodingChangeException ece)
          {
!             parser.reset ();
!             visitor = new ObjectFindingVisitor (LinkTag.class);
!             parser.visitAllNodesWith (visitor);
          }
-         Node [] nodes = visitor.getTags();
          vector = new Vector();
!         for (int i = 0; i < nodes.length; i++)
              try
              {
!                 link = (LinkTag)nodes[i];
                  vector.add(new URL (link.getLink ()));
              }
--- 86,113 ----
      //
  
!     protected URL[] extractLinks () throws ParserException
      {
!         NodeFilter filter;
!         NodeList list;
          Vector vector;
          LinkTag link;
          URL[] ret;
  
!         mParser.reset ();
!         filter = new NodeClassFilter (LinkTag.class);
          try
          {
!             list = mParser.extractAllNodesThatMatch (filter);
          }
          catch (EncodingChangeException ece)
          {
!             mParser.reset ();
!             list = mParser.extractAllNodesThatMatch (filter);
          }
          vector = new Vector();
!         for (int i = 0; i < list.size (); i++)
              try
              {
!                 link = (LinkTag)list.elementAt (i);
                  vector.add(new URL (link.getLink ()));
              }
***************
*** 190,194 ****
              try
              {
!                 urls = extractLinks (getURL ());
                  if (!equivalent (mLinks, urls))
                  {
--- 190,194 ----
              try
              {
!                 urls = extractLinks ();
                  if (!equivalent (mLinks, urls))
                  {
***************
*** 213,217 ****
              try
              {
!                 mLinks = extractLinks (getURL ());
                  mPropertySupport.firePropertyChange (PROP_LINKS_PROPERTY, null, mLinks);
              }
--- 213,217 ----
              try
              {
!                 mLinks = extractLinks ();
                  mPropertySupport.firePropertyChange (PROP_LINKS_PROPERTY, null, mLinks);
              }

Index: BeanyBaby.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/BeanyBaby.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** BeanyBaby.java	13 Feb 2005 20:36:03 -0000	1.22
--- BeanyBaby.java	12 Mar 2005 21:39:45 -0000	1.23
***************
*** 85,89 ****
       * This method ties the two beans together on the same connection.
       * Whenever a property changes on one bean, make sure the URL properties
!      * agree by setting the connection from one to the other.
       * @param event The event describing the event source
       * and the property that has changed.
--- 85,89 ----
       * This method ties the two beans together on the same connection.
       * Whenever a property changes on one bean, make sure the URL properties
!      * agree by setting the URL from one to the other.
       * @param event The event describing the event source
       * and the property that has changed.
***************
*** 98,107 ****
          {
              if (!mLinkBean.getURL ().equals (mStringBean.getURL ()))
!                 mStringBean.setConnection (mLinkBean.getConnection ());
          }
          else if (source == mStringBean)
          {
              if (!mStringBean.getURL ().equals (mLinkBean.getURL ()))
!                 mLinkBean.setConnection (mStringBean.getConnection ());
              // check for menu status changes
              name = event.getPropertyName ();
--- 98,107 ----
          {
              if (!mLinkBean.getURL ().equals (mStringBean.getURL ()))
!                 mStringBean.setURL (mLinkBean.getURL ());
          }
          else if (source == mStringBean)
          {
              if (!mStringBean.getURL ().equals (mLinkBean.getURL ()))
!                 mLinkBean.setURL (mStringBean.getURL ());
              // check for menu status changes
              name = event.getPropertyName ();
***************
*** 369,373 ****
          BeanyBaby bb = new BeanyBaby ();
          bb.setVisible (true);
!         bb.setURL ("http://www.slashdot.org");
      }
  }
--- 369,376 ----
          BeanyBaby bb = new BeanyBaby ();
          bb.setVisible (true);
!         if (0 >= args.length)
!             bb.setURL ("http://www.slashdot.org");
!         else
!             bb.setURL (args[0]);
      }
  }