Separate file name extensions for different Sysdyn export files: Models: *.sysdyn...

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

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportFunctionLibrary.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportFunctionLibrary.java
index 002abbbd1716049e4e18040c244480ab46da9b57..251ab7a452c73e280c9a5c412a478b8b1c52b571 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportFunctionLibrary.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportFunctionLibrary.java
@@ -85,7 +85,7 @@ public class ExportFunctionLibrary  extends AbstractHandler {
                if(path.isEmpty() || !(new File(path).exists()))\r
                        path = Platform.getLocation().toOSString();\r
                fd.setFilterPath(path);\r
-               String[] filterExt = {"*.tg"};\r
+               String[] filterExt = {"*.sysdynFunctions"};\r
                fd.setFilterExtensions(filterExt);\r
                fd.setOverwrite(true);\r
                final String selected = fd.open();\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModelHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModelHandler.java
index 7bba5ae9eda22dd5ceec057b2b29c5b4bbaebed4..92a5ac8e2e73be774c7a64c71ee94ca2c5b6c263 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModelHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModelHandler.java
@@ -235,7 +235,7 @@ public class ExportModelHandler extends AbstractHandler {
                        fd.setFileName(name);\r
                        \r
                        fd.setFilterPath(path);\r
-                       String[] filterExt = {"*.tg"};\r
+                       String[] filterExt = {"*.sysdyn"};\r
                        fd.setFilterExtensions(filterExt);\r
                        fd.setOverwrite(true);\r
                        fullPath = fd.open();\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModuleHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModuleHandler.java
index 7d7e7fcf62c91827dc197eae6db360ca33615958..6a0cc12f2b11998e80e25ec1673aaf2a1eda434a 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModuleHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModuleHandler.java
@@ -154,7 +154,7 @@ public class ExportModuleHandler extends AbstractHandler {
                if(path.isEmpty() || !(new File(path).exists()))\r
                        path = Platform.getLocation().toOSString();\r
                fd.setFilterPath(path);\r
-               String[] filterExt = {"*.tg"};\r
+               String[] filterExt = {"*.sysdynModule"};\r
                fd.setFilterExtensions(filterExt);\r
                fd.setOverwrite(true);\r
                final String selected = fd.open();\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportFunctionLibrary.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportFunctionLibrary.java
index cdd40a04ca91c5fae0d3f2bd75b77d549d23780d..4e227e73830076ca1a94c1a2e2fd515f749df5b2 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportFunctionLibrary.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportFunctionLibrary.java
@@ -65,7 +65,7 @@ public class ImportFunctionLibrary  extends AbstractHandler {
                if(path.isEmpty() || !(new File(path).exists()))\r
                    path = Platform.getLocation().toOSString();\r
                fd.setFilterPath(path);\r
-               String[] filterExt = {"*.tg"};\r
+               String[] filterExt = {"*.sysdynFunctions; *.tg", "*.*"};\r
                fd.setFilterExtensions(filterExt);\r
                final String selected = fd.open();\r
                if(selected == null) return null;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModelHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModelHandler.java
index aba2cf0a99660e9d5d39361a9d3bd05c1d27f16d..48daeb98006f14ae7dec3d17f7a308d60034625c 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModelHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModelHandler.java
@@ -51,7 +51,7 @@ public class ImportModelHandler extends AbstractHandler {
         }\r
         \r
         fd.setFilterPath(path);\r
-        String[] filterExt = {"*.tg"};\r
+        String[] filterExt = {"*.sysdyn; *.tg", "*.*"};\r
         fd.setFilterExtensions(filterExt);\r
         final String selected = fd.open();\r
         if(selected == null) return null;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModuleHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModuleHandler.java
index e4645106910a8684544a0a9f3eb3c3f0352b0aa7..19c4031485f3934ff1f663f09865e26528d3682c 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModuleHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportModuleHandler.java
@@ -61,12 +61,12 @@ public class ImportModuleHandler extends AbstractHandler {
                if(path.isEmpty() || !(new File(path).exists()))\r
                        path = Platform.getLocation().toOSString();\r
                fd.setFilterPath(path);\r
-               String[] filterExt = {"*.tg"};\r
+               String[] filterExt = {"*.sysdynModule; *.tg", "*.*"};\r
                fd.setFilterExtensions(filterExt);\r
                final String selected = fd.open();\r
                if(selected == null) return null;\r
                \r
-               Job job = new DatabaseJob("Import model") {\r
+               Job job = new DatabaseJob("Import module") {\r
 \r
             @Override\r
             protected IStatus run(IProgressMonitor monitor) {\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsExportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsExportPage.java
index 06b421f295d150603fef77949cdb6697c9a74538..785df451b238b71400763accd0e3e14d062179d8 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsExportPage.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsExportPage.java
@@ -233,7 +233,7 @@ public class WizardFunctionsExportPage extends WizardPage {
                \r
                FileDialog dialog = new FileDialog(shell, SWT.SAVE);\r
                \r
-               String[] ext = {"*.tg"};\r
+               String[] ext = {"*.sysdynFunctions"};\r
                dialog.setFilterExtensions(ext);\r
                \r
                dialog.setText("Export Function Library");\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsImportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsImportPage.java
index 3e5600aeb1f5395c20a713f7119ae23cb9383f0e..702a96cd24fd04229830a5913a79f8f32c33a747 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsImportPage.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsImportPage.java
@@ -227,7 +227,7 @@ public class WizardFunctionsImportPage extends WizardPage{
 \r
                FileDialog dialog = new FileDialog(shell, SWT.OPEN);\r
 \r
-               String[] ext = {"*.tg"};\r
+               String[] ext = {"*.sysdynFunctions; *.tg", "*.*"};\r
                dialog.setFilterExtensions(ext);\r
 \r
                dialog.setText("Import Function Library");\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsExportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsExportPage.java
index a7194de6250afccba0ec6f60fb727dcea90c4814..ae1f0e8ed81ff671c511e06052d4a2c3dac3c2f5 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsExportPage.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsExportPage.java
@@ -232,7 +232,7 @@ public class WizardModelsExportPage extends WizardPage {
                \r
                FileDialog dialog = new FileDialog(shell, SWT.SAVE);\r
                \r
-               String[] ext = {"*.tg"};\r
+               String[] ext = {"*.sysdyn"};\r
                dialog.setFilterExtensions(ext);\r
                \r
                dialog.setText("Export Model");\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsImportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsImportPage.java
index 636fd688f1bee30f439de0cc0bed74f463da25d1..e91798ed70148fe5ea96baeb6c1b97b2edfce22e 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsImportPage.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsImportPage.java
@@ -155,7 +155,7 @@ public class WizardModelsImportPage extends WizardPage{
                \r
                FileDialog dialog = new FileDialog(shell, SWT.OPEN);\r
                \r
-               String[] ext = {"*.tg"};\r
+               String[] ext = {"*.sysdyn; *.tg", "*.*"};\r
                dialog.setFilterExtensions(ext);\r
                \r
                dialog.setText("Import Model");\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesExportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesExportPage.java
index d14135a9a039f24eff5638f6fa6c555359ee6340..3625dd9d770aadcff597cd59a1266f3c45b0bff5 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesExportPage.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesExportPage.java
@@ -236,7 +236,7 @@ public class WizardModulesExportPage extends WizardPage {
                \r
                FileDialog dialog = new FileDialog(shell, SWT.SAVE);\r
                \r
-               String[] ext = {"*.tg"};\r
+               String[] ext = {"*.sysdynModule"};\r
                dialog.setFilterExtensions(ext);\r
                \r
                dialog.setText("Export Module");\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesImportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesImportPage.java
index 659767910c84867983b0f40aae8f2b27fb4907e6..415d02c3a17c5e5110aab85835cf1b7b227a63f0 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesImportPage.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesImportPage.java
@@ -229,7 +229,7 @@ public class WizardModulesImportPage extends WizardPage{
                \r
                FileDialog dialog = new FileDialog(shell, SWT.OPEN);\r
                \r
-               String[] ext = {"*.tg"};\r
+               String[] ext = {"*.sysdynModule; *.tg", "*.*"};\r
                dialog.setFilterExtensions(ext);\r
                \r
                dialog.setText("Import Module");\r