Make a common model import interface for external model formats to lay groundwork...

refs #5197

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@30110 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportMdlHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportMdlHandler.java
index 8d35a4ea6ecc76fe547f9fd88bd276446a2fc5cc..e1230b8a0679869a6a46dd1ed921af0d5996ff47 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportMdlHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportMdlHandler.java
@@ -68,7 +68,7 @@ public class ImportMdlHandler extends AbstractHandler {
                // Convert Vensim model to Simantics SysDyn format using MdlParser\r
                final Model model;\r
                try {\r
-                       model = MdlParser.parse(file);\r
+                       model = new MdlParser().parse(file);\r
                }\r
                catch (Exception e) {\r
                        e.printStackTrace();\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/mdl/WizardMdlImportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/mdl/WizardMdlImportPage.java
index 93766ed45e7c21e676f993d1a0240696deb080d7..d4679f7d44c500f886b5c2c618d91436f7828a9d 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/mdl/WizardMdlImportPage.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/mdl/WizardMdlImportPage.java
@@ -183,7 +183,7 @@ public class WizardMdlImportPage extends WizardPage{
                final Model model;\r
                \r
                try {\r
-                       model = MdlParser.parse(file);\r
+                       model = new MdlParser().parse(file);\r
                }\r
                catch (Exception e) {\r
                        e.printStackTrace();\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/IModelParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/IModelParser.java
new file mode 100644 (file)
index 0000000..a179b6c
--- /dev/null
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/IModelParser.java
@@ -0,0 +1,9 @@
+package org.simantics.sysdyn.modelImport;\r
+\r
+import java.io.File;\r
+\r
+import org.simantics.sysdyn.modelImport.model.Model;\r
+\r
+public interface IModelParser {\r
+       public Model parse(File file) throws Exception; \r
+}\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser.java
index 25c77c0e48daacabdde5b32fc6a00328b26da604..876390a5a9bc1745c05447fc9dd53deadc7dc572 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser.java
@@ -20,6 +20,7 @@ import java.util.regex.Pattern;
 import org.simantics.sysdyn.modelImport.mdl.Declaration;\r
 import org.simantics.sysdyn.modelImport.mdl.Lookup;\r
 import org.simantics.sysdyn.modelImport.mdl.MdlModel;\r
+import org.simantics.sysdyn.modelImport.mdl.MdlVariable;\r
 import org.simantics.sysdyn.modelImport.mdl.Sketch;\r
 import org.simantics.sysdyn.modelImport.mdl.SketchComment;\r
 import org.simantics.sysdyn.modelImport.mdl.SketchConnection;\r
@@ -28,7 +29,6 @@ import org.simantics.sysdyn.modelImport.mdl.SketchValve;
 import org.simantics.sysdyn.modelImport.mdl.SketchVariable;\r
 import org.simantics.sysdyn.modelImport.mdl.Subscript;\r
 import org.simantics.sysdyn.modelImport.mdl.SubscriptVariable;\r
-import org.simantics.sysdyn.modelImport.mdl.MdlVariable;\r
 import org.simantics.sysdyn.modelImport.model.Comment;\r
 import org.simantics.sysdyn.modelImport.model.Connection;\r
 import org.simantics.sysdyn.modelImport.model.Model;\r
@@ -37,7 +37,7 @@ import org.simantics.sysdyn.modelImport.model.Shadow;
 import org.simantics.sysdyn.modelImport.model.Symbol;\r
 import org.simantics.sysdyn.modelImport.model.Valve;\r
 \r
-public class MdlParser {\r
+public class MdlParser implements IModelParser {\r
        \r
        private static final String UTF_8 = "{UTF-8}";\r
        private static final String SKETCH_VERSION = "V300";\r
@@ -48,7 +48,8 @@ public class MdlParser {
        private static final String PARAMETER_STOP = "FINAL TIME";\r
        private static final String PARAMETER_STEP = "TIME STEP";\r
 \r
-       public static Model parse(File file) throws Exception {\r
+       @Override\r
+       public Model parse(File file) throws Exception {\r
                // generate a mdl model based on the contents of the file\r
                MdlModel mdl = parseFile(file);\r
                \r