[Xpg-xml-commits] CVS: edu/iicm/xpg/statemachine InitInitializeStateMachine.java,1.1,1.2 InitParser.java,1.1,1.2 Initializer.java,1.2,1.3 Parser.java,1.2,1.3

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

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

Modified Files:
	InitInitializeStateMachine.java InitParser.java 
	Initializer.java Parser.java 
Log Message:
function initialize update


Index: InitInitializeStateMachine.java
===================================================================
RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/statemachine/InitInitializeStateMachine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InitInitializeStateMachine.java	14 Feb 2002 17:53:48 -0000	1.1
--- InitInitializeStateMachine.java	22 Feb 2002 13:14:34 -0000	1.2
***************
*** 94,110 ****
    }
  
- 
- //----------------------------------------------------------------------
- /**
-  * @param filename a file
-  * @return
-  * @deprecated this function uses the wrong param list 
-  */
- 
-   public void initialize(String filename)
-   {
-     System.err.println("void initialize(String filename) is DEPRICATED!");
-   }
- 
  //----------------------------------------------------------------------
  /**
--- 94,97 ----

Index: InitParser.java
===================================================================
RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/statemachine/InitParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InitParser.java	14 Feb 2002 17:53:48 -0000	1.1
--- InitParser.java	22 Feb 2002 13:14:34 -0000	1.2
***************
*** 40,43 ****
--- 40,46 ----
    protected Initializer initializer_;
  
+   protected final static String[]  DEFAULT_SEARCH_PATH={"edu.iicm.xpg.transitions"};
+ 
+ 
  //----------------------------------------------------------------------
  /**
***************
*** 48,51 ****
--- 51,56 ----
    {    
      super();
+     DFactory transition_factory = new DFactory(DEFAULT_SEARCH_PATH);
+     data_.putObject(TRANSITION_FATORY, transition_factory);
      config_file_= config_file;
      initializer_ = new InitInitializeStateMachine();
***************
*** 83,102 ****
    {
      return (PrimitiveStateMachine) data_.getObject(STATE_MACHINE);
-   }
- 
- 
- //----------------------------------------------------------------------
- /**
-  * The following state machine is built here:
-  *
-  * @return
-  * @deprecated 
-  * @exception Exception whatever can happen during initialization
-  */
- 
-   public void initialize(String filename)
- //    throws Exception
-   {
-     System.err.println("void initialize(String filename) is DEPRICATED!");
    }
  }
--- 88,91 ----

Index: Initializer.java
===================================================================
RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/statemachine/Initializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Initializer.java	14 Feb 2002 17:57:20 -0000	1.2
--- Initializer.java	22 Feb 2002 13:14:34 -0000	1.3
***************
*** 42,55 ****
    public void initialize(PrimitiveStateMachine statemachine);
    
- 
- //----------------------------------------------------------------------
- /**
-  * @param configfile the configfile
-  * @deprecated By the new funktion intialize white the statemachine as
-  * parameter
-  * @return 
-  */
- 		public void initialize(String configfile);
- 
  //----------------------------------------------------------------------
  /**
--- 42,45 ----

Index: Parser.java
===================================================================
RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/statemachine/Parser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Parser.java	14 Feb 2002 22:27:15 -0000	1.2
--- Parser.java	22 Feb 2002 13:14:34 -0000	1.3
***************
*** 54,58 ****
    protected final static String STATE_MACHINE="doc_state_machine";
    protected final static String TRANSITION_FATORY="transition_factory";
-   protected final static String[]  DEFAULT_SEARCH_PATH={"edu.iicm.xpg.transitions.simple"};
  
  //----------------------------------------------------------------------
--- 54,57 ----
***************
*** 63,68 ****
    {
      data_ = new DataObject();
-     DFactory transition_factory = new DFactory(DEFAULT_SEARCH_PATH);
-     data_.putObject(TRANSITION_FATORY, transition_factory);
      try
      {
--- 62,65 ----