Changeset 81

Timestamp:

10/20/05 18:28:22 (19 years ago)

Author:

remar

Message:

• implemented getClasses

Location:

trunk/org.modelica.mdt/src/org/modelica/mdt/internal/core

Files:

• ModelicaClass.java (added)
• ModelicaPackage.java (modified) (7 diffs)

trunk/org.modelica.mdt/src/org/modelica/mdt/internal/core/ModelicaPackage.java

@@ -49 +49 @@
 /**
  * @author Elmir Jagudin
- *
+ * @author Andreas Remar
  */
 public class ModelicaPackage extends ModelicaElement implements
@@ -56 +56 @@
     String baseName;
     String elementName;
+    String fullName;
     
     Vector<IModelicaPackage> packages;
@@ -61 +62 @@
 
     boolean hasReceivedPackages = false;
+    boolean hasReceivedClasses = false;
     
     ModelicaPackage(String baseName, String elementName)
@@ -66 +68 @@
         this.baseName = baseName;
         this.elementName = elementName;
+        
+        if(baseName == null)
+        {
+            fullName = elementName;
+        }
+        else
+        {
+            fullName = baseName + "." + elementName;
+        }
         
         packages = new Vector<IModelicaPackage>();
@@ -78 +89 @@
         if(hasReceivedPackages == true)
         {
-            return (IModelicaPackage[]) packages.toArray();
+            if(packages.size() != 0)
+            {
+                IModelicaPackage impPackages[] = new IModelicaPackage[packages.size()];
+                return packages.toArray(impPackages);
+            }
+            else
+            {
+                return null;
+            }
         }
         
         String retval = null;
-        if(baseName == null)
-        {
-            //System.out.println("getPackages("+elementName+")");
-            retval = ModeqCommunicationImplementation.sendExpression("getPackages("+elementName+")");
-        }
-        else
-        {
-            //System.out.println("getPackages("+baseName+"."+elementName+")");
-            retval = ModeqCommunicationImplementation.sendExpression("getPackages("+baseName+"."+elementName+")");          
-        }
-        
-        /* check that a list is returned, otherwise this is probably an error */
-        if(retval.charAt(0) != '{' || retval.charAt(retval.length()) != '}')
-            return null;
-
-        retval = retval.substring(1, retval.length() - 2);
-        String[] retvals = retval.split(",");
-        
-        for(String s : retvals)
+        retval = ModeqCommunicationImplementation.sendExpression("getPackages("+fullName+")");
+        
+        String[] tokens = parseList(retval);
+
+        if(tokens == null)
+        {
+            hasReceivedPackages = true;
+            return null;
+        }
+        
+        for(String s : tokens)
         {
             if(s.equals("") == false)
             {
-                if(baseName == null && s != null)
-                    addPackage(new ModelicaPackage(elementName, s));
-                else if(s != null)
-                    addPackage(new ModelicaPackage(baseName+"."+elementName, s));
+                addPackage(new ModelicaPackage(fullName, s));
             }
         }
@@ -129 +137 @@
     public IModelicaClass[] getClasses() 
     {
-        // TODO Call getClassNames, then compare list with list of packages, and remove matches
-        return null;
+        if(hasReceivedClasses == true)
+        {
+            if(classes.size() != 0)
+            {
+                IModelicaClass modelicaClasses[] = new IModelicaClass[classes.size()];
+                return classes.toArray(modelicaClasses);
+            }
+            else
+            {
+                return null;
+            }
+        }
+        
+        String retval = null;
+        retval = ModeqCommunicationImplementation.sendExpression("getClassNames("+fullName+")");
+
+        
+    
+        String[] tokens = parseList(retval);
+        
+        if(tokens == null)
+        {
+            hasReceivedClasses = true;
+            return null;
+        }
+        
+        for(String str : tokens)
+        {
+            if(str.equals(""))
+                continue;
+            retval = ModeqCommunicationImplementation.sendExpression("isPackage("+fullName+"."+str+")");
+
+            if(retval.contains("false"))
+            {
+                /* fullName.str is NOT a package, add it to the list of classes */
+                addClass(new ModelicaClass(str, fullName));
+            }
+        }
+
+        hasReceivedClasses = true;
+
+        if(classes.size() != 0)
+        {
+            IModelicaClass modelicaClasses[] = new IModelicaClass[classes.size()];
+            return classes.toArray(modelicaClasses);
+        }
+        else
+        {
+            return null;
+        }
     }
 
@@ -145 +201 @@
         packages.add(modelicaPackage);
     }
+    
+    public void addClass(IModelicaClass modelicaClass)
+    {
+        classes.add(modelicaClass);
+    }
+
+    public String[] parseList(String str)
+    {
+        /* remove whitespace before and after */
+        str = str.trim();
+        
+        /* check that a list is parsed, otherwise this is probably an error */
+        if(str.charAt(0) != '{' || str.charAt(str.length() - 1) != '}')
+            return null;
+
+        /* remove {} and split into tokens */
+        str = str.substring(1, str.length() - 1);
+        String[] retvals = str.split(",");
+        
+        return retvals;
+    }
 }