From bc364e5433963d20ef4795f6ffa8dc64c54302e0 Mon Sep 17 00:00:00 2001 From: HassanAli66 Date: Tue, 25 Oct 2022 23:58:55 +0200 Subject: [PATCH 1/2] [GUI] Prompting errors when it fails to load. --- src/sic/asm/ErrorCatcher.java | 5 ++++- src/sic/sim/MainView.java | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/sic/asm/ErrorCatcher.java b/src/sic/asm/ErrorCatcher.java index 09e645c..ba13be9 100644 --- a/src/sic/asm/ErrorCatcher.java +++ b/src/sic/asm/ErrorCatcher.java @@ -39,11 +39,14 @@ public void printByRow(int row) { System.err.println(err); } - public void print() { + public String print() { + String allErrs=""; for ( ; lastPrinted < errs.size(); lastPrinted++) { AsmError err = errs.get(lastPrinted); System.err.println(err); + allErrs+=(err+"\n"); } + return allErrs; } public boolean shouldEnd() { diff --git a/src/sic/sim/MainView.java b/src/sic/sim/MainView.java index a1a6bc0..b312523 100644 --- a/src/sic/sim/MainView.java +++ b/src/sic/sim/MainView.java @@ -71,7 +71,7 @@ public MainView(final Executor executor, Disassembler disassembler, Args arg) { mainPanel.add(westPanel, BorderLayout.WEST); mainPanel.add(eastPanel, BorderLayout.CENTER); - mainFrame = new JFrame("SicTools"); + mainFrame = new JFrame("SicTools_Modified_By_HassanAli"); mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); mainFrame.setJMenuBar(createMenuBar()); mainFrame.setContentPane(mainPanel); @@ -331,7 +331,14 @@ public void loadAsm(File file) { ErrorCatcher errorCatcher = assembler.errorCatcher; Program program = assembler.assemble(Utils.readFile(file)); if (errorCatcher.count() > 0) { - errorCatcher.print(); + String allErrs = errorCatcher.print(); + JTextArea errArea = new JTextArea(allErrs); + JScrollPane scrollPane = new JScrollPane(errArea); + errArea.setLineWrap(true); + errArea.setWrapStyleWord(true); + scrollPane.setPreferredSize(new Dimension( 250, 250 )); + JOptionPane.showMessageDialog(mainFrame, scrollPane, "Error", JOptionPane.INFORMATION_MESSAGE); + updateView(); if (errorCatcher.shouldEnd()) { return; } From cf0461a9e2e8720828db01e16edec0bb429814e1 Mon Sep 17 00:00:00 2001 From: HassanAli66 <89529759+HassanAli66@users.noreply.github.com> Date: Wed, 26 Oct 2022 00:18:09 +0200 Subject: [PATCH 2/2] Title changed --- src/sic/sim/MainView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sic/sim/MainView.java b/src/sic/sim/MainView.java index b312523..64311ac 100644 --- a/src/sic/sim/MainView.java +++ b/src/sic/sim/MainView.java @@ -71,7 +71,7 @@ public MainView(final Executor executor, Disassembler disassembler, Args arg) { mainPanel.add(westPanel, BorderLayout.WEST); mainPanel.add(eastPanel, BorderLayout.CENTER); - mainFrame = new JFrame("SicTools_Modified_By_HassanAli"); + mainFrame = new JFrame("SicTools"); mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); mainFrame.setJMenuBar(createMenuBar()); mainFrame.setContentPane(mainPanel);