Changeset 287 for trunk/org.modelica.mdt.ui/src/org/modelica/mdt

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.ui/src/org/modelica/mdt/ui/editor/ModelicaCompletionProcessor.java (modified) (9 diffs)

trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/editor/ModelicaCompletionProcessor.java

@@ -56 +56 @@
 import org.eclipse.jface.text.contentassist.IContextInformationValidator;
 import org.modelica.mdt.core.CompilerProxy;
+import org.modelica.mdt.core.Element;
+import org.modelica.mdt.core.List;
+import org.modelica.mdt.core.ListElement;
 import org.modelica.mdt.core.compiler.CompilerException;
 import org.modelica.mdt.core.compiler.ConnectException;
@@ -81 +84 @@
      * proposals. This allows us to backtrace the proposals.
      */
-    Vector<Object> narrowedProposals = new Vector<Object>();
-    Vector<Object> proposals = new Vector<Object>();
+    List narrowedProposals = new List();
+    List proposals = new List();
     int typeAhead = 0;
 
@@ -155 +158 @@
     {
         if(proposals != null)
+        {
             proposals.clear();
+        }
         else
-            proposals = new Vector<Object>();
+        {
+            proposals = new List();
+        }
         if(narrowedProposals != null)
+        {
             narrowedProposals.clear();
+        }
         else
-            narrowedProposals = new Vector<Object>();
+        {
+            narrowedProposals = new List();
+        }
         
         typeAhead = 0;
@@ -180 +191 @@
         {
             if(proposals != null)
+            {
                 narrowedProposals.addAll(proposals);
+            }
         }
     }
@@ -198 +211 @@
         narrowedProposals.clear();
         
-        for(Object proposedClass : proposals)
-        {
-            if(((String)proposedClass).startsWith(classPrefix))
-            {
-                narrowedProposals.add(proposedClass);
+        for (ListElement proposedClass : proposals)
+        {
+            if (((Element)proposedClass).toString().startsWith(classPrefix))
+            {
+                narrowedProposals.append(proposedClass);
             }
         }
@@ -275 +288 @@
         outputParameters.clear();
         
-        Vector<Object> elementsInfo = new Vector<Object>(0);
+        List elementsInfo;
         
         try 
@@ -302 +315 @@
             boolean elementNamesFound = false;
             boolean typenameFound = false;
-            Vector names = new Vector(0);
+            List names = new List();
             String typename = "";
             
@@ -355 +368 @@
                     && elementIsInput && elementNamesFound && typenameFound)
             {
-                inputParameters.add(typename + " " + (String)names.get(0));
+                inputParameters.add(typename + " " + names.elementAt(0).toString());
             }
             else if(elementIsPublic && elementIsComponent
                     && elementIsOutput && elementNamesFound && typenameFound)
             {
-                outputParameters.add(typename + " " + (String)names.get(0));
-                
+                outputParameters.add(typename + " " + names.elementAt(0).toString());
             }
         }
@@ -401 +413 @@
         for(int i = 0;i < narrowedProposals.size();i++)
         {
-            String proposal = (String)narrowedProposals.get(i);
+            String proposal = narrowedProposals.elementAt(i).toString();
             completionProposals[i] =
                 new CompletionProposal(proposal, offset - typeAhead, typeAhead,