Skip to content

Commit

Permalink
simple refactoring done
Browse files Browse the repository at this point in the history
  • Loading branch information
Ajdin Becirovic committed Dec 24, 2021
1 parent aa4062e commit f3a7890
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions src/sample/Controller.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
package sample;

import backend.*;
import javafx.application.Platform;
import javafx.event.Event;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.*;
import javafx.scene.control.cell.MapValueFactory;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.control.skin.ScrollBarSkin;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.input.MouseEvent;
Expand Down Expand Up @@ -81,15 +77,15 @@ public class Controller {

public AnchorPane dataPathPane;
public ImageView registersImg;
private Map<ImageView, Pair<Tooltip, Function<String, String>>> toolTips = new HashMap<>();
private final Map<ImageView, Pair<Tooltip, Function<String, String>>> toolTips = new HashMap<>();

private Map<ImageView, Image[]> dataPathImages = new HashMap<>();
private final Map<ImageView, Image[]> dataPathImages = new HashMap<>();

private CodeParser codeParser = CodeParser.getInstance();
private InstructionParser instructionParser = InstructionParser.getInstance();
private final CodeParser codeParser = CodeParser.getInstance();
private final InstructionParser instructionParser = InstructionParser.getInstance();
private CPU cpu = new CPU();

private int[][] microCodeLinesLengths = new int[256][2];
private final int[][] microCodeLinesLengths = new int[256][2];

@FXML
public void initialize() {
Expand Down Expand Up @@ -350,8 +346,7 @@ public void newFileAction() {
Optional<ButtonType> selectedOption = confirmationAlertShowAndWait();
if (!btnRun.isDisabled()) {
if (selectedOption.isPresent() && selectedOption.get() == ButtonType.OK)
System.out.println("OK");
codeArea.clear();
codeArea.clear();
} else {
if (selectedOption.isPresent() && selectedOption.get() == ButtonType.OK)
reinitialiseAppState();
Expand Down

0 comments on commit f3a7890

Please sign in to comment.