===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.32
retrieving revision 1.36
diff -u -p -r1.32 -r1.36
--- OpenXM/src/OpenMath/OMproxy.java	2000/03/14 05:02:34	1.32
+++ OpenXM/src/OpenMath/OMproxy.java	2000/04/17 03:18:57	1.36
@@ -1,37 +1,34 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.31 2000/03/14 04:44:17 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.35 2000/03/15 15:02:06 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
 import java.util.Stack;
 import java.io.*;
 
-class OMproxy implements Runnable{
+class OMproxy extends OpenXMserver{
   private OpenXM ox;
   private Stack stack = new Stack();
   protected boolean debug = false;
   final int version = 200001190;
 
-  public OMproxy(String host,int ControlPort,int DataPort) throws IOException{
-    ox = new OpenXM(this,host,ControlPort,DataPort);
-  }
-
-  public void run(){
+  public void computeProcess(OpenXMconnection stream){
     OM2OXM P = new OM2OXM();
 
     debug("OMproxy started.");
     try{
       while(true){
 	try{
-	  int ox_tag = ox.receiveOXtag();
+	  OXmessage message = stream.receive();
+	  int ox_tag = message.getTag();
 
 	  switch(ox_tag){
-	  case OpenXM.OX_COMMAND:
-	    StackMachine(ox.receiveSM());
+	  case OXmessage.OX_COMMAND:
+	    StackMachine((SM)message.getBody());
 	    break;
 
-	  case OpenXM.OX_DATA:
-	    stack.push(ox.receiveCMO());
+	  case OXmessage.OX_DATA:
+	    stack.push(message.getBody());
 	    debug("push: "+ stack.peek());
 	    break;
 	  }
@@ -69,7 +66,7 @@ class OMproxy implements Runnable{
 	ox.send(new CMO_NULL());
       }else{
 	debug("sending CMO: "+ stack.peek());
-	ox.send(stack.pop());
+	ox.send((CMO)stack.pop());
       }
     }catch(MathcapViolation e){
       try{
@@ -137,19 +134,19 @@ class OMproxy implements Runnable{
       CMO[] CMOFormat = {new CMO_INT32(CMO.NULL),
 			 new CMO_INT32(CMO.INT32),
 			 new CMO_INT32(CMO.STRING),
-			 new CMO_INT32(CMO.CMO_LIST),
-			 new CMO_INT32(CMO.CMO_MONOMIAL32),
-			 new CMO_INT32(CMO.CMO_ZZ),
-			 new CMO_INT32(CMO.CMO_QQ),
-			 new CMO_INT32(CMO.CMO_ZERO),
-			 new CMO_INT32(CMO.CMO_DMS_GENERIC),
-			 new CMO_INT32(CMO.CMO_RECURSIVE_POLYNOMIAL),
-			 new CMO_INT32(CMO.CMO_DISTRIBUTED_POLYNOMIAL),
+			 new CMO_INT32(CMO.LIST),
+			 new CMO_INT32(CMO.MONOMIAL32),
+			 new CMO_INT32(CMO.ZZ),
+			 new CMO_INT32(CMO.QQ),
+			 new CMO_INT32(CMO.ZERO),
+			 new CMO_INT32(CMO.DMS_GENERIC),
+			 new CMO_INT32(CMO.RECURSIVE_POLYNOMIAL),
+			 new CMO_INT32(CMO.DISTRIBUTED_POLYNOMIAL),
 			 new CMO_INT32(CMO.POLYNOMIAL_IN_ONE_VARIABLE),
-			 new CMO_INT32(CMO.CMO_BIGFLOAT),
-			 new CMO_INT32(CMO.CMO_INDETERMINATE),
-			 new CMO_INT32(CMO.CMO_TREE)};
-      CMO[] DataFormat1 = {new CMO_INT32(OpenXM.OX_DATA),
+			 new CMO_INT32(CMO.BIGFLOAT),
+			 new CMO_INT32(CMO.INDETERMINATE),
+			 new CMO_INT32(CMO.TREE)};
+      CMO[] DataFormat1 = {new CMO_INT32(OXmessage.OX_DATA),
 			   new CMO_LIST(CMOFormat)};
       CMO[] list = {new CMO_LIST(DataFormat1)};
 
@@ -254,6 +251,7 @@ class OMproxy implements Runnable{
     return ret;
   }
 
+  /*
   public static void main(String argv[]){
     String host = "localhost";
     int DataPort = 1300, ControlPort = 1200;
@@ -291,4 +289,5 @@ class OMproxy implements Runnable{
       System.err.println(e.getMessage());
     }
   }
+  */
 }