Changeset 363 for trunk/org.modelica.mdt.omc

Timestamp:

02/23/06 15:06:51 (19 years ago)

Author:

remar

Message:

• added a new kind of problem marker; unexpected namespace marker. This marker is added to a file if the classes defined in the file don't exist in the namespace that is expected (given the file hierarchy and so)
• files with namespace problems (missing or bad within statement) will not have their contents shown
• the Type parser now throws an IllegalTypeException? if it can't parse the type
• class definitions inside the package definition of package.mo is now placed as direct children of package.mo in the project tree
• improved OMC status log messages (hopefully more clear)

File:

• trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/OMCProxy.java (modified) (18 diffs)

trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/OMCProxy.java

@@ -53 +53 @@
 import org.eclipse.core.runtime.Platform;
 import org.modelica.mdt.core.IModelicaClass;
+import org.modelica.mdt.core.IllegalTypeException;
 import org.modelica.mdt.core.List;
 import org.modelica.mdt.core.ListElement;
@@ -178 +179 @@
         }
         
-        logOMCStatus("will look for OMC object reference in '" 
-                + fileName + "'");
+        logOMCStatus("Will look for OMC object reference in '" 
+                + fileName + "'.");
         
         return fileName;
@@ -200 +201 @@
             final String m = "Environment variable OPENMODELICAHOME not set";
             logOMCStatus("Environment variable OPENMODELICAHOME not set,"+
-                    " don't know how to start OMC");
+                    " don't know how to start OMC.");
             throw new ConnectException(m);
         }
@@ -221 +222 @@
         if(f.exists())
         {
-            logOMCStatus("removing old OMC object reference file");
+            logOMCStatus("Removing old OMC object reference file.");
             f.delete();
         }
@@ -228 +229 @@
         try
         {
-            logOMCStatus("running command " + command[0] + " " + command[1]);
+            logOMCStatus("Running command " + command[0] + " " + command[1]);
             Runtime.getRuntime().exec(command);
-            logOMCStatus("command run successfully");
+            logOMCStatus("Command run successfully.");
         }
         catch(IOException e)
@@ -239 +240 @@
              * source). Try starting OMC from this secondary location.
              */
-            logOMCStatus("error running command " + e.getMessage()
-                    + "\ntrying allternative path to the binary");
+            logOMCStatus("Error running command " + e.getMessage()
+                    + ", trying alternative path to the binary.");
             String secondaryPathToOmc = null;
             try
@@ -255 +256 @@
                 command = 
                     new String[]{secondaryPathToOmc, "+d=interactiveCorba"};
-                logOMCStatus("running command " 
+                logOMCStatus("Running command " 
                         + command[0] + " " + command[1]);
                 Runtime.getRuntime().exec(command);
-                logOMCStatus("command run successfully");
+                logOMCStatus("Command run successfully.");
             }
             catch(IOException ex)
             {
-                logOMCStatus("error running command, giving up"); 
+                logOMCStatus("Unable to start OMC, giving up."); 
                 throw new ConnectException
-                    ("Unable to start Open Modelica Compiler. "
+                    ("Unable to start the OpenModelica Compiler. "
                      + "Tried starting " + pathToOmc
                      + " and " + secondaryPathToOmc);
@@ -270 +271 @@
         }
 
+        logOMCStatus("Wait for OMC CORBA object reference to appear on disk.");
+        
         /*
          * Wait until the object exists on disk, but if it takes longer than
@@ -290 +293 @@
             if(ticks > 50)
             {
-                logOMCStatus("no OMC object reference file created after " + 
-                        "approximatly 5 seconds\n" +
-                        "it seems OMC does not want to come up, giving up");
+                logOMCStatus("No OMC object reference file created after " + 
+                        "approximately 5 seconds.");
+                logOMCStatus("It seems OMC does not want to come up, giving " +
+                        "up.");
                 throw new ConnectException
                     ("Unable to start the Open Modelica Compiler. Waited for 5"
@@ -298 +302 @@
             }
         }
+        logOMCStatus("OMC object reference found.");
     }
     
@@ -363 +368 @@
         {
             /* If a server isn't running, start it */
-            logOMCStatus("no OMC object reference found");
+            logOMCStatus("No OMC object reference found, starting server.");
             startServer();
         }
         else
         {
-            logOMCStatus("OMC object reference present," +
-                    " assuming OMC is running");
+            logOMCStatus("Old OMC CORBA object reference present," +
+                    " assuming OMC is running.");
         }
         
@@ -389 +394 @@
              * catch an exception and try starting a server.
              */
-            logOMCStatus("trying to send expression to OMC");
+            logOMCStatus("Trying to send expression to OMC.");
             omcc.sendExpression("1+1");
-            logOMCStatus("expression send successfully");
+            logOMCStatus("Expression sent successfully.");
         }
         catch(org.omg.CORBA.COMM_FAILURE e)
         {
             /* Start server and set up omcc */
-            logOMCStatus("failed sending expression");
+            logOMCStatus("Failed sending expression, will try to start OMC.");
             startServer();
             stringifiedObjectReference = readObjectFromFile();
@@ -406 +411 @@
                  * time it's time to send back an exception to the caller of
                  * this function. */
-                logOMCStatus("trying to send expression to OMC");
+                logOMCStatus("Trying to send expression to OMC.");
                 omcc.sendExpression("1+1");
-                logOMCStatus("expression send successfully");
+                logOMCStatus("Expression sent successfully.");
             }
             catch(org.omg.CORBA.COMM_FAILURE x)
             {
-                logOMCStatus("failed sending expression, giving up");
+                logOMCStatus("Failed sending expression, giving up.");
                 throw new ConnectException("Unable to start the OpenModelica"
                         +" Compiler.");
@@ -450 +455 @@
         catch(org.omg.CORBA.COMM_FAILURE x)
         {
+            logOMCCallError("Error while sending expression " + exp + " ["+x+"]");
             /* lost connection to OMC or something */
             throw new ConnectException("Couldn't send expression to the "+
@@ -471 +477 @@
         }
         System.out.println(">> " + expression);
+    }
+    
+    /**
+     * outputs the message about a call error that occured
+     * when communicating with omc
+     * @param message the message to log
+     */
+    private static void logOMCCallError(String message)
+    {
+        if(!traceOMCCalls)
+        {
+            return;
+        }
+        System.out.println(message);
     }
     
@@ -542 +562 @@
      */
     public IModelicaClass.Type getRestrictionType(String className)
-        throws ConnectException
+        throws ConnectException, UnexpectedReplyException
     {
         String reply = 
             sendExpression("getClassRestriction(" + className + ")");
-        
+
         /* remove " around the reply */
         reply = reply.trim();
+        
+        if(reply.equals(""))
+        {
+            throw new UnexpectedReplyException("getClassRestriction("+className
+                    +") returned an empty result");
+        }
+        
         reply = reply.substring(1, reply.length()-1);
         
@@ -554 +581 @@
         getErrorString();
         
-        return IModelicaClass.Type.parse(reply);
+        IModelicaClass.Type type = null;
+        try
+        {
+            type = IModelicaClass.Type.parse(reply);
+        }
+        catch(IllegalTypeException e)
+        {
+            throw new UnexpectedReplyException("Illegal type: "
+                    + e.getMessage());
+        }
+        
+        return type;
     }
     
@@ -604 +642 @@
         if(retval.toLowerCase().contains("error") || retval.equals("{}"))
         {           
-            res.setCompileErrors
-                (OMCParser.parseErrorString(getErrorString()));
+            res.setCompileErrors(OMCParser.parseErrorString(getErrorString()));
             res.setClassNames(new List());
         }