diff --git a/build/classes/gui/GUIMyBank$1.class b/build/classes/gui/GUIMyBank$1.class index 041d0fb..baf3fee 100644 Binary files a/build/classes/gui/GUIMyBank$1.class and b/build/classes/gui/GUIMyBank$1.class differ diff --git a/build/classes/gui/GUIMyBank$2.class b/build/classes/gui/GUIMyBank$2.class index 43255d9..75ef029 100644 Binary files a/build/classes/gui/GUIMyBank$2.class and b/build/classes/gui/GUIMyBank$2.class differ diff --git a/build/classes/gui/GUIMyBank$3.class b/build/classes/gui/GUIMyBank$3.class index 7b7ff72..143799a 100644 Binary files a/build/classes/gui/GUIMyBank$3.class and b/build/classes/gui/GUIMyBank$3.class differ diff --git a/build/classes/gui/GUIMyBank$4.class b/build/classes/gui/GUIMyBank$4.class index dd87cbc..445f6b4 100644 Binary files a/build/classes/gui/GUIMyBank$4.class and b/build/classes/gui/GUIMyBank$4.class differ diff --git a/build/classes/gui/GUIMyBank$5.class b/build/classes/gui/GUIMyBank$5.class index 2181969..3369ff1 100644 Binary files a/build/classes/gui/GUIMyBank$5.class and b/build/classes/gui/GUIMyBank$5.class differ diff --git a/build/classes/gui/GUIMyBank.class b/build/classes/gui/GUIMyBank.class index bbee831..229872f 100644 Binary files a/build/classes/gui/GUIMyBank.class and b/build/classes/gui/GUIMyBank.class differ diff --git a/build/classes/logic/MyBank.class b/build/classes/logic/MyBank.class index ad5a391..b9400e3 100644 Binary files a/build/classes/logic/MyBank.class and b/build/classes/logic/MyBank.class differ diff --git a/src/gui/GUIMyBank.java b/src/gui/GUIMyBank.java index f5bf08b..6fface5 100644 --- a/src/gui/GUIMyBank.java +++ b/src/gui/GUIMyBank.java @@ -7,6 +7,7 @@ package gui; import java.awt.Color; import java.io.IOException; import java.text.ParseException; +import java.util.ArrayList; import java.util.Date; import java.util.regex.Pattern; import logic.MyBank; @@ -33,6 +34,12 @@ public class GUIMyBank extends javax.swing.JFrame { */ public GUIMyBank() { initComponents(); + try { + ArrayList conti = (ArrayList) MyBank.importaConti(); + MyBank.setConti(conti); + } catch (IOException e) { + JOptionPane.showMessageDialog(null, e.getMessage()); + } lblNumeroContoCorrente.setVisible(false); txtNumeroContoCorrente.setVisible(false); txtNumeroContoCorrente.setEditable(false); diff --git a/src/logic/MyBank.java b/src/logic/MyBank.java index 7943623..0af6a65 100644 --- a/src/logic/MyBank.java +++ b/src/logic/MyBank.java @@ -14,9 +14,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import java.util.InputMismatchException; +import java.util.List; import java.util.Scanner; -import java.util.regex.Matcher; import java.util.regex.Pattern; import com.fasterxml.jackson.databind.ObjectMapper; @@ -36,49 +35,17 @@ public class MyBank { static final String ERRORE_GENERICO = "Errore: opzione non valida."; static final String ERRORE_CONTI_VUOTO = "Errore: รจ necessario aggiungere almeno un conto corrente prima di proseguire."; public static final String PATH_CONTI = "./src/logic/conti/"; - private static ArrayList conti = importaConti(); + private static ArrayList conti; + + public static void setConti(ArrayList conti) { + MyBank.conti = conti; + } public static ArrayList getConti() { return conti; } - public static void main(String[] args) { - int scelta = -1; - - do { - System.out.println("Scegliere un'opzione:"); - System.out.println("1. Aprire conto corrente"); - System.out.println("2. Versamento"); - System.out.println("3. Prelievo"); - System.out.println("4. Mostra movimenti"); - System.out.println("0. Esci"); - System.out.print("Opzione: "); - - try { - scelta = sc.nextInt(); - sc.nextLine(); - - switch (scelta) { - case 0: - break; - default: - System.out.println(ERRORE_GENERICO); - pausa(); - break; - } - } catch (InputMismatchException _) { - System.out.println(ERRORE_GENERICO); - pausa(); - } - } while (scelta != 0); - } - - public static void pausa() { - System.out.println("Premere un tasto per continuare. . ."); - sc.nextLine(); - } - - static ArrayList importaConti() { + public static List importaConti() throws IOException{ ArrayList conti = new ArrayList<>(); File percorsoConti = new File(PATH_CONTI); ObjectMapper mapper = new ObjectMapper(); @@ -104,10 +71,8 @@ public class MyBank { numeriContiCorrenti.add(conti.getLast().getNumeroContoCorrente()); ContoCorrente.setNumeriContiCorrenti(numeriContiCorrenti); - } catch (Exception e) { - System.out.println("Errore nella lettura del file di conto corrente."); - System.out.println(e.getMessage()); - System.out.println(e.getStackTrace()); + } catch (IOException e) { + throw new IOException("Errore nella lettura del file di conto corrente:\n" + e.getMessage()); } } }