From b65cb84037cec3185aeed8b996455f8e97c17216 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Tue, 3 Jun 2008 12:23:16 +0000
Subject: ok

---
 sources/simulator/VSSimulatorFrame.java | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'sources/simulator/VSSimulatorFrame.java')

diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java
index c538284..2b9042c 100644
--- a/sources/simulator/VSSimulatorFrame.java
+++ b/sources/simulator/VSSimulatorFrame.java
@@ -1,5 +1,4 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs@dev.buetow.org
+/* * Copyright (c) 2008 Paul C. Buetow, vs@dev.buetow.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -145,13 +144,13 @@ public class VSSimulatorFrame extends VSFrame {
 
                 } else if (sourceText.equals(
                 finalPrefs.getString("lang.open"))) {
-                    pauseCurrentSimulator();
-                    resetCurrentSimulator();
+                    //pauseCurrentSimulator();
+                    //resetCurrentSimulator();
                     VSSerialize serialize = new VSSerialize();
                     VSSimulator simulator = serialize.openSimulator(
-                                                VSSerialize.STANDARD_FILENAME,
                                                 VSSimulatorFrame.this);
-                    addSimulator(simulator);
+					if (simulator != null)
+                    	addSimulator(simulator);
 
                 } else if (sourceText.equals(
                 finalPrefs.getString("lang.save"))) {
@@ -159,9 +158,17 @@ public class VSSimulatorFrame extends VSFrame {
                     pauseCurrentSimulator();
                     resetCurrentSimulator();
                     VSSerialize serialize = new VSSerialize();
-                    serialize.saveSimulator(VSSerialize.STANDARD_FILENAME,
+                    serialize.saveSimulator(VSSerialize.LAST_FILENAME,
                                             currentSimulator);
 
+                } else if (sourceText.equals(
+                finalPrefs.getString("lang.saveas"))) {
+
+                    pauseCurrentSimulator();
+                    resetCurrentSimulator();
+                    VSSerialize serialize = new VSSerialize();
+                    serialize.saveSimulator(currentSimulator);
+
                 } else if (sourceText.equals(
                 finalPrefs.getString("lang.about"))) {
                     new VSAbout(finalPrefs, VSSimulatorFrame.this);
@@ -564,4 +571,13 @@ public class VSSimulatorFrame extends VSFrame {
 
         return new ImageIcon(imageURL, descr);
     }
+
+    /**
+     * Gets the prefs.
+     *
+     * @return the prefs
+     */
+    public VSPrefs getPrefs() {
+        return prefs;
+    }
 }
-- 
cgit v1.2.3