Changeset 224 for trunk

Timestamp:

12/15/05 10:32:30 (19 years ago)

Author:

remar

Message:

• fix assignment to copy, proposals and narrowedProposals shouldn't really be the same object
• some better error handling
• don't show empty parameter list if there are no in/out parameters

File:

• trunk/org.modelica.mdt/src/org/modelica/mdt/editor/ModelicaCompletionProcessor.java (modified) (6 diffs)

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

@@ -65 +65 @@
 //TODO comment the class, remar !
 /**
+ * This class is responsible for proposing completions and giving
+ * context information about functions. These functions kick in when .
+ * and ( are typed.
+ * 
+ * computeCompletionProposals() takes care of proposing classnames when
+ * typing after a .
+ * 
+ * computeContextInformation() takes care of showing the definitions of
+ * the parameters of classes that have parameters.
  * 
  * @author Andreas Remar
@@ -106 +115 @@
             int pos = stringTyped.indexOf('(');
             
-            System.out.println(pos);
-            
             /* Match parens to see if we're done typing. */
             int pardepth = 0;
@@ -149 +156 @@
     private void newProposals(String className)
     {
-        proposals.clear();
-        narrowedProposals.clear();
+        if(proposals != null)
+            proposals.clear();
+        else
+            proposals = new Vector<Object>();
+        if(narrowedProposals != null)
+            narrowedProposals.clear();
+        else
+            narrowedProposals = new Vector<Object>();
+        
         typeAhead = 0;
 
@@ -167 +181 @@
         finally
         {
-            narrowedProposals = proposals;
+            narrowedProposals.addAll(proposals);
         }
     }
@@ -268 +282 @@
             elementsInfo = OMCProxy.getElementsInfo(functionName);
         }
-        catch (ConnectionException e){e.printStackTrace();}
-        catch (InvocationError e){e.printStackTrace();}
-        catch (UnexpectedReplyException e){e.printStackTrace();}
+        catch (ConnectionException e){ErrorManager.showCompilerError(e);return;}
+        catch (InvocationError e){/* class wasn't found or something */ return;}
+        catch (UnexpectedReplyException e){/* strange reply from omc? */return;}
 
         functionProposal = functionName;
@@ -419 +433 @@
         }
         
+        if(proposal == "")
+            return null;
+        
         IContextInformation[] result = new IContextInformation[1];