Changeset 102 for trunk

Timestamp:

10/31/05 14:21:41 (19 years ago)

Author:

remar

Message:

• starts server if one isn't running
• try to be cross-platform

File:

• trunk/org.modelica.mdt/src/org/modelica/mdt/internal/corba/OmcCommunicationImplementation.java (modified) (3 diffs)

trunk/org.modelica.mdt/src/org/modelica/mdt/internal/corba/OmcCommunicationImplementation.java

@@ -17 +17 @@
 public class OmcCommunicationImplementation
 {
-    private static ORB orb;
     private static OmcCommunication omcc;
+    private static String os;
 
     // TODO Do not do lazy initialization
     private static boolean hasInitialized = false;
 
-    public static void init(String args[]) throws InitializationException
-    {
-        String username = System.getenv("USER");
-        if(username == null)
-        {
-            username = "nobody";
-        }
-        String fileName = "/tmp/openmodelica." + username + ".objid";
-        
-        File f = new File(fileName);
+    private static String readObjectFromFile() throws InitializationException
+    {
+        File f = new File(getPathToObject());
         String stringifiedObjectReference = null;
-            
-        if(!f.exists())
-        {
-            /* start server here */
-            // TODO Start server here
-            System.out.println("VAFAN!!");
-        }
 
         BufferedReader br = null;
@@ -61 +47 @@
         catch(IOException e)
         {
-            throw new InitializationException("Unable to read from " + fileName);
-        }
-        
+            throw new InitializationException("Unable to read from " + getPathToObject());
+        }
+        return stringifiedObjectReference;
+    }
+    
+    private static String getPathToObject()
+    {
+        String fileName = null;
+        if(os.equals("Linux"))
+        {
+            String username = System.getenv("USER");
+            if(username == null)
+            {
+                username = "nobody";
+            }
+            fileName = "/tmp/openmodelica." + username + ".objid";
+        }
+        else if(os.equals("Windows"))
+        {
+            String temp = System.getenv("TEMP");
+            fileName = temp + "openmodelica.objid";
+        }
+        
+        return fileName;
+    }
+    
+    private static void startServer()
+    {
+        String pathToOmc = null;
+        String argToOmc = null;
+        String modelicaPath = null;
+        String user = null;
+
+        System.out.println("Starting Open Modelica Compiler");
+        
+        if(os.equals("Linux"))
+        {
+            pathToOmc = "/home/x05andre/ex/omc-build/OpenModelica/Compiler/omc";
+            modelicaPath = "MODELICAPATH=/home/x05andre/ex/Modelica Library";
+        }
+        else if(os.equals("Windows"))
+        {
+            pathToOmc = "c:\\OpenModelica13\\omc.exe";
+            modelicaPath = "MODELICAPATH=c:\\OpenModelica13\\ModelicaLibrary";
+        }
+        argToOmc = "+d=interactiveCorba";
+        String userName = System.getenv("USER");
+        if(userName == null)
+            userName = "nobody";
+        user = "USER=" + userName;
+        
+        File f = new File(getPathToObject());
+
+        if(f.exists())
+        {
+            System.out.println("Delete " + f);
+            if(f.delete())
+            {
+                System.out.println(f + " deleted");
+            }
+            else
+            {
+                System.out.println("Couldn't delete " + f);
+            }
+        }
+
+        System.out.flush();
+        String command[] = {pathToOmc, argToOmc};
+        String env[] = {modelicaPath, user};
+        try
+        {
+            Runtime.getRuntime().exec(command, env);
+        }
+        catch(IOException e)
+        {
+            // TODO Handle this exception
+            System.out.println("Couldn't start Open Modelica Compiler");
+            System.out.println(e);
+        }
+        
+        try
+        {
+            System.out.println("Sleep 1 second");
+            Thread.sleep(1000);
+        }
+        catch(InterruptedException e)
+        {
+            // Ignore
+        }
+        
+        while(!f.exists())
+        {
+            try
+            {
+                Thread.sleep(100);
+            }
+            catch(InterruptedException e)
+            {
+                // Ignore
+            }
+        }
+    }
+    
+    private static void setupOmcc(String stringifiedObjectReference)
+    {
+        String args[] = {null};
+        
+        ORB orb;
         orb = ORB.init(args, null);
         
-        // TODO Add try/catch and try to start server if this fails
-        org.omg.CORBA.Object obj = orb.string_to_object(stringifiedObjectReference);
-        
-        omcc = OmcCommunicationHelper.narrow(obj);
+        org.omg.CORBA.Object obj = null;
+        try
+        {
+            obj = orb.string_to_object(stringifiedObjectReference);
+        }
+        catch(Exception e)
+        {
+            System.out.println("Va Fan");
+            System.out.println(e);
+        }
+        
+        try
+        {
+            omcc = OmcCommunicationHelper.narrow(obj);
+        }
+        catch(Exception e)
+        {
+            System.out.println("Fan Va?");
+            System.out.flush();
+            System.out.println(e);
+        }
+
+    }
+    
+    private static String getOs()
+    {
+        String osName = System.getProperty("os.name");
+        if(osName.contains("Linux"))
+        {
+            return "Linux";
+        }
+        else if(osName.contains("Windows"))
+        {
+            return "Windows";
+        }
+        else
+        {
+            System.out.println("Unsupported OS");
+            return "Linux";
+        }
+    }
+    
+    public static void init(String args[]) throws InitializationException
+    {
+        os = getOs();
+        
+        File f = new File(getPathToObject());
+        String stringifiedObjectReference = null;
+        if(!f.exists())
+        {
+            startServer();
+        }
+        stringifiedObjectReference = readObjectFromFile();
+
+        setupOmcc(stringifiedObjectReference);
+
+        try
+        {
+            omcc.sendExpression("1+1");
+        }
+        catch(Exception e)
+        {
+            startServer();
+            stringifiedObjectReference = readObjectFromFile();
+            setupOmcc(stringifiedObjectReference);
+        }
+
+        try
+        {
+            omcc.sendExpression("1+1");
+        }
+        catch(Exception e)
+        {
+            throw new InitializationException("Unable to start server");
+        }
 
         hasInitialized = true;
@@ -80 +242 @@
         if(hasInitialized == false)
         {
-            // System.out.println("Initializing CORBA interface");
             init(null);
             System.out.println("Loading Modelica Standard Library");
-            //sendExpression("loadModel(Modelica)");
-            sendExpression("loadFile(\"/home/x05andre/ex/Modelica\")");
+            retval = sendExpression("loadModel(Modelica)");
+            if(retval.equals("false"))
+            {
+                
+            }
         }
         
         retval = omcc.sendExpression(exp);
         
-        //catch(InitializationException e)
-//      {
-//          e.printStackTrace();
-//          MdtPlugin.log(e);
-//      }
-
         return retval;
     }