From c059255e540ace2f9f48394068a8cb2c7fbdce51 Mon Sep 17 00:00:00 2001
From: monint <tom.monin@etu.u-pec.fr>
Date: Wed, 11 May 2022 20:31:30 +0200
Subject: [PATCH] ajout

---
 .vscode/configurationCache.log |   1 +
 .vscode/dryrun.log             |  17 ++
 .vscode/settings.json          |   3 +
 .vscode/targets.log            | 410 +++++++++++++++++++++++++++++++++
 Makefile                       |   2 +-
 observateurButtonEtText.java   |  32 ++-
 paintMenuJeu.java              |  61 +++--
 plateau.java                   |  90 +++++---
 sauvegarde.data                | Bin 39650 -> 18570 bytes
 9 files changed, 545 insertions(+), 71 deletions(-)
 create mode 100644 .vscode/configurationCache.log
 create mode 100644 .vscode/dryrun.log
 create mode 100644 .vscode/settings.json
 create mode 100644 .vscode/targets.log

diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log
new file mode 100644
index 0000000..74f0781
--- /dev/null
+++ b/.vscode/configurationCache.log
@@ -0,0 +1 @@
+{"buildTargets":["Case.class","but","clean","main_ex.class","observateurButtonEtText.class","observateurCase.class","observateurChoix.class","observateurFenetre.class","observateurSAV.class","paintChoix.class","paintMenuJeu.class","plateau.class","plusoumoins.class","run"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
\ No newline at end of file
diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log
new file mode 100644
index 0000000..2905db7
--- /dev/null
+++ b/.vscode/dryrun.log
@@ -0,0 +1,17 @@
+make --dry-run --always-make --keep-going --print-directory
+make: Entering directory `/Users/tommonin/Documents/SAE21_2021'
+javac -implicit:none Case.java
+ 
+javac -implicit:none plateau.java
+javac -implicit:none observateurCase.java
+javac -implicit:none paintMenuJeu.java
+javac -implicit:none observateurSAV.java
+javac -implicit:none observateurFenetre.java
+javac -implicit:none paintChoix.java
+javac -implicit:none observateurChoix.java
+ 
+javac -implicit:none plusoumoins.java
+javac -implicit:none observateurButtonEtText.java
+javac -implicit:none main_ex.java
+make: Leaving directory `/Users/tommonin/Documents/SAE21_2021'
+ 
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..65e1ec0
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "makefile.extensionOutputFolder": "./.vscode"
+}
\ No newline at end of file
diff --git a/.vscode/targets.log b/.vscode/targets.log
new file mode 100644
index 0000000..422eb40
--- /dev/null
+++ b/.vscode/targets.log
@@ -0,0 +1,410 @@
+make all --print-data-base --no-builtin-variables --no-builtin-rules --question
+# GNU Make 3.81
+# Copyright (C) 2006  Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.
+# There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# This program built for i386-apple-darwin11.3.0
+
+# Make data base, printed on Wed May 11 20:30:49 2022
+
+# Variables
+
+# automatic
+<D = $(patsubst %/,%,$(dir $<))
+# automatic
+?F = $(notdir $?)
+# environment
+VSCODE_LOG_NATIVE = false
+# automatic
+?D = $(patsubst %/,%,$(dir $?))
+# automatic
+@D = $(patsubst %/,%,$(dir $@))
+# automatic
+@F = $(notdir $@)
+# makefile
+CURDIR := /Users/tommonin/Documents/SAE21_2021
+# makefile
+SHELL = /bin/sh
+# environment
+VSCODE_NLS_CONFIG = {"locale":"fr","availableLanguages":{"*":"fr"},"_languagePackId":"25fe6a3290ec415596628d4afc87a88c.fr","_translationsConfigFile":"/Users/tommonin/Library/Application Support/Code/clp/25fe6a3290ec415596628d4afc87a88c.fr/tcf.json","_cacheRoot":"/Users/tommonin/Library/Application Support/Code/clp/25fe6a3290ec415596628d4afc87a88c.fr","_resolvedLanguagePackCoreLocation":"/Users/tommonin/Library/Application Support/Code/clp/25fe6a3290ec415596628d4afc87a88c.fr/da15b6fd3ef856477bf6f4fb29ba1b7af717770d","_corruptedFile":"/Users/tommonin/Library/Application Support/Code/clp/25fe6a3290ec415596628d4afc87a88c.fr/corrupted.info","_languagePackSupport":true}
+# environment
+_ = /usr/bin/make
+# makefile (from `Makefile', line 19)
+CFLAGS = -implicit:none
+# makefile (from `Makefile', line 1)
+MAKEFILE_LIST :=  Makefile
+# environment
+VSCODE_VERBOSE_LOGGING = true
+# environment
+__CFBundleIdentifier = com.microsoft.VSCode
+# environment
+INFOPATH = /opt/homebrew/share/info:
+# environment
+VSCODE_IPC_HOOK_EXTHOST = /var/folders/z7/5ldy4cvx299dqsp97x3f2vj80000gn/T/vscode-ipc-30381884-6d2b-41f6-b5b5-a06e4be98907.sock
+# environment
+VSCODE_CWD = /
+# environment
+PATH = /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin
+# environment
+LSCOLORS = Gxfxcxdxbxegedabagacad
+# environment
+VSCODE_LOG_STACK = false
+# environment
+ELECTRON_RUN_AS_NODE = 1
+# default
+.FEATURES := target-specific order-only second-expansion else-if archives jobserver check-symlink
+# environment
+SSH_AUTH_SOCK = /private/tmp/com.apple.launchd.Dc3E9i80R2/Listeners
+# automatic
+%F = $(notdir $%)
+# environment
+VSCODE_PIPE_LOGGING = true
+# environment
+PWD = /Users/tommonin/Documents/SAE21_2021
+# environment
+HOMEBREW_CELLAR = /opt/homebrew/Cellar
+# environment
+ORIGINAL_XDG_CURRENT_DESKTOP = undefined
+# environment
+MANPATH = /opt/homebrew/share/man::
+# environment
+VSCODE_AMD_ENTRYPOINT = vs/workbench/api/node/extensionHostProcess
+# environment
+HOME = /Users/tommonin
+# default
+MAKEFILEPATH = $(shell /usr/bin/xcode-select -print-path 2>/dev/null || echo /Developer)/Makefiles
+# environment
+VSCODE_CODE_CACHE_PATH = /Users/tommonin/Library/Application Support/Code/CachedData/da15b6fd3ef856477bf6f4fb29ba1b7af717770d
+# environment
+LOGNAME = tommonin
+# environment
+APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = 1
+# environment
+ZSH = /Users/tommonin/.oh-my-zsh
+# environment
+VSCODE_HANDLES_UNCAUGHT_ERRORS = true
+# automatic
+^D = $(patsubst %/,%,$(dir $^))
+# environment
+XPC_FLAGS = 0x0
+# default
+MAKE = $(MAKE_COMMAND)
+# default
+MAKECMDGOALS := all
+# environment
+SHLVL = 1
+# default
+MAKE_VERSION := 3.81
+# environment
+USER = tommonin
+# makefile
+.DEFAULT_GOAL := but
+# environment
+LESS = -R
+# automatic
+%D = $(patsubst %/,%,$(dir $%))
+# default
+MAKE_COMMAND := /Library/Developer/CommandLineTools/usr/bin/make
+# default
+.VARIABLES := 
+# environment
+TMPDIR = /var/folders/z7/5ldy4cvx299dqsp97x3f2vj80000gn/T/
+# automatic
+*F = $(notdir $*)
+# environment
+VSCODE_IPC_HOOK = /Users/tommonin/Library/Application Support/Code/1.67.1-main.sock
+# makefile
+MAKEFLAGS = Rrqp
+# environment
+MFLAGS = -Rrqp
+# automatic
+*D = $(patsubst %/,%,$(dir $*))
+# environment
+XPC_SERVICE_NAME = application.com.microsoft.VSCode.23049971.23049977
+# environment
+HOMEBREW_PREFIX = /opt/homebrew
+# automatic
++D = $(patsubst %/,%,$(dir $+))
+# automatic
++F = $(notdir $+)
+# environment
+HOMEBREW_REPOSITORY = /opt/homebrew
+# environment
+__CF_USER_TEXT_ENCODING = 0x1F5:0x0:0x1
+# environment
+COMMAND_MODE = unix2003
+# default
+MAKEFILES := 
+# automatic
+<F = $(notdir $<)
+# environment
+PAGER = less
+# environment
+LC_ALL = C
+# automatic
+^F = $(notdir $^)
+# default
+SUFFIXES := 
+# default
+.INCLUDE_DIRS = /usr/local/include
+# makefile (from `Makefile', line 8)
+OFILES = Case.class plateau.class observateurCase.class paintMenuJeu.class observateurSAV.class observateurFenetre.class paintChoix.class observateurChoix.class plusoumoins.class observateurButtonEtText.class
+# environment
+MAKELEVEL := 0
+# environment
+LANG = C
+# environment
+VSCODE_PID = 18516
+# variable set hash-table stats:
+# Load=73/1024=7%, Rehash=0, Collisions=1/98=1%
+
+# Pattern-specific Variable Values
+
+# No pattern-specific variable values.
+
+# Directories
+
+# . (device 16777231, inode 22333054): 37 files, no impossibilities.
+
+# 37 files, no impossibilities in 1 directories.
+
+# Implicit Rules
+
+# No implicit rules.
+
+# Files
+
+but: main_ex.class
+#  Phony target (prerequisite of .PHONY).
+#  Implicit rule search has not been done.
+#  File does not exist.
+#  File has not been updated.
+
+# Not a target:
+observateurSAV.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+observateurCase.class: observateurCase.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 29):
+	javac $(CFLAGS) observateurCase.java
+	
+
+observateurChoix.class: observateurChoix.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 49):
+	javac $(CFLAGS) observateurChoix.java
+	
+
+# Not a target:
+Case.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+paintMenuJeu.class: paintMenuJeu.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 32):
+	javac $(CFLAGS) paintMenuJeu.java
+	
+
+# Not a target:
+all:
+#  Command-line target.
+#  Implicit rule search has been done.
+#  File does not exist.
+#  File has not been updated.
+# variable set hash-table stats:
+# Load=0/32=0%, Rehash=0, Collisions=0/0=0%
+
+# Not a target:
+observateurButtonEtText.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+.PHONY: but clean but run
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+# Not a target:
+plateau.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+paintChoix.class: paintChoix.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 46):
+	javac $(CFLAGS) paintChoix.java
+	
+
+# Not a target:
+observateurFenetre.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+# Not a target:
+.SUFFIXES:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+# Not a target:
+observateurCase.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+main_ex.class: Case.class plateau.class observateurCase.class paintMenuJeu.class observateurSAV.class observateurFenetre.class paintChoix.class observateurChoix.class plusoumoins.class observateurButtonEtText.class main_ex.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 43):
+	javac $(CFLAGS) main_ex.java
+	
+
+# Not a target:
+Makefile:
+#  Implicit rule search has been done.
+#  Last modified 2022-05-11 11:16:40
+#  File has been updated.
+#  Successfully updated.
+# variable set hash-table stats:
+ 
+# Load=0/32=0%, Rehash=0, Collisions=0/0=0%
+
+# Not a target:
+observateurChoix.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+# Not a target:
+paintMenuJeu.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+# Not a target:
+paintChoix.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+plusoumoins.class: plusoumoins.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 52):
+	javac $(CFLAGS) plusoumoins.java
+	
+
+# Not a target:
+main_ex.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+# Not a target:
+.DEFAULT:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+run:
+#  Phony target (prerequisite of .PHONY).
+#  Implicit rule search has not been done.
+#  File does not exist.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 63):
+	java main_ex
+	
+
+clean:
+#  Phony target (prerequisite of .PHONY).
+#  Implicit rule search has not been done.
+#  File does not exist.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 60):
+	-rm -f $(OFILES) main_ex.class
+	
+
+# Not a target:
+plusoumoins.java:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+observateurSAV.class: observateurSAV.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 35):
+	javac $(CFLAGS) observateurSAV.java
+	
+
+Case.class: Case.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 23):
+	javac $(CFLAGS) Case.java
+	
+
+observateurButtonEtText.class: observateurButtonEtText.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 55):
+	javac $(CFLAGS) observateurButtonEtText.java
+	
+
+plateau.class: plateau.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 26):
+	javac $(CFLAGS) plateau.java
+	
+
+observateurFenetre.class: observateurFenetre.java
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 38):
+	javac $(CFLAGS) observateurFenetre.java
+	
+
+# files hash-table stats:
+# Load=30/1024=3%, Rehash=0, Collisions=1/69=1%
+# VPATH Search Paths
+
+# No `vpath' search paths.
+
+# No general (`VPATH' variable) search path.
+
+# # of strings in strcache: 1
+# # of strcache buffers: 1
+# strcache size: total = 4096 / max = 4096 / min = 4096 / avg = 4096
+# strcache free: total = 4087 / max = 4087 / min = 4087 / avg = 4087
+
+# Finished Make data base on Wed May 11 20:30:49 2022
+
+ 
+make: *** No rule to make target `all'.  Stop.
+
diff --git a/Makefile b/Makefile
index d97a56b..932ffe2 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ observateurButtonEtText.class: observateurButtonEtText.java
 #Chapitre 5: nettoyage des fichiers generes
 
 clean : 
-	-rm -f $(OFILES)
+	-rm -f $(OFILES) main_ex.class
 
 run :
 	java main_ex
diff --git a/observateurButtonEtText.java b/observateurButtonEtText.java
index ff6aea9..3419399 100644
--- a/observateurButtonEtText.java
+++ b/observateurButtonEtText.java
@@ -42,8 +42,36 @@ public class observateurButtonEtText implements ActionListener {
       }
     }
     if(this.fonction==2){
-      if(this.plat.getLigne()!=-1 && this.plat.getCollonne()!=-1 && this.plat.getBombe()!=-1){
-        this.plat.newGame();
+      int nombre=0;
+      try{
+        this.zone.setBackground(new Color(255,255,255));
+        nombre=Integer.parseInt(this.zone.getText());
+        if(nombre<0){
+          nombre=0;
+        }
+        if(this.plat.getLigne()!=-1 && this.plat.getCollonne()!=-1){
+          if(nombre>this.plat.getLigne()*this.plat.getCollonne()){
+            nombre=this.plat.getLigne()*this.plat.getCollonne();
+          }
+          this.plat.setBombe(nombre);
+          if(this.plat.getLigne()!=-1 && this.plat.getCollonne()!=-1 && this.plat.getBombe()!=-1){
+            this.plat.newGame();
+          }else{
+            if(this.plat.getBombe()==-1){
+            this.zone.setBackground(Color.red);
+            this.zone.setText("Rentrer un nombre de Bobme");
+            }
+          }
+        }else{
+          this.zone.setBackground(Color.red);
+          this.zone.setText("Selectionner Ligne et Collonne Avant");
+          this.plat.setBombe(-1);
+        }
+        this.plat.setBombe(nombre);
+      }catch(NumberFormatException e1){
+        this.zone.setBackground(Color.red);
+        this.zone.setText("rentrer un nombre valide");
+        this.plat.setBombe(-1);
       }
     }
     if(this.fonction==3){
diff --git a/paintMenuJeu.java b/paintMenuJeu.java
index 0739021..f831302 100644
--- a/paintMenuJeu.java
+++ b/paintMenuJeu.java
@@ -5,27 +5,11 @@ import javax.swing.JComponent;
 public class paintMenuJeu extends JComponent{
 	private int choix;
 	private int scoreMax, score;
-	private Image un, deux, trois, quatre, cinq, six, sept, huit, neuf, zero, err, sav, lose, win, replay;
 	private boolean survol;
 	public paintMenuJeu(int choix0, int score0, int scoreMax0){
 		this.choix=choix0;
 		this.score=score0;
 		this.scoreMax=scoreMax0;
-		this.un=Toolkit.getDefaultToolkit().getImage("./IMAGE/unD.png");
-		this.deux=Toolkit.getDefaultToolkit().getImage("./IMAGE/deuxD.png");
-		this.trois=Toolkit.getDefaultToolkit().getImage("./IMAGE/troisD.png");
-		this.quatre=Toolkit.getDefaultToolkit().getImage("./IMAGE/quatreD.png");
-		this.cinq=Toolkit.getDefaultToolkit().getImage("./IMAGE/cinqD.png");
-		this.six=Toolkit.getDefaultToolkit().getImage("./IMAGE/sixD.png");
-		this.sept=Toolkit.getDefaultToolkit().getImage("./IMAGE/septD.png");
-		this.huit=Toolkit.getDefaultToolkit().getImage("./IMAGE/huitD.png");
-		this.neuf=Toolkit.getDefaultToolkit().getImage("./IMAGE/neufD.png");
-		this.zero=Toolkit.getDefaultToolkit().getImage("./IMAGE/zeroD.png");
-		this.err=Toolkit.getDefaultToolkit().getImage("./IMAGE/err.png");
-		this.sav=Toolkit.getDefaultToolkit().getImage("./IMAGE/sav.png");
-		this.lose=Toolkit.getDefaultToolkit().getImage("./IMAGE/lose.png");
-		this.win=Toolkit.getDefaultToolkit().getImage("./IMAGE/win.png");
-		this.replay=Toolkit.getDefaultToolkit().getImage("./IMAGE/replay.png");
 		this.survol=false;
 	}
 	public void setChoix(int choix0){
@@ -86,56 +70,71 @@ public class paintMenuJeu extends JComponent{
     			secondPinceau.setColor(new Color(0,255,0));
     			secondPinceau.fillRect(0, 0, this.getWidth(), this.getHeight());
     		}
-    		secondPinceau.drawImage(this.sav, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    		Image sav=Toolkit.getDefaultToolkit().getImage("./IMAGE/sav.png");
+    		secondPinceau.drawImage(sav, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     	}
     	if(this.choix==5){
-    		secondPinceau.drawImage(this.lose, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    		Image lose=Toolkit.getDefaultToolkit().getImage("./IMAGE/lose.png");
+    		secondPinceau.drawImage(lose, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     	}
     	if(this.choix==6){
-    		secondPinceau.drawImage(this.win, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    		Image win=Toolkit.getDefaultToolkit().getImage("./IMAGE/win.png");
+    		secondPinceau.drawImage(win, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     	}
     	if(this.choix==7){
     		if(this.survol==true){
     			secondPinceau.setColor(new Color(0,255,0));
     			secondPinceau.fillRect(0, 0, this.getWidth(), this.getHeight());
     		}
-    		secondPinceau.drawImage(this.replay, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    		Image replay=Toolkit.getDefaultToolkit().getImage("./IMAGE/replay.png");
+    		secondPinceau.drawImage(replay, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     	}
     }
     private void paintNombre(Graphics secondPinceau, int nombre){
     	if(this.score>=0){
     		if(nombre==1){
-   				secondPinceau.drawImage(this.un, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image un=Toolkit.getDefaultToolkit().getImage("./IMAGE/unD.png");
+   				secondPinceau.drawImage(un, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
    			}
     		if(nombre==2){
-    			secondPinceau.drawImage(this.deux, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image deux=Toolkit.getDefaultToolkit().getImage("./IMAGE/deuxD.png");
+    			secondPinceau.drawImage(deux, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     		}
     		if(nombre==3){
-    			secondPinceau.drawImage(this.trois, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image trois=Toolkit.getDefaultToolkit().getImage("./IMAGE/troisD.png");
+    			secondPinceau.drawImage(trois, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     		}
     		if(nombre==4){
-    			secondPinceau.drawImage(this.quatre, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image quatre=Toolkit.getDefaultToolkit().getImage("./IMAGE/quatreD.png");
+    			secondPinceau.drawImage(quatre, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     		}
     		if(nombre==5){
-    			secondPinceau.drawImage(this.cinq, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image cinq=Toolkit.getDefaultToolkit().getImage("./IMAGE/cinqD.png");
+    			secondPinceau.drawImage(cinq, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     		}
     		if(nombre==6){
-    			secondPinceau.drawImage(this.six, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image six=Toolkit.getDefaultToolkit().getImage("./IMAGE/sixD.png");
+    			secondPinceau.drawImage(six, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     		}
     		if(nombre==7){
-    			secondPinceau.drawImage(this.sept, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image sept=Toolkit.getDefaultToolkit().getImage("./IMAGE/septD.png");
+    			secondPinceau.drawImage(sept, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     		}
     		if(nombre==8){
-    			secondPinceau.drawImage(this.huit, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image huit=Toolkit.getDefaultToolkit().getImage("./IMAGE/huitD.png");
+    			secondPinceau.drawImage(huit, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     		}
     		if(nombre==9){
-    			secondPinceau.drawImage(this.neuf, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image neuf=Toolkit.getDefaultToolkit().getImage("./IMAGE/neufD.png");
+    			secondPinceau.drawImage(neuf, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     		}
     		if(nombre==0){
-    			secondPinceau.drawImage(this.zero, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    			Image zero=Toolkit.getDefaultToolkit().getImage("./IMAGE/zeroD.png");
+    			secondPinceau.drawImage(zero, this.getWidth()/6, this.getHeight()/6, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     		}
     	}else{
-    		secondPinceau.drawImage(this.err, this.getWidth()/20*5, this.getHeight()/20*5, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
+    		Image err=Toolkit.getDefaultToolkit().getImage("./IMAGE/err.png");
+    		secondPinceau.drawImage(err, this.getWidth()/20*5, this.getHeight()/20*5, this.getWidth()/6*4, this.getHeight()/6*4 ,this);
     	}
     	
     }
diff --git a/plateau.java b/plateau.java
index 06ebae4..ac27937 100644
--- a/plateau.java
+++ b/plateau.java
@@ -20,8 +20,9 @@ public class plateau{
 		this.fenetre=fenetre0;
 		this.ligne=-1;
 		this.collonne=-1;
-		this.bombe=0;
+		this.bombe=-1;
 	}
+	//-------------------> Debut Seter et Getteur <-------------------------
 	public void setLogo(paintMenuJeu logo0){
 		this.logo=logo0;
 	}
@@ -49,6 +50,8 @@ public class plateau{
 	public void setBombe(int n){
 		this.bombe=n;
 	}
+	//-------------------------> fin Setter et Getteur <-----------------------------
+
 	//-------------------------Fonction plaçant les bombes aléatoirement------------------------
 
 	private void setAllBombe(){
@@ -227,7 +230,7 @@ public class plateau{
 		for(int i=0; i<ligne; i++){
 			for(int t=0; t<collonne; t++){
 				this.tableau[i][t]= new Case();
-				this.tableau[i][t].setPreferredSize(new Dimension(100,100));
+				this.tableau[i][t].setPreferredSize(new Dimension(50,50));
 				//nous ajoutons aussi a chaque case son observateur de case
 			}
 		}
@@ -241,31 +244,40 @@ public class plateau{
 
 	//------------------------------------> Fonction pour sauvegarder la partie <-------------------------
 
+/*
+
+Mettre les bloc try catch au bon endroit 
+*/
+
+
+
 	public void save(){
 		//les fonctions vont lever des Exeption nous devons donc mettre un try Catch
 		try{
 			//nous initialison le outputStream en créant le fichier "sauvegarde.data"
 			FileOutputStream sav = new FileOutputStream(new File("sauvegarde.data"));
-			//nous allons sérialiser le tableau de Case
-      		ObjectOutputStream oos = new ObjectOutputStream(sav);
-      		//nous écrivons donc tout d'abord la taille de celui-ci
-			oos.writeInt(this.ligne);
-			oos.writeInt(this.collonne);
-			//puis nous parcourons le tableau en sérialisant toute les Case
-			for(int i=0; i<this.ligne; i++){
-				for(int t=0; t<this.collonne; t++){
-					oos.writeObject(this.tableau[i][t]);
+      		try{
+      			//nous allons sérialiser le tableau de Case
+      			ObjectOutputStream oos = new ObjectOutputStream(sav);
+      			//nous écrivons donc tout d'abord la taille de celui-ci
+				oos.writeInt(this.ligne);
+				oos.writeInt(this.collonne);
+				//puis nous parcourons le tableau en sérialisant toute les Case
+				for(int i=0; i<this.ligne; i++){
+					for(int t=0; t<this.collonne; t++){
+						oos.writeObject(this.tableau[i][t]);
+					}
 				}
-			}
-			//nous écrivons ensuite le score Maximum(nombre de bombe) pour éviter de regarder toutes les Case plus tard
-			oos.writeInt(this.tabScore[0].getScoreMax());
-			//puis le score a l'instant T
-			oos.writeInt(this.tabScore[0].getScore());
-			//nous fermons la sauvegardes
+				//nous écrivons ensuite le score Maximum(nombre de bombe) pour éviter de regarder toutes les Case plus tard
+				oos.writeInt(this.tabScore[0].getScoreMax());
+				//puis le score a l'instant T
+				oos.writeInt(this.tabScore[0].getScore());
+				//nous fermons la sauvegardes
 			oos.close();
-			sav.close();
+			}catch(IOException e){
+
+			}
 		}catch(FileNotFoundException e1){
-		}catch(IOException e2){
 		}
 		//nous fermons la fenetre et donc arrêtons l'applications
 		this.fenetre.dispose();
@@ -276,24 +288,28 @@ public class plateau{
 		int score=0;
 		//les fonctions vont lever des Exeption nous devons donc mettre un try Catch
 		try{
-			//création de l'objet pour lire le fichier donner
-      		ObjectInputStream ois = new ObjectInputStream(file);
       		//initialisation des collonnes avec le fichier
-			this.ligne=ois.readInt();
-			this.collonne=ois.readInt();
-			//on crée le tableau de Case avec les bonnes dimention
-			this.tableau=new Case[this.ligne][this.collonne];
-			//on parcoure celui-ci et remettons les Case avec la sauvegarde
-			for(int i=0; i<ligne; i++){
-				for(int t=0; t<collonne; t++){
-					this.tableau[i][t]=(Case) ois.readObject();
+      		try{
+      			//création de l'objet pour lire le fichier donner
+      			ObjectInputStream ois = new ObjectInputStream(file);
+				this.ligne=ois.readInt();
+				this.collonne=ois.readInt();
+				//on crée le tableau de Case avec les bonnes dimention
+				this.tableau=new Case[this.ligne][this.collonne];
+				//on parcoure celui-ci et remettons les Case avec la sauvegarde
+				for(int i=0; i<ligne; i++){
+					for(int t=0; t<collonne; t++){
+						this.tableau[i][t]=(Case) ois.readObject();
+					}
 				}
+				//nous initialison maintenant le nombre de bombe
+				this.bombe=ois.readInt();
+				//puis le score
+				score=ois.readInt();
+				ois.close();
+			}catch(IOException e2){
+
 			}
-			//nous initialison maintenant le nombre de bombe
-			this.bombe=ois.readInt();
-			//puis le score
-			score=ois.readInt();
-		}catch(IOException e2){
 		}catch(ClassNotFoundException e3){
 		}
 		//nous pouvons maintenant lancer la partie sauvegarder
@@ -319,9 +335,9 @@ public class plateau{
 		panMenu.setBackground(new Color(0,0,0));
 		//on met un gestionaires de mise en page grille avec le nombre de ligne+1 (pour le menu en haut) et le nombre de collonne
 		panJeu.setLayout(new GridLayout(this.ligne,this.collonne));
-		panMenu.setLayout(new GridLayout(1, 7));
+		panMenu.setLayout(new GridLayout(1, 15));
 		//on met en place le menu du haut et donc toute la première ligne
-		for(int i=0; i<10; i++){
+		for(int i=0; i<15; i++){
 			paintMenuJeu menu= new paintMenuJeu(0, score, bombe);
 			//nous mettons des dimensions convenable pour des Case
 			menu.setPreferredSize(new Dimension(50,50));
@@ -339,7 +355,7 @@ public class plateau{
 				menu.setChoix(3);
 			}
 			//et la derniere au logo
-			if(i==9){
+			if(i==14){
 				menu.setChoix(4);
 				this.setLogo(menu);
 				observateurSAV observateur=new observateurSAV(menu, this);
diff --git a/sauvegarde.data b/sauvegarde.data
index 0a4e39c7332f3040f2086694ed5dddefe1623f4f..6d5afde5a782795aea72d0a4457a2ea5edae8f32 100644
GIT binary patch
literal 18570
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
Pr%m0b|2>5NL}2J|yClrQ

literal 39650
zcmdU$O>87b8HQ{8Z)d%0ue@eMmdz?534+Lj#Ls0p*zpgU#VfDuu<Uvd(4MIoH)(fw
zx@+tiBq9zgA%q0Ea6!35ih_g!BKKSn5ap0VPFW!#juBdcxa0r_1n>LJkL@HN4oK|V
z()@IFRrOO}eN{b=CBOa`H-0qboSVUGu`Jx!YE=4X?>+g8^~qoUX2gx{y79g2V9(dw
zblEQRIK)}H>t+t)GTw`mIN-v>VTQA`Q@F)%M~6{osXU6)*3z}r>>$rlpN22|wf^Mg
z<h37<y15NE6D4sgJwWlTlP9-#-9u43WM#d`lBBG;@n#aW%3XIZE?0&vc6>Npa@$Hi
zdFYF{*{!8{JA7l`ryE(lT|O5TEgv@BbW|tw^(YVS6Prd@HNxu3;KJ2SHy5RKUxuu(
zPOS3csmg<L)ScMNiiR(Od*oD&UTO6iyNGJDO=1k%z2IJSqbQ6Cd6T^HN4v1fgNx|m
zOcIyDr@q+4XK+uPx}QHp5UcBa=jA~)G@H(|yq#b7X*;-!r`lY*F}Q+i7Y=>MqP@hg
z?ni0M@3iwgD{z~~tVwmxM`>BT`Ehm7_$(&5ksS?&7u=(#ZZw?yL4~WxkMoTFQgjrS
zR<krjF$T6g`MvTV3um4hbyGEWxjrb~L4c4b-|>yLC`5=zX?b_nLb}?mCw@E2kPDZr
z;JG3~29!~9BTM3X_ePN&#+aa*dnm0BlCZqvriUlNUAWU5Bw(sTRt#&V5tn%s>ie9W
zE5~&<<JNvS@_b(#)?lcUsGGIJ^%ko4LS1E-o4wK~jat4ywaJ61vxDITw{YC&T8w4D
zfqghO{dMz``>)-;_mx+FI_f^X>mK3i=p}Z6d1?A$D<w&WVb|Q$Ue-<<<yLM%?6?0n
zL7em{C%tjaO<M|GkILtF-NUCN`8D4y*L(GL-Lzd}Bdqp)3&Jikxs_&x-}X5sGSu9q
zxE$cwWT5sIz7%nz;jv{*#pR8t{=9Es_vi=1*6z$foH8<YGM`2Ve!Y`p7UPg~t!y^+
zN0#K}R+@CNP2`1d4qJ>LB2Ccer0qxq96yR1VZY`o9lW}mZa%7GWn;TSo+G_{2O0iU
zKUW8rxRZ6UAAG1H^I;Frt%A`FZti&QR<k7I#Lm|L!`eY2=E$S&sr7|M6ZLjcVyU_L
z6CGL+@7O@A-sTnD!^agGX`{L}yma-BJO9xc17bg~+aXS>h#xu}Yhu{JojdMo0|mTO
z6Z6*_8+WI9fF)TyN|2@JdzG!1O)EqFK@zj_S)TT0u75hlxf`}ju%lFWLV+g%T2AHO
z7rZO$F5*76L6yVWcAuNRj{Vna_h;C8?&K9bn?~^(;};xrQx$$|@VgaNa107qnD-An
z&*p5)VgF0LalH7q`ER}a`M>{p)J<U7>__E(J!^Q3rj9udMVI%yh}a-cdW*B{mrQX;
zZLH`1`2-$Sac(0*{mH`!J63Oi7d!bsaRfKAu^pVlXR~0V%l6g*9Kaqu`K-*7sJX=W
ze7&~q%dB10edU?oe*f2x{qU<J&SB@A9qyd0^}AQT^!_`4yjj{9uyE7xu}gh}4+5-B
zE|!`bEA3;v4BZ6dU1)Cm7utB_`Nm4XJngjuPTYkP6aOrN6S(RzCpNn_@=ngMuPigr
z?hN1XV4YaQcAd349NF<MKiuF}e)Ri$uYYrGVZ@CLcaXtKwf;Dl4L1JNaG=9od8>%=
zh>Q3Tf9w9w)?azK{?3T2U~|uoFIXp&dEP-k{VZu0gH68w#Od#fS1+9V!R+GuKW{U#
z97``<*m7_z<4eVI2t<#coG9Bcmux#a`OJOe%Wr-6?)~@HkfoSj&hXI~J3G;-rIE4y
zx2bIT-OuElp}&L^em<UCXHVb;y|}UPGp7d6lFwS(69{e@E&AhPh0p!3NZ&@k!$rrQ
zA5_xH(=wzl$&h}aLOOCwhV)Gp($On2q<3XV|D-}XwkbpUD;3i51sPKNZK3cBW&95+
zF`ZbJA$?VabdrDIl=yu*naGg7t3o>UMHNzV!h-w9gX~d#?^GbAn@Ysg+*E^<ZmK~_
zH<chYH`O4en@W(Hn`)5KO*KgArV^y)rW&MlQwdUYQw>tOsRk+CRD#spRD+amDnV*)
zszFLO)gYytN|2hHN{}L=&b=+;rW&MlQwdUYQw>tOsRk+CRD#spRD+amDnV*)szFLO
z)gYytN|2hHYLL=RB}mOpHAv~E8l-en2~u-Y4N|(P1gW{H1}WWCgOqM6L27O)L5hgF
z%F`-tDnbf3)gYytijcxhMM&YM8l-en5mLCR1}WWCgcNQnLJBw4Af=m%kitzhNa>~`
zq;OLaQn;xGDcw|r6mF_PN;efDg`0|y!c8?u>82W_=B6*nxTyvy-Bg0q+*E^<ZmK~_
zH<chYH`O4en@W(Hn`)5KO*KgArV^y)rW&MlQwdUYQw>tOsRk+CRD#spRD+amDnV*)
zszFLO)gYytN|2hHN|2hHevtQ%2mSv|D;lJ9QwdUYQw>tOsRk+CRD#spRD+amDnV*)
zszFLO)gYytN|2hHYLL=RB}mOpHAv~E8l-en2~u-Y4N|(P1gW{H1}WWCgOqM6L27O)
zK}t6rxuxQ!BBXFr4N|(P2r1lDgcNS7K}t6jA%&Z2kkU;>Na3a;q;OLWQo5-KDcn?p
zlx`|Q3O5xYg_~-S(oIE3;iej-bW;&hxTy#!+*E^<ZmL0QZu+K-n`)5KO(jUpO*KgA
zrW&MlQwdUYQw>tOsRXIHsRk+CRD+amDnV*)szFLOl^``Y)gYytYLL=RB}mOpHAv~E
z5~Sv)8l-en4N|(P1gW{H1S#Eg^ooj`ijcxhHAv~EBBXFr5mLCR1}WWCgcNS7K}t6j
zA%&ZYkitzhNa>~`q;OLWQo5-KDcn?q6mF_PN;efDg_~-S(oIE3;ie*_a8nIZx~T@K
zx#?XQH`O4en@W(Hn`)5KO*KgArV^y)rW&MlQwdUYQw>tOsRk+CRD#spRD+amDnV*)
tszFLO)gYytN|2hHYLL=RB}mOpHAv~E8l-en2~u;@{|D(2{v^^n{ssD91ZMyM