|
From: G?nther B. <br...@us...> - 2002-03-08 19:04:41
|
Update of /cvsroot/xpg-xml/edu/iicm/xpg/statemachine
In directory usw-pr-cvs1:/tmp/cvs-serv1393/statemachine
Modified Files:
InitInitializeStateMachine.java Parser.java XMLHandler.java
Log Message:
schema for test0 added; bug removed; generating output modified
Index: InitInitializeStateMachine.java
===================================================================
RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/statemachine/InitInitializeStateMachine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InitInitializeStateMachine.java 28 Feb 2002 06:40:19 -0000 1.3
--- InitInitializeStateMachine.java 8 Mar 2002 19:04:38 -0000 1.4
***************
*** 260,268 ****
// STATE_BEGINSTATE
state_machine_.registerTransition(new XMLInput(Const.XML_END_TAG,XML_BEGINSTATE),
! new PrimitiveTransition(),
STATE_BEGINSTATE,
STATE_TRANSITION_DEF);
! state_machine_.registerDefaultTransition(new StoreDataTransition(StoreDataTransition.BEGINSTATE),
STATE_BEGINSTATE,
STATE_BEGINSTATE);
--- 260,268 ----
// STATE_BEGINSTATE
state_machine_.registerTransition(new XMLInput(Const.XML_END_TAG,XML_BEGINSTATE),
! new StoreDataTransition(StoreDataTransition.BEGINSTATE),
STATE_BEGINSTATE,
STATE_TRANSITION_DEF);
! state_machine_.registerDefaultTransition(new PrimitiveTransition(),
STATE_BEGINSTATE,
STATE_BEGINSTATE);
***************
*** 270,278 ****
// STATE_NEXTSTATE
state_machine_.registerTransition(new XMLInput(Const.XML_END_TAG,XML_NEXTSTATE),
! new PrimitiveTransition(),
STATE_NEXTSTATE,
STATE_TRANSITION_DEF);
! state_machine_.registerDefaultTransition(new StoreDataTransition(StoreDataTransition.NEXTSTATE),
STATE_NEXTSTATE,
STATE_NEXTSTATE);
--- 270,278 ----
// STATE_NEXTSTATE
state_machine_.registerTransition(new XMLInput(Const.XML_END_TAG,XML_NEXTSTATE),
! new StoreDataTransition(StoreDataTransition.NEXTSTATE),
STATE_NEXTSTATE,
STATE_TRANSITION_DEF);
! state_machine_.registerDefaultTransition(new PrimitiveTransition(),
STATE_NEXTSTATE,
STATE_NEXTSTATE);
***************
*** 280,288 ****
// STATE_ELEMENT
state_machine_.registerTransition(new XMLInput(Const.XML_END_TAG,XML_ELEMENT),
! new PrimitiveTransition(),
STATE_ELEMENT,
STATE_TRANSITION_DEF);
! state_machine_.registerDefaultTransition(new StoreDataTransition(StoreDataTransition.ELEMENT),
STATE_ELEMENT,
STATE_ELEMENT);
--- 280,288 ----
// STATE_ELEMENT
state_machine_.registerTransition(new XMLInput(Const.XML_END_TAG,XML_ELEMENT),
! new StoreDataTransition(StoreDataTransition.ELEMENT),
STATE_ELEMENT,
STATE_TRANSITION_DEF);
! state_machine_.registerDefaultTransition(new PrimitiveTransition(),
STATE_ELEMENT,
STATE_ELEMENT);
***************
*** 290,298 ****
// STATE_CLASSNAME
state_machine_.registerTransition(new XMLInput(Const.XML_END_TAG,XML_CLASSNAME),
! new PrimitiveTransition(),
STATE_CLASSNAME,
STATE_TRANSITION_DEF);
! state_machine_.registerDefaultTransition(new StoreDataTransition(StoreDataTransition.CLASSNAME),
STATE_CLASSNAME,
STATE_CLASSNAME);
--- 290,298 ----
// STATE_CLASSNAME
state_machine_.registerTransition(new XMLInput(Const.XML_END_TAG,XML_CLASSNAME),
! new StoreDataTransition(StoreDataTransition.CLASSNAME),
STATE_CLASSNAME,
STATE_TRANSITION_DEF);
! state_machine_.registerDefaultTransition(new PrimitiveTransition(),
STATE_CLASSNAME,
STATE_CLASSNAME);
Index: Parser.java
===================================================================
RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/statemachine/Parser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Parser.java 28 Feb 2002 06:40:19 -0000 1.4
--- Parser.java 8 Mar 2002 19:04:38 -0000 1.5
***************
*** 98,102 ****
try
{
! System.out.println("Begin Parsing");
FileReader file_reader = new FileReader(input_file);
reader_.parse(new InputSource(file_reader));
--- 98,102 ----
try
{
! System.err.println("Begin Parsing");
FileReader file_reader = new FileReader(input_file);
reader_.parse(new InputSource(file_reader));
Index: XMLHandler.java
===================================================================
RCS file: /cvsroot/xpg-xml/edu/iicm/xpg/statemachine/XMLHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLHandler.java 28 Feb 2002 06:40:19 -0000 1.3
--- XMLHandler.java 8 Mar 2002 19:04:38 -0000 1.4
***************
*** 104,108 ****
try
{
! data_.topElementObject().setElementValue(new String(chars));
state_machine_.input(new XMLInput(Const.XML_CHARS,chars,start,length));
}
--- 104,108 ----
try
{
! data_.topElementObject().setElementValue(new String(chars, start, length));
state_machine_.input(new XMLInput(Const.XML_CHARS,chars,start,length));
}
|