From b1b8cbd2b4598a829805542404ea3cc584fe8deb Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Wed, 17 Jul 2019 09:51:15 +0200
Subject: [PATCH] simplified builder again

---
 .../java/de/neemann/digital/gui/Main.java     | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java
index c1c9433c9..d6a01d003 100644
--- a/src/main/java/de/neemann/digital/gui/Main.java
+++ b/src/main/java/de/neemann/digital/gui/Main.java
@@ -182,18 +182,16 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
 
         circuitComponent = new CircuitComponent(this, library, shapeFactory);
         circuitComponent.addListener(this);
-        if (!builder.dontOpenFile) {
-            if (builder.circuit != null) {
-                SwingUtilities.invokeLater(() -> circuitComponent.setCircuit(builder.circuit));
-                setFilename(builder.fileToOpen, false);
+        if (builder.circuit != null) {
+            SwingUtilities.invokeLater(() -> circuitComponent.setCircuit(builder.circuit));
+            setFilename(builder.fileToOpen, false);
+        } else {
+            if (builder.fileToOpen != null) {
+                SwingUtilities.invokeLater(() -> loadFile(builder.fileToOpen, builder.library == null, builder.library == null));
             } else {
-                if (builder.fileToOpen != null) {
-                    SwingUtilities.invokeLater(() -> loadFile(builder.fileToOpen, builder.library == null, builder.library == null));
-                } else {
-                    File name = fileHistory.getMostRecent();
-                    if (name != null) {
-                        SwingUtilities.invokeLater(() -> loadFile(name, true, false));
-                    }
+                File name = fileHistory.getMostRecent();
+                if (name != null) {
+                    SwingUtilities.invokeLater(() -> loadFile(name, true, false));
                 }
             }
         }
@@ -1834,7 +1832,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
             SwingUtilities.invokeLater(() -> {
                 final boolean tutorial = Settings.getInstance().getAttributes().get(Keys.SETTINGS_SHOW_TUTORIAL);
                 if (tutorial)
-                    builder.setDontOpenAFile(true);
+                    builder.setCircuit(new Circuit());
 
                 Main main = builder.build();
                 try {
@@ -1864,7 +1862,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
         private File baseFileName;
         private boolean keepPrefMainFile;
         private boolean mainFrame = false;
-        private boolean dontOpenFile =false;
 
         /**
          * @param fileToOpen the file to open
@@ -1932,14 +1929,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
             return this;
         }
 
-        /**
-         * Avoids to open a file
-         * @param dontOpenFile true if no file should be opened
-         */
-        public void setDontOpenAFile(boolean dontOpenFile) {
-            this.dontOpenFile = dontOpenFile;
-        }
-
         /**
          * Creates a new Main instance
          *