xpg-xml-commits

[Stefan T. <th...@us...>]

Update of /cvsroot/xpg-xml/edu/iicm/xpg/generator
In directory usw-pr-cvs1:/tmp/cvs-serv31562/generator

Modified Files:
	DocumentGenerator.java Generator.java 
Log Message:
new transition interface


Index: DocumentGenerator.java
===================================================================
RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/generator/DocumentGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DocumentGenerator.java	15 May 2002 12:24:39 -0000	1.9
--- DocumentGenerator.java	21 May 2002 16:59:30 -0000	1.10
***************
*** 26,29 ****
--- 26,31 ----
  import java.io.File;
  import java.io.IOException;
+ import org.xml.sax.SAXException;
+ 
  
  import edu.iicm.xpg.util.Debug;
***************
*** 59,70 ****
        Debug.setWriterToFile("./documentgenerator.log");
        Debug.setMessageFormat("DEBUG %level%: \"%message%\"");
!       Debug.addLevelsToPrint(Debug.WARNING_LEVEL+" "+ Debug.TRANSITION_LEVEL+" "+Debug.PARSER_LEVEL +" "+Debug.VERBOSE_LEVEL );
      }
  
! 
      Generator generator = new Generator( args[0] );
      generator.setFeatures();
      generator.setHandlers();
      generator.parseFile( args[1] );
  
      System.exit(0);
--- 61,88 ----
        Debug.setWriterToFile("./documentgenerator.log");
        Debug.setMessageFormat("DEBUG %level%: \"%message%\"");
!       Debug.addLevelsToPrint(Debug.WARNING_LEVEL+" "+ Debug.TRANSITION_LEVEL+" "+Debug.PARSER_LEVEL);
      }
  
!     try
!     {
      Generator generator = new Generator( args[0] );
      generator.setFeatures();
      generator.setHandlers();
      generator.parseFile( args[1] );
+     }
+     catch (SAXException exc)
+     {
+       Exception exception = (Exception)exc.getException();
+       if ( exception != null)
+         exception.printStackTrace();
+       else 
+         exc.printStackTrace();
+         System.exit(-1);
+      }
+     catch (IOException exc)
+     {
+       exc.printStackTrace();
+       System.exit(-1);
+     }
  
      System.exit(0);

Index: Generator.java
===================================================================
RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/generator/Generator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Generator.java	8 Apr 2002 14:13:15 -0000	1.10
--- Generator.java	21 May 2002 16:59:30 -0000	1.11
***************
*** 28,32 ****
--- 28,34 ----
  import edu.iicm.xpg.statemachine.Parser;
  import edu.iicm.xpg.statemachine.Const;
+ import org.xml.sax.SAXException;
  
+ import java.io.IOException;
  import edu.iicm.xpg.util.Debug;
  
***************
*** 51,58 ****
  
    public Generator(String config_file)
    {
      super();
  
!         // set up the statemachine
      if (Debug.DEBUG)
        Debug.println(Debug.VERBOSE_LEVEL,"Setting up State Machine");
--- 53,78 ----
  
    public Generator(String config_file)
+     throws SAXException,IOException
    {
      super();
+     init(config_file);
+   }
  
! //----------------------------------------------------------------------
! /**
!  */  
!   public Generator(String config_file,String xml_reader)
!     throws SAXException,IOException
!   {
!     super(xml_reader);
!     init(config_file);
!   }
! 
! //----------------------------------------------------------------------
! /**
!  */  
!   protected void init(String config_file)
!     throws SAXException,IOException
!   {
      if (Debug.DEBUG)
        Debug.println(Debug.VERBOSE_LEVEL,"Setting up State Machine");
***************
*** 60,64 ****
      initializer_.initialize(state_machine_);
    }
- 
  }
  
--- 80,83 ----