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

Timestamp:

03/10/06 13:05:15 (19 years ago)

Author:

remar

Message:

• parseList now throws a ModelicaParserException? when something goes wrong

File:

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

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

@@ -56 +56 @@
 import org.modelica.mdt.core.List;
 import org.modelica.mdt.core.ListElement;
+import org.modelica.mdt.core.ModelicaParserException;
 import org.modelica.mdt.core.compiler.ConnectException;
 import org.modelica.mdt.core.compiler.ElementsInfo;
@@ -633 +634 @@
         getErrorString();
         
-        return ModelicaParser.parseList(retval);
+        List list = null;
+        try
+        {
+            list = ModelicaParser.parseList(retval);
+        }
+        catch(ModelicaParserException e)
+        {
+            throw new UnexpectedReplyException("Unable to parse list: " 
+                    + e.getMessage());
+        }
+        
+        return list;
     }
 
@@ -741 +753 @@
         else
         {
-            res.setClassNames(ModelicaParser.parseList(retval));
+            try
+            {
+                res.setClassNames(ModelicaParser.parseList(retval));
+            } 
+            catch (ModelicaParserException e)
+            {
+                throw new UnexpectedReplyException("Unable to parse list: " 
+                        + e.getMessage());
+            }
 
             /*
@@ -795 +815 @@
         retval = "{" + retval + "}"; 
 
-        List tokens = ModelicaParser.parseList(retval);
+        List tokens = null;
+        try
+        {
+            tokens = ModelicaParser.parseList(retval);
+        } 
+        catch (ModelicaParserException e1)
+        {
+            throw new UnexpectedReplyException("Unable to parse list: " 
+                    + e1.getMessage());
+        }
         
         String filePath = tokens.elementAt(0).toString();
@@ -867 +896 @@
                  * hope for the best 
                  */
-                List parsedList = ModelicaParser.parseList(retval);
+                List parsedList = null;
+                try
+                {
+                    parsedList = ModelicaParser.parseList(retval);
+                } 
+                catch (ModelicaParserException e)
+                {
+                    throw new UnexpectedReplyException("Unable to parse list: " 
+                            + e.getMessage());
+                }
                 
                 /* convert the parsedList to a collection of ElementsInfo:s */