save nickel fenetre+bouton

Banniere.java

@@ -5,6 +5,7 @@ public class Banniere extends JPanel {
 	private FrameJeu fenetre;
 	private FrameMenu menu;
 	private JButton save;
+	private JLabel mines;
 	//	Définition du constructeur
 	public Banniere(int mines, FrameJeu fenetre, FrameMenu menu, Grille grille) {
 		super();
@@ -16,6 +17,11 @@ public class Banniere extends JPanel {
 		this.setBackground(new Color(0, 236, 96));
 		this.setLayout(new BorderLayout());
 
+		//	Compteur de mines restantes
+
+		this.mines= new JLabel();
+		this.add(this.mines, BorderLayout.NORTH);
+
 		//	Bouton pour sauver et quitter
 		this.save = new JButton("Sauver et quitter");
 		save.addActionListener(new SaveListener(grille, fenetre));
@@ -24,8 +30,7 @@ public class Banniere extends JPanel {
 
 	//	Méthode pour afficher le nombre de mines restantes
 	public void setMinesLeft(int minesLeft) {
-		JLabel mines = new JLabel("Mines restantes : "+Integer.toString(minesLeft));
+		this.mines.setText("Mines restantes : "+Integer.toString(minesLeft));
-		this.add(mines, BorderLayout.NORTH);
 		this.repaint();
 	}
 

Chargement.java

@@ -0,0 +1,16 @@
+import java.awt.event.*;
+public class Chargement implements ActionListener {
+    private FrameMenu menu;
+    public Chargement(FrameMenu menu){
+        this.menu=menu;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        this.menu.dispose();
+        SaveManager saveManager = new SaveManager();
+        SaveManager.SaveData donnees = saveManager.load("Save.txt");
+        System.out.println(donnees);
+    }
+    
+}

FrameMenu.java

@@ -1,5 +1,6 @@
 import javax.swing.*;
 import java.awt.event.*;
+import java.io.File;
 import java.awt.*;
 
 // Cette classe à pour but d'afficher un menu et de réagir aux directives de l'utilisateur (lancer le jeu, le quitter...)
@@ -71,7 +72,7 @@ public class FrameMenu extends JFrame{
 		JButton newGame = new JButton("Jouer");
 		newGame.addActionListener(new NewGameListener(this));
 
-		newGame.setBounds(frameSize.width*10/15, frameSize.height*12/15, frameSize.width/5, frameSize.height/15);;
+		newGame.setBounds(frameSize.width*7/10, frameSize.height*12/15, frameSize.width/5, frameSize.height/15);;
 		this.add(newGame);
 
 		JButton exit = new JButton("Quitter");
@@ -83,8 +84,15 @@ public class FrameMenu extends JFrame{
 
 		exit.setBounds(frameSize.width/10, frameSize.height*12/15, frameSize.width/5, frameSize.height/15);
 		this.add(exit);
+		
+		File save = new File("Save.txt");
+		if(save.exists()){
+			JButton charger = new JButton("Charger");
+			charger.addActionListener(new Chargement(this));
+			charger.setBounds(frameSize.width*4/10, frameSize.height*12/15, frameSize.width/5, frameSize.height/15);
+			this.add(charger);
+		}
 
-		//TODO : Bouton charger
 		this.setResizable(false);
 	    this.setVisible(true);
 	}

MenuListener.java

@@ -10,6 +10,8 @@ public class MenuListener implements ActionListener{
     @Override
     public void actionPerformed(ActionEvent event){
         this.menu.setVisible(true);
+        WindowListener[] wl= this.fenetre.getWindowListeners();
+        this.fenetre.removeWindowListener(wl[0]);
         this.fenetre.dispose();
     }
 }

SaveAndCloseListener.java

@@ -13,7 +13,6 @@ public class SaveAndCloseListener implements WindowListener{
     public void windowClosing(WindowEvent e) {
         SaveManager saveManager = new SaveManager();
         saveManager.save(this.grille, "Save.txt");
-        SaveManager.SaveData donnees = saveManager.load("Save.txt");
         
     }
 

SaveListener.java

@@ -11,7 +11,6 @@ public class SaveListener implements ActionListener {
     public void actionPerformed(ActionEvent event){
         SaveManager saveManager = new SaveManager();
         saveManager.save(this.grille, "Save.txt");
-        SaveManager.SaveData donnees = saveManager.load("Save.txt");
         this.fenetre.dispose();
     }
 }

SaveManager.java

@@ -49,6 +49,9 @@ public class SaveManager {
             e.printStackTrace();
         }
 
+        File save = new File(nomFichier);
+        save.delete();
+
         toRet.cases=toReturn;
         toRet.taille=dimension;
         return toRet;

SaveTester.java

@@ -1,9 +0,0 @@
-public class SaveTester {
-    public static void main(String[] args) {
-        Grille grille = new Grille(10,10,10, null, null);
-        SaveManager saveManager = new SaveManager();
-
-        saveManager.save(grille, "test_sauvegarde.txt");
-        SaveManager.SaveData donnees = saveManager.load("test_sauvegarde.txt");
-    }
-}