TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-15 07:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplified builder again

Browse Source
This commit is contained in:
hneemann 2019-07-17 09:51:15 +02:00
parent 098456b8d9
commit b1b8cbd2b4
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/de/neemann/digital/gui/Main.java
View File

@ -182,18 +182,16 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
circuitComponent = new CircuitComponent(this, library, shapeFactory); circuitComponent = new CircuitComponent(this, library, shapeFactory);
circuitComponent.addListener(this); circuitComponent.addListener(this);
if (!builder.dontOpenFile) { if (builder.circuit != null) {
if (builder.circuit != null) { SwingUtilities.invokeLater(() -> circuitComponent.setCircuit(builder.circuit));
SwingUtilities.invokeLater(() -> circuitComponent.setCircuit(builder.circuit)); setFilename(builder.fileToOpen, false);
setFilename(builder.fileToOpen, false); } else {
if (builder.fileToOpen != null) {
SwingUtilities.invokeLater(() -> loadFile(builder.fileToOpen, builder.library == null, builder.library == null));
} else { } else {
if (builder.fileToOpen != null) { File name = fileHistory.getMostRecent();
SwingUtilities.invokeLater(() -> loadFile(builder.fileToOpen, builder.library == null, builder.library == null)); if (name != null) {
} else { 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(() -> { SwingUtilities.invokeLater(() -> {
final boolean tutorial = Settings.getInstance().getAttributes().get(Keys.SETTINGS_SHOW_TUTORIAL); final boolean tutorial = Settings.getInstance().getAttributes().get(Keys.SETTINGS_SHOW_TUTORIAL);
if (tutorial) if (tutorial)
builder.setDontOpenAFile(true); builder.setCircuit(new Circuit());
Main main = builder.build(); Main main = builder.build();
try { try {
@ -1864,7 +1862,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
private File baseFileName; private File baseFileName;
private boolean keepPrefMainFile; private boolean keepPrefMainFile;
private boolean mainFrame = false; private boolean mainFrame = false;
private boolean dontOpenFile =false;
/** /**
* @param fileToOpen the file to open * @param fileToOpen the file to open
@ -1932,14 +1929,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
return this; 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 * Creates a new Main instance
* *