=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/elimi.java,v retrieving revision 1.2 retrieving revision 1.5 diff -u -p -r1.2 -r1.5 --- OpenXM/src/OpenMath/elimi.java 1999/11/21 20:38:41 1.2 +++ OpenXM/src/OpenMath/elimi.java 2000/04/02 19:24:40 1.5 @@ -1,5 +1,5 @@ /** - * $OpenXM: OpenXM/src/OpenMath/elimi.java,v 1.1 1999/11/10 21:25:48 tam Exp $ + * $OpenXM: OpenXM/src/OpenMath/elimi.java,v 1.4 2000/03/16 09:14:52 tam Exp $ */ import JP.ac.kobe_u.math.tam.OpenXM.*; @@ -102,20 +102,12 @@ class elimi extends Applet implements ActionListener,R public void run(){ // for debug try{ while(true){ - CMO tmp; + OXmessage tmp; Thread.yield(); - switch(oxm.receiveOXtag()){ - case OpenXM.OX_COMMAND: - oxm.receiveSM(); - break; - - case OpenXM.OX_DATA: - tmp = oxm.receiveCMO(); - System.out.println("=> "+ tmp); - break; - } + tmp = oxm.receive(); + System.out.println("=> "+ tmp); } }catch(java.io.IOException e){} } @@ -183,10 +175,12 @@ class elimi extends Applet implements ActionListener,R com += ")] gb"; debug("command: "+ com); - oxm.sendCMO(new CMO_STRING(com)); - oxm.sendSM(new SM(SM.SM_executeStringByLocalParser)); - oxm.sendSM(new SM(SM.SM_popString)); - }catch(java.io.IOException e){} + oxm.send(new CMO_STRING(com)); + oxm.send(new SM(SM.SM_executeStringByLocalParser)); + oxm.send(new SM(SM.SM_popString)); + }catch(java.io.IOException e){ + }catch(MathcapViolation e){ + } } /* if ("first".equals(arg)) { @@ -210,14 +204,17 @@ class elimi extends Applet implements ActionListener,R try{ Runtime runtime = Runtime.getRuntime(); - runtime.exec("/home/tam/OpenXM/lib/sm1/bin/oxlog /usr/X11R6/bin/xterm -icon -e /home/tam/OpenXM/lib/sm1/bin/ox -ox /home/tam/OpenXM/lib/sm1/bin/ox_sm1_forAsir -data "+ DataPort +" -control "+ ControlPort); + runtime.exec("sh -c \"xterm -name $OpenXM_HOME\""); + //runtime.getInputstream(); + //runtime.getOutput(); + //runtime.exec("sh -c \"/home/tam/OpenXM/lib/sm1/bin/oxlog /usr/X11R6/bin/xterm -name echo ${OpenXM_HOME} /home/tam/OpenXM/lib/sm1/bin/ox -ox /home/tam/OpenXM/lib/sm1/bin/ox_sm1_forAsir -data "+ DataPort +" -control "+ ControlPort +"\""); Thread.sleep(3000); oxm = new OpenXM(host,ControlPort,DataPort); System.out.println("Connected."); - oxm.sendCMO(new CMO_STRING("(cohom.sm1) run ;\n")); - oxm.sendSM(new SM(SM.SM_executeStringByLocalParser)); + oxm.send(new CMO_STRING("(cohom.sm1) run ;\n")); + oxm.send(new SM(SM.SM_executeStringByLocalParser)); thread = new Thread(this); thread.start();