From: G?nther B. <br...@us...> - 2002-02-03 22:10:59
|
Update of /cvsroot/xpg-xml/edu/iicm/xpg/statemachine In directory usw-pr-cvs1:/tmp/cvs-serv16329 Modified Files: InitStateMachine.java Log Message: searchpath added Index: InitStateMachine.java =================================================================== RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/statemachine/InitStateMachine.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** InitStateMachine.java 2002/01/31 07:34:46 1.2 --- InitStateMachine.java 2002/02/03 22:10:57 1.3 *************** *** 31,34 **** --- 31,35 ---- import edu.iicm.xpg.transitions.StoreDataTransition; import edu.iicm.xpg.transitions.RegisterTransitionTransition; + import edu.iicm.xpg.transitions.SetSearchPathTransition; import org.dinopolis.util.DFactory; *************** *** 57,61 **** public class InitStateMachine extends DefaultHandler implements Initializer { - // private FileReader file_reader; protected XMLReader xml_reader; --- 58,61 ---- *************** *** 68,71 **** --- 68,72 ---- // XML tags protected final static String XML_STM_CONFIG = "statemachine"; + protected final static String XML_PATH_DEF = "path"; protected final static String XML_STATE_LIST = "states"; protected final static String XML_START_STATE_DEF = "startstate"; *************** *** 81,84 **** --- 82,86 ---- protected final static String STATE_TOP_LEVEL_FILE = "file top"; protected final static String STATE_TOP_LEVEL_DOC_TYPE = "doctype top"; + protected final static String STATE_PATH_DEF = "path def"; protected final static String STATE_STATE_LIST = "state list"; protected final static String STATE_START_STATE_DEF = "start state def"; *************** *** 104,108 **** DFactory transition_factory = new DFactory(); // FIXXME: searchpath should be read from configfile ! transition_factory.setSearchPath(new String[]{"edu.iicm.xpg.transitions"}); data_.putObject("transition_factory", transition_factory); --- 106,110 ---- DFactory transition_factory = new DFactory(); // FIXXME: searchpath should be read from configfile ! // transition_factory.setSearchPath(new String[]{"edu.iicm.xpg.transitions"}); data_.putObject("transition_factory", transition_factory); *************** *** 309,312 **** --- 311,315 ---- dtd_state_machine_.registerState(new PrimitiveState(),STATE_TOP_LEVEL_FILE); dtd_state_machine_.registerState(new PrimitiveState(),STATE_TOP_LEVEL_DOC_TYPE); + dtd_state_machine_.registerState(new PrimitiveState(),STATE_PATH_DEF); dtd_state_machine_.registerState(new PrimitiveState(),STATE_STATE_LIST); dtd_state_machine_.registerState(new PrimitiveState(),STATE_START_STATE_DEF); *************** *** 345,348 **** --- 348,356 ---- STATE_TOP_LEVEL_FILE); + dtd_state_machine_.registerTransition(new XMLInput(Const.XML_START_TAG,XML_PATH_DEF), + new PrimitiveTransition(), + STATE_TOP_LEVEL_DOC_TYPE, + STATE_PATH_DEF); + dtd_state_machine_.registerTransition(new XMLInput(Const.XML_START_TAG,XML_STATE_LIST), new PrimitiveTransition(), *************** *** 358,361 **** --- 366,379 ---- STATE_TOP_LEVEL_DOC_TYPE, STATE_TOP_LEVEL_DOC_TYPE); + + // STATE_PATH_DEF + dtd_state_machine_.registerTransition(new XMLInput(Const.XML_END_TAG,XML_PATH_DEF), + new PrimitiveTransition(), + STATE_PATH_DEF, + STATE_TOP_LEVEL_DOC_TYPE); + + dtd_state_machine_.registerDefaultTransition(new SetSearchPathTransition(), + STATE_PATH_DEF, + STATE_PATH_DEF); // STATE_STATE_LIST |