Changeset 287 for trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/OMCProxy.java

Timestamp:

01/26/06 15:36:27 (19 years ago)

Author:

boris

Message:

• added an abstraction around modelica nested lists and updated relevant methods to use it instead of the old Collection<Object> way

File:

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

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

@@ -47 +47 @@
 import java.io.IOException;
 import java.util.StringTokenizer;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.Platform;
 import org.modelica.mdt.core.IModelicaClass;
+import org.modelica.mdt.core.List;
 import org.modelica.mdt.core.compiler.ConnectException;
 import org.modelica.mdt.core.compiler.IModelicaCompiler;
@@ -518 +518 @@
      * @throws InitializationException
      */ 
-    public Vector<Object> getClassNames(String className)
+    public List getClassNames(String className)
         throws ConnectException, UnexpectedReplyException
     {
@@ -584 +584 @@
         String fullName = file.getLocation().toString();
         String retval = 
-            sendExpression("loadFileInteractive(\"" + fullName + "\")");
+            sendExpression("loadFileInteractiveQualified(\"" + fullName + "\")");
         
         /*
@@ -649 +649 @@
         retval = "{" + retval + "}"; 
 
-        Vector<Object> tokens = ModelicaParser.parseList(retval);
+        List tokens = ModelicaParser.parseList(retval);
         int line;
 
         try
         {
-            line = Integer.parseInt((String)tokens.elementAt(1));
+            line = Integer.parseInt(tokens.elementAt(1).toString());
         }
         catch (NumberFormatException e)
@@ -663 +663 @@
         }
         
-        return new ElementLocation((String)tokens.elementAt(0), line);
+        return new ElementLocation(tokens.elementAt(0).toString(), line);
     }
     
@@ -687 +687 @@
      * @throws UnexpectedReplyException 
      */
-    public Vector<Object> getElementsInfo(String className)
+    public List getElementsInfo(String className)
         throws ConnectException, InvocationError, UnexpectedReplyException
     {