[Rails-commits] 18xx/rails/util Tag.java, 1.7, 1.8 MakeGameTileSets.java, 1.6, 1.7

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/util
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21068/rails/util

Modified Files:
	Tag.java MakeGameTileSets.java 
Log Message:
Cleanups, annotations, formatting

Index: MakeGameTileSets.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/MakeGameTileSets.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MakeGameTileSets.java	4 Jun 2008 19:00:39 -0000	1.6
--- MakeGameTileSets.java	11 Dec 2008 20:12:30 -0000	1.7
***************
*** 2,11 ****
  package rails.util;
  
! import java.io.*;
  import java.util.*;
  
! import javax.xml.parsers.*;
! import javax.xml.transform.*;
! import javax.xml.transform.dom.*;
  import javax.xml.transform.stream.StreamResult;
  
--- 2,13 ----
  package rails.util;
  
! import java.io.File;
! import java.io.FileOutputStream;
  import java.util.*;
  
! import javax.xml.parsers.DocumentBuilder;
! import javax.xml.parsers.DocumentBuilderFactory;
! import javax.xml.transform.TransformerFactory;
! import javax.xml.transform.dom.DOMSource;
  import javax.xml.transform.stream.StreamResult;
  
***************
*** 46,50 ****
                  }
  
!                 new MakeGameTileSets((String[]) games.toArray(new String[0]));
  
              } else {
--- 48,52 ----
                  }
  
!                 new MakeGameTileSets(games.toArray(new String[0]));
  
              } else {

Index: Tag.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/Tag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Tag.java	2 Dec 2008 20:29:15 -0000	1.7
--- Tag.java	11 Dec 2008 20:12:30 -0000	1.8
***************
*** 3,10 ****
  
  import java.io.IOException;
! import java.util.ArrayList;
! import java.util.HashMap;
! import java.util.List;
! import java.util.Map;
  
  import javax.xml.parsers.*;
--- 3,7 ----
  
  import java.io.IOException;
! import java.util.*;
  
  import javax.xml.parsers.*;
***************
*** 14,20 ****
  import org.xml.sax.SAXException;
  
! import rails.game.ConfigurationException;
! import rails.game.Game;
! import rails.game.GameOption;
  
  /**
--- 11,15 ----
  import org.xml.sax.SAXException;
  
! import rails.game.*;
  
  /**
***************
*** 23,29 ****
   * The methods of this class intend to replace the corresponding methods in
   * XmlUtils.
!  * 
   * @author Erik Vos
!  * 
   */
  public class Tag {
--- 18,24 ----
   * The methods of this class intend to replace the corresponding methods in
   * XmlUtils.
!  *
   * @author Erik Vos
!  *
   */
  public class Tag {
***************
*** 52,56 ****
      /**
       * Return all child Elements with a given name of an Element.
!      * 
       * @param element
       * @param tagName
--- 47,51 ----
      /**
       * Return all child Elements with a given name of an Element.
!      *
       * @param element
       * @param tagName
***************
*** 67,71 ****
      /**
       * Return the (first) child Element with a given name from an Element.
!      * 
       * @param element
       * @param tagName
--- 62,66 ----
      /**
       * Return the (first) child Element with a given name from an Element.
!      *
       * @param element
       * @param tagName
***************
*** 194,198 ****
       * </code>
       * <p> For variant names, the fixed option name "variant" is used.
!      * 
       * @param element
       * @return
--- 189,193 ----
       * </code>
       * <p> For variant names, the fixed option name "variant" is used.
!      *
       * @param element
       * @return
***************
*** 291,295 ****
       * Opens and parses an xml file. Searches the root level of the file for an
       * element with the supplied name.
!      * 
       * @param fileName the name of the file to open
       * @param tagName the name of the top-level tag to find
--- 286,290 ----
       * Opens and parses an xml file. Searches the root level of the file for an
       * element with the supplied name.
!      *
       * @param fileName the name of the file to open
       * @param tagName the name of the top-level tag to find
***************
*** 299,303 ****
       * with the given name.
       */
!     public static Tag findTopTagInFile(String filename, List directories,
              String tagName) throws ConfigurationException {
          Document doc = null;
--- 294,298 ----
       * with the given name.
       */
!     public static Tag findTopTagInFile(String filename, List<String> directories,
              String tagName) throws ConfigurationException {
          Document doc = null;
***************
*** 348,351 ****
--- 343,347 ----
       * @return
       */
+     @Deprecated
      public Element getElement() {
          return element;