Changeset 1234

Timestamp:

01/24/12 21:24:44 (13 years ago)

Author:

masberg

Message:

Fix loading of the Modelica standard library. Bonus: Fixed a few spelling errors and some minor formatting tweaks.

File:

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

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

@@ -128 +128 @@
     private boolean systemLibraryLoaded = false;
 
-    private ArrayList<String> standardLibraryPackages = null;
+    private java.util.List<String> standardLibraryPackages = null;
 
     /* should we trace the calls to sendExpression? */
-    private  boolean traceOMCCalls  = false;
-    private  boolean traceOMCStatus = true;
-
-    private  boolean traceStatusPreferences = false;
-    private  boolean traceCommandsPreferences = false;
-    private  boolean traceErrorPreferences = false; 
-    private  boolean traceReplyPrefereces = false;  
+    private boolean traceOMCCalls = false;
+    private boolean traceOMCStatus = true;
+
+    private boolean traceStatusPreferences = false;
+    private boolean traceCommandsPreferences = false;
+    private boolean traceErrorPreferences = false;  
+    private boolean traceReplyPrefereces = false;   
 
     {
@@ -638 +638 @@
 
     /**
-     * outputs the message about a call error that occured
+     * outputs the message about a call error that occurred
      * when communicating with omc
      * @param message the message to log
@@ -962 +962 @@
             endLine = Integer.parseInt(tokens.elementAt(4).toString());
             endColumn = Integer.parseInt(tokens.elementAt(5).toString());
-            
+
             if (startColumn == 0) {
                 assert(startLine == 1);
@@ -1050 +1050 @@
                 else
                 {
-                    /* OMC returned someting wierd, panic mode ! */
+                    /* OMC returned something weird, panic mode ! */
                     break;
                 }
@@ -1122 +1122 @@
      * the server
      */ 
-    public String[] getStandardLibrary() throws ConnectException
-    {
-        String openModelicaLibrary = System.getenv("OPENMODELICALIBRARY");
-        if (openModelicaLibrary != null)
-        {
-            File path = new File(openModelicaLibrary);
-            ArrayList<String> libs = new ArrayList<String>();
-            for (File f: path.listFiles()) if (f.isDirectory()) libs.add(f.getName());
-            standardLibraryPackages = libs; 
-        }
-
-        if (!systemLibraryLoaded)
-        {
-            if (standardLibraryPackages == null) 
-            {
-                ArrayList<String> libs = new ArrayList<String>();
-                libs.add("Modelica");
-                standardLibraryPackages = libs; 
-            }
-            for (Object lib : standardLibraryPackages)
-            {
-                sendExpression("loadModel("+(String)lib+")", true);
-
-            }
+    public String[] getStandardLibrary() throws ConnectException {
+        if (!systemLibraryLoaded) {
+            if (standardLibraryPackages == null) {
+                standardLibraryPackages = new ArrayList<String>();
+                standardLibraryPackages.add("Modelica"); 
+            }
+
+            sendExpression("loadModel(Modelica)", true);
 
             systemLibraryLoaded = true;
         }
 
-        return (String[]) standardLibraryPackages.toArray(new String[standardLibraryPackages.size()]);
+        String[] arr = standardLibraryPackages.toArray(new String[0]);
+
+        return arr;
     }