htmlparser-cvs

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

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

Modified Files:
	IteratorImpl.java Translate.java NodeList.java 
	CharacterReference.java LinkProcessor.java ParserUtils.java 
Removed Files:
	CommandLine.java 
Log Message:
Remove unused variables and other fixes exposed by turning on compiler warnings.

Index: CharacterReference.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/CharacterReference.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CharacterReference.java	9 Feb 2004 02:09:45 -0000	1.1
--- CharacterReference.java	31 Jul 2004 16:42:34 -0000	1.2
***************
*** 97,101 ****
  
          ret = new StringBuffer (6 + 8 + 2); // max 8 in string
!         hex = Integer.toHexString ((int)getCharacter ());
          ret.append ("\\u");
          for (int i = hex.length (); i < 4; i++)
--- 97,101 ----
  
          ret = new StringBuffer (6 + 8 + 2); // max 8 in string
!         hex = Integer.toHexString (getCharacter ());
          ret.append ("\\u");
          for (int i = hex.length (); i < 4; i++)

Index: Translate.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/Translate.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** Translate.java	18 Jul 2004 21:31:20 -0000	1.45
--- Translate.java	31 Jul 2004 16:42:33 -0000	1.46
***************
*** 824,828 ****
                                      if (0 == radix)
                                          radix = 10;
!                                     number = number * radix + ((int)character - (int)'0');
                                      break;
                                  case 'A':
--- 824,828 ----
                                      if (0 == radix)
                                          radix = 10;
!                                     number = number * radix + (character - '0');
                                      break;
                                  case 'A':
***************
*** 833,837 ****
                                  case 'F':
                                      if (16 == radix)
!                                         number = number * radix + ((int)character - (int)'A' + 10);
                                      else
                                          done = true;
--- 833,837 ----
                                  case 'F':
                                      if (16 == radix)
!                                         number = number * radix + (character - 'A' + 10);
                                      else
                                          done = true;
***************
*** 844,848 ****
                                  case 'f':
                                      if (16 == radix)
!                                         number = number * radix + ((int)character - (int)'a' + 10);
                                      else
                                          done = true;
--- 844,848 ----
                                  case 'f':
                                      if (16 == radix)
!                                         number = number * radix + (character - 'a' + 10);
                                      else
                                          done = true;
***************
*** 1077,1081 ****
          int length;
          char c;
-         int index;
          CharacterReference candidate;
          StringBuffer ret;
--- 1077,1080 ----

Index: IteratorImpl.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/IteratorImpl.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** IteratorImpl.java	2 Jul 2004 00:49:32 -0000	1.41
--- IteratorImpl.java	31 Jul 2004 16:42:33 -0000	1.42
***************
*** 69,73 ****
      {
          Tag tag;
-         String name;
          Scanner scanner;
          NodeList stack;
--- 69,72 ----

Index: LinkProcessor.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/LinkProcessor.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** LinkProcessor.java	18 Mar 2004 04:04:08 -0000	1.34
--- LinkProcessor.java	31 Jul 2004 16:42:34 -0000	1.35
***************
*** 180,189 ****
       */
      public static boolean isURL (String resourceLocn) {
-         URL url;
          boolean ret;
  
          try
          {
!             url = new URL (resourceLocn);
              ret = true;
          }
--- 180,188 ----
       */
      public static boolean isURL (String resourceLocn) {
          boolean ret;
  
          try
          {
!             new URL (resourceLocn);
              ret = true;
          }

--- CommandLine.java DELETED ---

Index: ParserUtils.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/ParserUtils.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ParserUtils.java	17 Jul 2004 13:45:06 -0000	1.44
--- ParserUtils.java	31 Jul 2004 16:42:34 -0000	1.45
***************
*** 717,721 ****
              {
                  CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!                 Tag endTag = (Tag)beginTag.getEndTag();
  
                  // positions of begin and end tags
--- 717,721 ----
              {
                  CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!                 Tag endTag = beginTag.getEndTag();
  
                  // positions of begin and end tags
***************
*** 842,846 ****
          {
              CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!             Tag endTag = (Tag)beginTag.getEndTag();
  
              // positions of begin and end tags
--- 842,846 ----
          {
              CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!             Tag endTag = beginTag.getEndTag();
  
              // positions of begin and end tags
***************
*** 946,950 ****
              {
                  CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!                 Tag endTag = (Tag)beginTag.getEndTag();
  
                  // positions of begin and end tags
--- 946,950 ----
              {
                  CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!                 Tag endTag = beginTag.getEndTag();
  
                  // positions of begin and end tags
***************
*** 1046,1050 ****
          {
              CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!             Tag endTag = (Tag)beginTag.getEndTag();
  
              // positions of begin and end tags
--- 1046,1050 ----
          {
              CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!             Tag endTag = beginTag.getEndTag();
  
              // positions of begin and end tags
***************
*** 1122,1126 ****
              {
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
!                 Tag jEndTag = (Tag)jStartTag.getEndTag();
                  int jStartTagBegin = jStartTag.getStartPosition ();
                  int jEndTagEnd = jEndTag.getEndPosition ();
--- 1122,1126 ----
              {
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
!                 Tag jEndTag = jStartTag.getEndTag();
                  int jStartTagBegin = jStartTag.getStartPosition ();
                  int jEndTagEnd = jEndTag.getEndPosition ();
***************
*** 1128,1132 ****
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
!                     Tag kEndTag = (Tag)kStartTag.getEndTag();
                      int kStartTagBegin = kStartTag.getStartPosition ();
                      int kEndTagEnd = kEndTag.getEndPosition ();
--- 1128,1132 ----
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
!                     Tag kEndTag = kStartTag.getEndTag();
                      int kStartTagBegin = kStartTag.getStartPosition ();
                      int kEndTagEnd = kEndTag.getEndPosition ();
***************
*** 1162,1166 ****
              {
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
!                 Tag jEndTag = (Tag)jStartTag.getEndTag();
                  int jStartTagBegin = jStartTag.getStartPosition ();
                  int jEndTagEnd = jEndTag.getEndPosition ();
--- 1162,1166 ----
              {
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
!                 Tag jEndTag = jStartTag.getEndTag();
                  int jStartTagBegin = jStartTag.getStartPosition ();
                  int jEndTagEnd = jEndTag.getEndPosition ();
***************
*** 1168,1172 ****
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
!                     Tag kEndTag = (Tag)kStartTag.getEndTag();
                      int kStartTagBegin = kStartTag.getStartPosition ();
                      int kEndTagEnd = kEndTag.getEndPosition ();
--- 1168,1172 ----
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
!                     Tag kEndTag = kStartTag.getEndTag();
                      int kStartTagBegin = kStartTag.getStartPosition ();
                      int kEndTagEnd = kEndTag.getEndPosition ();

Index: NodeList.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/NodeList.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** NodeList.java	22 Jul 2004 02:22:32 -0000	1.55
--- NodeList.java	31 Jul 2004 16:42:33 -0000	1.56
***************
*** 204,208 ****
      public NodeList extractAllNodesThatMatch (NodeFilter filter, boolean recursive)
      {
-         String name;
          Node node;
          NodeList children;
--- 204,207 ----
***************
*** 244,248 ****
          Node node;
          NodeList children;
-         NodeList ret;
  
          for (int i = 0; i < size; )
--- 243,246 ----