Clean up vensim import, finalize rename

refs #2924

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/dev-jkauttio@29235 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 c30a9c79b628e5084bc3cf932fb497127f5c2adb..9aa51437a3c4f83935064367197ba3374ebd3917 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
@@ -25,8 +25,8 @@ import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;\r
 import org.simantics.db.common.request.WriteRequest;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.sysdyn.modelImport.MdlParser2;\r
-import org.simantics.sysdyn.modelImport.model.Model2;\r
+import org.simantics.sysdyn.modelImport.MdlParser;\r
+import org.simantics.sysdyn.modelImport.model.Model;\r
 import org.simantics.sysdyn.modelImport.model.WriteContext;\r
 import org.simantics.sysdyn.ui.Activator;\r
 import org.simantics.ui.SimanticsUI;\r
@@ -66,7 +66,7 @@ public class ImportMdlHandler extends AbstractHandler {
                Activator.getDefault().getPreferenceStore().setValue(IMPORTMDLTPATH, (new File(selected)).getParent());\r
                \r
                // Convert Vensim model to Simantics SysDyn format using MdlParser\r
-               final Model2 model = MdlParser2.parse(file);\r
+               final Model model = MdlParser.parse(file);\r
                \r
                SimanticsUI.getSession().asyncRequest(new WriteRequest() {\r
                        \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 475ee2646fd0e0969df2edda872a1fa6eecc64e9..94bf2f7d30f2581c1799c2eccc994d9dba64a183 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
@@ -23,8 +23,8 @@ import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;\r
 import org.simantics.db.common.request.WriteRequest;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.sysdyn.modelImport.MdlParser2;\r
-import org.simantics.sysdyn.modelImport.model.Model2;\r
+import org.simantics.sysdyn.modelImport.MdlParser;\r
+import org.simantics.sysdyn.modelImport.model.Model;\r
 import org.simantics.sysdyn.modelImport.model.WriteContext;\r
 import org.simantics.ui.SimanticsUI;\r
 \r
@@ -179,7 +179,7 @@ public class WizardMdlImportPage extends WizardPage{
                \r
                File file = new File(selected);\r
                \r
-               final Model2 model = MdlParser2.parse(file);\r
+               final Model model = MdlParser.parse(file);\r
                \r
                SimanticsUI.getSession().asyncRequest(new WriteRequest() {\r
                        \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser.java
similarity index 95%
rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser2.java
rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser.java
index abf8caf3f4b93562c174784d4a8d11ef92b43147..e4b6e4ef44c724a55ecfbb840f0251cde60c035d 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser2.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser.java
@@ -29,7 +29,7 @@ import org.simantics.sysdyn.modelImport.mdl.SketchObject;
 import org.simantics.sysdyn.modelImport.mdl.SketchValve;\r
 import org.simantics.sysdyn.modelImport.mdl.SketchVariable;\r
 import org.simantics.sysdyn.modelImport.mdl.Subscript2;\r
-import org.simantics.sysdyn.modelImport.model.Model2;\r
+import org.simantics.sysdyn.modelImport.model.Model;\r
 import org.simantics.sysdyn.modelImport.model.element.Auxiliary;\r
 import org.simantics.sysdyn.modelImport.model.element.Cloud;\r
 import org.simantics.sysdyn.modelImport.model.element.Comment;\r
@@ -41,7 +41,7 @@ import org.simantics.sysdyn.modelImport.model.element.Valve;
 import org.simantics.sysdyn.modelImport.model.expression.IntegralExpression;\r
 import org.simantics.sysdyn.modelImport.model.support.Variable;\r
 \r
-public class MdlParser2 {\r
+public class MdlParser {\r
 \r
        private static final String UTF_8 = "{UTF-8}";\r
        private static final String SKETCH_VERSION = "V300";\r
@@ -56,7 +56,7 @@ public class MdlParser2 {
        private static final double H_SPACE = 0;\r
        private static final double V_SPACE = 10;\r
 \r
-       public static Model2 parse(File file) {\r
+       public static Model parse(File file) {\r
                // generate a mdl model based on the contents of the file\r
                MdlModel mdl;\r
                try {\r
@@ -68,7 +68,7 @@ public class MdlParser2 {
                }\r
 \r
                // generate a sysdyn model from the mdl model\r
-               Model2 model = new Model2(file.getName());\r
+               Model model = new Model(file.getName());\r
 \r
                double offset = 0;\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model.java
similarity index 95%
rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model2.java
rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model.java
index bdc5a19f5fb921742ce6a27d160e4cb9b1c8e4e1..733b16a219c0dab313267d23436a4f91aa852945 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model2.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model.java
@@ -31,7 +31,7 @@ import org.simantics.sysdyn.modelImport.model.element.Shadow;
 import org.simantics.sysdyn.modelImport.model.support.Enumeration;\r
 import org.simantics.sysdyn.utils.ModelUtils;\r
 \r
-public class Model2 implements IWriteableObject {\r
+public class Model implements IWriteableObject {\r
        \r
        private String name;\r
        // necessary simulation parameters\r
@@ -45,7 +45,7 @@ public class Model2 implements IWriteableObject {
        private ArrayList<Shadow> shadows;\r
        private ArrayList<Connection> connections;\r
        \r
-       public Model2(String name) {\r
+       public Model(String name) {\r
                this.name = name;\r
                \r
                enumerations = new HashMap<String, Enumeration>();\r