From 35a03fed34a1faee040589694af52f7691462d58 Mon Sep 17 00:00:00 2001 From: hneemann Date: Wed, 3 Apr 2019 21:10:47 +0200 Subject: [PATCH] renamed some methods and variables --- .../de/neemann/digital/fsm/gui/FSMFrame.java | 17 +++++++++-------- src/main/java/de/neemann/digital/gui/Main.java | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/neemann/digital/fsm/gui/FSMFrame.java b/src/main/java/de/neemann/digital/fsm/gui/FSMFrame.java index c90b5e24b..e14a89ef7 100644 --- a/src/main/java/de/neemann/digital/fsm/gui/FSMFrame.java +++ b/src/main/java/de/neemann/digital/fsm/gui/FSMFrame.java @@ -58,7 +58,7 @@ public class FSMFrame extends JFrame implements ClosingWindowListener.ConfirmSav private File filename; private File baseFilename; private boolean lastModified; - private String circuitName; + private String probeLabelName; /** * Creates a new instance @@ -391,22 +391,23 @@ public class FSMFrame extends JFrame implements ClosingWindowListener.ConfirmSav } /** - * Sets the fsm name used in the circuit wich has opened this window + * Sets the fsm name used in the circuit probe label which has opened + * this window. * - * @param circuitName the fsm name contained in the circuit + * @param probeLabelName the fsm name contained in the circuit * @return this for chained calls */ - public FSMFrame setCircuitName(String circuitName) { - this.circuitName = circuitName; + public FSMFrame setProbeLabelName(String probeLabelName) { + this.probeLabelName = probeLabelName; return this; } private File getFileNameFromHistory() { File f = fileHistory.getMostRecent(); if (f != null) - for (File l : fileHistory.getFiles()) - if (l.getName().equals(circuitName)) - f = l; + for (File hf : fileHistory.getFiles()) + if (hf.getName().equals(probeLabelName)) + f = hf; return f; } diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java index 6a7ce93ea..26fefaf34 100644 --- a/src/main/java/de/neemann/digital/gui/Main.java +++ b/src/main/java/de/neemann/digital/gui/Main.java @@ -1149,7 +1149,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS new FSMFrame(Main.this, library) .setBaseFileName(filename) - .setCircuitName(foundName) + .setProbeLabelName(foundName) .registerTo(Main.this) .setVisible(true); }