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

Timestamp:

02/13/06 12:18:28 (19 years ago)

Author:

boris

Message:

• create an abstract way to access omc class getElementsInfo() thus close the hole into omc plugin, hurray !
• added some tests that triggerd some bugs and fixed the bugs

File:

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

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

@@ -46 +46 @@
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.LinkedList;
 import java.util.StringTokenizer;
 
@@ -52 +54 @@
 import org.modelica.mdt.core.IModelicaClass;
 import org.modelica.mdt.core.List;
+import org.modelica.mdt.core.ListElement;
 import org.modelica.mdt.core.compiler.ConnectException;
+import org.modelica.mdt.core.compiler.ElementsInfo;
 import org.modelica.mdt.core.compiler.IModelicaCompiler;
 import org.modelica.mdt.core.compiler.InvocationError;
@@ -687 +691 @@
     }
     
-    /**
-     * @param className
-     * @return
-     * @throws ConnectException
-     * @throws InvocationError 
-     * @throws UnexpectedReplyException 
-     */
-    public List getElementsInfo(String className)
+    public Collection<ElementsInfo> getElementsInfo(String className)
         throws ConnectException, InvocationError, UnexpectedReplyException
     {
@@ -707 +704 @@
             if (retval.charAt(i) == '{')
             {
-                /* we found the begining of the list, let's hope for the best */
-                return ModelicaParser.parseList(retval);        
+                /* 
+                 * we found the begining of the list, send it to parser and 
+                 * hope for the best 
+                 */
+                List parsedList = ModelicaParser.parseList(retval);
+                
+                /* convert the parsedList to a collection of ElementsInfo:s */
+                LinkedList<ElementsInfo> elementsInfo = 
+                    new LinkedList<ElementsInfo>();
+
+                for (ListElement element : parsedList)
+                {
+                    elementsInfo.add(new ElementsInfo((List)element));
+                }
+                
+                return elementsInfo;
             }
             else if (retval.charAt(i) == 'E' || retval.charAt(i) == 'e')