Changeset 1366 for trunk/modelicaml/org.openmodelica.modelicaml.gen.modelica/src/org

Timestamp:

02/28/12 13:43:11 (13 years ago)

Author:

wschamai

Message:

Improvements for loading Modelica files

File:

• trunk/modelicaml/org.openmodelica.modelicaml.gen.modelica/src/org/openmodelica/modelicaml/gen/modelica/cg/helpers/OMCClassValidator.java (modified) (4 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.gen.modelica/src/org/openmodelica/modelicaml/gen/modelica/cg/helpers/OMCClassValidator.java

@@ -36 +36 @@
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.core.resources.IFile;
@@ -70 +72 @@
 import org.openmodelica.modelicaml.common.constants.Constants;
 import org.openmodelica.modelicaml.common.dialogs.DialogMessage;
+import org.openmodelica.modelicaml.common.services.ModelicaMLServices;
 import org.openmodelica.modelicaml.common.services.StringUtls;
 import org.openmodelica.modelicaml.common.validation.services.ModelicaMLOMCMarkerSupport;
@@ -347 +350 @@
                 }
                 
+                
                 /*
                  * Load first the code from code-sync folder
-                 * TODO: get the possible list of all contained models? 
                  */
-                status = proxy.sendExpression("loadFile(\"" + codeSyncFolderPath + "package.mo" + "\")");
+                List<String> filesToLoad = new ArrayList<String>(); 
+                filesToLoad.addAll(ModelicaMLServices.getFilesToLoad(codeSyncFolderPath));
+                for (String path : filesToLoad) {
+                    status = proxy.sendExpression("loadFile(\"" + path + "\")");
+                }
                 
                 /*
@@ -358 +365 @@
                 status = proxy.sendExpression("loadFile(\"" + packageMoFilePath + "\")");
                 setLog(status);
+                
                 if (status.contains("error") || status.contains("Error") || status.contains("false")) {
                     ModelicaMLOMCMarkerSupport.createOMCMarker((Model)modelElement, "error", errorString);