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

Timestamp:

08/26/11 20:33:40 (13 years ago)

Author:

wschamai

Message:

 

Location:

trunk/modelicaml/org.openmodelica.modelicaml.gen.modelica/src/org/openmodelica/modelicaml/gen/modelica

Files:

• cg/helpers/OMCClassValidator.java (added)
• listeners/PapyrusListener.java (modified) (2 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.gen.modelica/src/org/openmodelica/modelicaml/gen/modelica/listeners/PapyrusListener.java

@@ -60 +60 @@
 import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
 import org.eclipse.papyrus.resource.uml.ExtendedUmlModel;
+import org.eclipse.papyrus.resource.uml.UmlModel;
 import org.eclipse.papyrus.resource.uml.UmlUtils;
 import org.eclipse.ui.IEditorPart;
@@ -365 +366 @@
         //UmlModel umlModel = UmlUtils.getUmlModel();
         
-        umlModel = (ExtendedUmlModel) UmlUtils.getUmlModel();
-        //UMLModelName = null;
-        
-        modelFileURI = umlModel.getResourceURI().toString();
+//      umlModel = (ExtendedUmlModel) UmlUtils.getUmlModel();
+//      //UMLModelName = null;
+//      
+//      modelFileURI = umlModel.getResourceURI().toString();
+//      modelName = umlModel.getResourceURI().lastSegment();
+//      project = umlModel.getResourceURI().path().replace(modelName, "").replace("/resource/", "");
+//
+//      // parameter values for chains
+//      modelFilePath = modelFileURI.replace("platform:/resource/", "");
+//      outputFolderPath = project;
+//      logPath = project + "/errors.log";
+        
+        UmlModel umlModel = UmlUtils.getUmlModel();
+        modelFileURI = umlModel.getResourceURI().toPlatformString(true);
+
         modelName = umlModel.getResourceURI().lastSegment();
-        project = umlModel.getResourceURI().path().replace(modelName, "").replace("/resource/", "");
-
-        // parameter values for chains
-        modelFilePath = modelFileURI.replace("platform:/resource/", "");
-        outputFolderPath = project;
-        logPath = project + "/errors.log";
-
+//      project = umlModel.getResourceURI().path().replace(modelName, "").replace("/resource/", "");
+        project = umlModel.getResource().getURI().segment(1);
+        
+        String modelFilePath = modelFileURI.replace("platform:/resource/", "");
+        String outputFolderPath = project;
+        String logPath = project + "/errors.log";
+        
         
 // ########### Code Generation