From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 13 Mar 2014 11:39:32 +0000 (+0000)
Subject: Added some Sysdyn Molecules (refs #4343).
X-Git-Tag: 1.8.1~120
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=820df22f1afccc1581ac6bfde5a0444c1eab3d88;p=simantics%2Fsysdyn.git

Added some Sysdyn Molecules (refs #4343).
Fixed the last export filename extension in Sysdyn models.
Export Sysdyn model button to become export as... if the path doesn't exist.

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

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Ceiling.sysdyn b/org.simantics.sysdyn.feature/rootfiles/molecules/Ceiling.sysdyn
new file mode 100644
index 00000000..e64e9233
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/Ceiling.sysdyn differ
diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Floor.sysdyn b/org.simantics.sysdyn.feature/rootfiles/molecules/Floor.sysdyn
new file mode 100644
index 00000000..fe776525
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/Floor.sysdyn differ
diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn
index bcbd16c2..f4802301 100644
Binary files a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn differ
diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.sysdyn b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.sysdyn
index 60edfdfa..d1766ada 100644
Binary files a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.sysdyn and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.sysdyn differ
diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.sysdyn b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.sysdyn
index 2a8f549d..c43d5f07 100644
Binary files a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.sysdyn and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.sysdyn differ
diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn
index 132c2fc7..94bd03c6 100644
Binary files a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn differ
diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn
index d82832a4..6824cfd1 100644
Binary files a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn and b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn differ
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 92a5ac8e..1d788840 100644
--- 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
@@ -191,6 +191,10 @@ public class ExportModelHandler extends AbstractHandler {
 			// Use import default path.
 			path = Activator.getDefault().getPreferenceStore().getString(ImportUtilsUI.IMPORTMODELTPATH);
 		}
+		if (saveAs == false && !(new File(path).exists())) {
+			// Save == Save as... when the path doesn't exist. 
+			return getAbsolutePath(model, event, true);
+		}
 		if(path.isEmpty() || !(new File(path).exists()))
 			path = Platform.getLocation().toOSString();