Changeset 325 for trunk/org.modelica.mdt.omc/src/org/modelica

Timestamp:

02/16/06 13:29:00 (19 years ago)

Author:

remar

Message:

org.modelica.mdt.core

fixed a comment, removed some debug printouts

org.modelica.mdt.omc

getErrorString() is called after every call to sendExpression()

org.modelica.mdt.ui

beutification fixes

org.modelica.mdt.test

added some assertions

File:

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

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

@@ -91 +91 @@
 
     private String[] standardLibraryPackages = { "Modelica" };
-    
+
     /* should we trace the calls to sendExpression? */
     private static boolean traceOMCCalls = false;
@@ -484 +484 @@
             return;
         }
-        System.out.println(message);
+        System.out.println("OMCSTATUS: " + message);
     }
 
@@ -527 +527 @@
         String retval = sendExpression("getClassNames("+className+")");
         
+        /* fetch error string but ignore it */
+        getErrorString();
+        
         return ModelicaParser.parseList(retval);
     }
@@ -547 +550 @@
         reply = reply.trim();
         reply = reply.substring(1, reply.length()-1);
+        
+        /* fetch error string but ignore it */
+        getErrorString();
         
         return IModelicaClass.Type.parse(reply);
@@ -586 +592 @@
         ParseResults res = new ParseResults();
 
-        // We need to call this to empty the error queue in OMC
-        sendExpression("getMessagesString()");
-        
         String fullName = file.getLocation().toString();
         String retval = 
             sendExpression("loadFileInteractiveQualified(\"" + fullName + "\")");
         
-        String errorString = sendExpression("getMessagesString()");
+        /* Always keep your stuff nice and tidy! */
+        retval = retval.trim();
         
         /*
-         * See if there were parse errors
-         */
-        if(retval.toLowerCase().contains("error"))
+         * See if there were parse errors, an empty list {} also denotes error
+         */
+        if(retval.toLowerCase().contains("error") || retval.equals("{}"))
         {           
             res.setCompileErrors
@@ -614 +618 @@
         /*
          * If there were errors, but the compilation went through,
-         * collect the error messages. (Test if errorString == "") 
-         */
-        errorString = errorString.trim();
-        if(errorString.equals("\"\"") == false)
-        {
-            errorString = errorString.substring(1, errorString.length() - 1);
+         * collect the error messages. (Test if errorString != "") 
+         */
+        String errorString = getErrorString();
+        System.out.println("errorString: -->" + errorString + "<--");
+        if(errorString.equals("") == false)
+        {
+//          errorString = errorString.trim();
+//          errorString = errorString.substring(1, errorString.length() - 1);
+            System.out.println("setCompileErrors!!!");
             res.setCompileErrors(OMCParser.parseErrorString(errorString));
         }
@@ -641 +648 @@
         String retval = sendExpression("getCrefInfo(" + className + ")");
         
+        /* fetch error string but ignore it */
+        getErrorString();
+        
         if(retval.contains("Error") || retval.contains("error"))
         {
@@ -680 +690 @@
         {
             throw new 
-                UnexpectedReplyException("can't parse getCrefInfo() reply, "+
-                        "unexpected format");
+                UnexpectedReplyException("Can't parse getCrefInfo() reply, "+
+                                         "unexpected format");
         }
         
@@ -699 +709 @@
     {
         String retval = sendExpression("isPackage(" + className + ")");
+
+        /* fetch error string but ignore it */
+        getErrorString();
+        
         return retval.contains("true");
     }
@@ -706 +720 @@
     {
         String retval = sendExpression("getElementsInfo("+ className +")");
+        
+        /* fetch error string but ignore it */
+        getErrorString();
         
         /*
@@ -774 +791 @@
         {
             sendExpression("loadModel(Modelica)");
+            
+            /* fetch error string but ignore it */
+            getErrorString();
+            
             systemLibraryLoaded = true;
         }