===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.38
retrieving revision 1.42
diff -u -p -r1.38 -r1.42
--- OpenXM/src/OpenMath/OMproxy.java	2000/06/14 08:01:08	1.38
+++ OpenXM/src/OpenMath/OMproxy.java	2001/01/30 05:55:13	1.42
@@ -1,12 +1,12 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.37 2000/06/13 14:04:19 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.41 2000/10/11 08:32:13 ohara Exp $
  */
 
-import JP.ac.kobe_u.math.tam.OpenXM.*;
+import ORG.openxm.tam.*;
 import java.util.Stack;
 import java.io.*;
 
-public class OMproxy extends OpenXMserver{
+public class OMproxy extends OpenXMControlServer{
   private Stack stack = new Stack();
   protected boolean debug = false;
   final int version = 200006130;
@@ -15,7 +15,7 @@ public class OMproxy extends OpenXMserver{
     super(hostname,ControlPort,DataPort);
   }
 
-  public void computeProcess(OpenXMconnection stream){
+  public void computeProcess(OpenXMstream stream){
     OM2OXM P = new OM2OXM();
 
     debug("OMproxy started.");
@@ -46,25 +46,29 @@ public class OMproxy extends OpenXMserver{
       System.err.println(e.getMessage());
       e.printStackTrace();
       System.err.println("error occured, and recovering processes seems to be impossible.");
+    }catch(Exception e){
+      System.err.println(e.getMessage());
+      e.printStackTrace();
+      System.err.println("error occured, and recovering processes seems to be impossible.");
     }finally{
-      System.out.println("breaking...");
+      System.err.println("breaking...");
     }
   }
 
   /*
   public void stop(){
-    System.out.println("OMproxy Stoping...");
+    System.err.println("OMproxy Stoping...");
     synchronized(ox){
       //this.stop();
       while(!stack.empty()){
 	stack.pop();
       }
-      System.out.println("OMproxy Stopped");
+      System.err.println("OMproxy Stopped");
     }
   }
   */
 
-  private void SM_popCMO(OpenXMconnection stream) throws java.io.IOException{
+  private void SM_popCMO(OpenXMstream stream) throws java.io.IOException{
     try{
       if(stack.empty()){
 	stream.send(new CMO_NULL());
@@ -114,7 +118,7 @@ public class OMproxy extends OpenXMserver{
     return;
   }
 
-  private void SM_mathcap(OpenXMconnection stream) throws java.io.IOException{
+  private void SM_mathcap(OpenXMstream stream) throws java.io.IOException{
     CMO[] mathcap = new CMO[3];
 
     {
@@ -163,7 +167,7 @@ public class OMproxy extends OpenXMserver{
     debug("push: "+ stack.peek());
   }
 
-  private void SM_setMathCap(OpenXMconnection stream)
+  private void SM_setMathCap(OpenXMstream stream)
        throws java.io.IOException{
     Object mathcap = stack.pop();
 
@@ -173,7 +177,7 @@ public class OMproxy extends OpenXMserver{
     stream.setMathCap((CMO_MATHCAP)mathcap);
   }
 
-  private void StackMachine(SM mesg,OpenXMconnection stream)
+  private void StackMachine(SM mesg,OpenXMstream stream)
        throws java.io.IOException{
     debug("receive: "+mesg);
 
@@ -195,7 +199,7 @@ public class OMproxy extends OpenXMserver{
       break;
 
     default:
-      System.out.println("received "+ mesg);
+      System.err.println("received "+ mesg);
     }
   }
 
@@ -262,11 +266,11 @@ public class OMproxy extends OpenXMserver{
   public static void main(String[] argv){
     String hostname = "localhost";
     int ControlPort = 1200, DataPort = 1300;
-    OpenXMserver ox;
+    OpenXMControlServer ox;
 
     for(int i=0;i<argv.length;i++){
       if(argv[i].equals("-h")){
-        System.out.println("");
+        System.err.println("");
         System.exit(0);
       }else if(argv[i].equals("-host")){
         hostname = argv[++i];
@@ -298,6 +302,6 @@ public class OMproxy extends OpenXMserver{
 
     ox.start();
 
-    System.out.println("breaking...");
+    System.err.println("breaking...");
   }
 }