=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/elimi.java,v retrieving revision 1.2 retrieving revision 1.9 diff -u -p -r1.2 -r1.9 --- OpenXM/src/OpenMath/elimi.java 1999/11/21 20:38:41 1.2 +++ OpenXM/src/OpenMath/elimi.java 2001/01/28 19:43:16 1.9 @@ -1,8 +1,8 @@ /** - * $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.8 2001/01/28 19:17:23 tam Exp $ */ -import JP.ac.kobe_u.math.tam.OpenXM.*; +import ORG.openxm.tam.*; import java.applet.*; import java.awt.event.*; import java.awt.*; @@ -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.err.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)) { @@ -204,25 +198,28 @@ class elimi extends Applet implements ActionListener,R } public void start(){ - System.out.println("Connecting to "+ host + System.err.println("Connecting to "+ host +"("+ ControlPort +","+ DataPort +")"); try{ Runtime runtime = Runtime.getRuntime(); + //Process proc = runtime.exec("xterm -name test"); + //runtime.getInputstream(); + //runtime.getOutput(); + //runtime.exec("sh -c \"/home/tam/work/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 +"\""); + runtime.exec("xterm -e ox -ox /home/tam/work/OpenXM/bin/ox_sm1 -data "+ DataPort +" -control "+ ControlPort ); - 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); - 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)); + System.err.println("Connected."); + oxm.send(new CMO_STRING("(cohom.sm1) run ;\n")); + oxm.send(new SM(SM.SM_executeStringByLocalParser)); thread = new Thread(this); thread.start(); }catch(Exception e){ - System.out.println("failed."); + System.err.println("failed."); stop(); } } @@ -256,7 +253,7 @@ class elimi extends Applet implements ActionListener,R for(int i=0;i