From f2e56906727df49f414371a03050dbd3781fe71b Mon Sep 17 00:00:00 2001
From: Xiway <l.xiway.l@gmail.com>
Date: Thu, 23 Apr 2015 15:16:18 +0200
Subject: [PATCH 1/3] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a567783..e87a1f8 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
 # Projet_Java
 Projet de java IGI452 2015
 Heheee
+ceci est un test

From d4fade0e55d759ac9adc4e2eaf9a716aad765a6c Mon Sep 17 00:00:00 2001
From: Xiway <l.xiway.l@gmail.com>
Date: Thu, 7 May 2015 08:44:58 +0200
Subject: [PATCH 2/3] classe natation

---
 src/Natation.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 src/Natation.java

diff --git a/src/Natation.java b/src/Natation.java
new file mode 100644
index 0000000..9dac5e5
--- /dev/null
+++ b/src/Natation.java
@@ -0,0 +1,58 @@
+import java.util.GregorianCalendar;
+
+
+public class Natation extends Séance {
+		private GregorianCalendar date; 
+		int duree;
+		private String Type = "";
+		private int distance;
+		String _n = System.getProperty("line.separator");
+		
+		public Natation(int jour, int mois, int annee, int heure, int minute){
+			date = new GregorianCalendar(annee, mois, jour, heure, minute, 0 );
+		}
+		public Natation(int jour, int mois, int annee, int heure, int minute, int duree, int distance){
+			this(jour, mois, annee, heure, minute);
+			this.duree = duree;
+			this.distance = distance;
+		}
+		
+
+		public GregorianCalendar getDate() {
+			return date;
+		}
+		public void setDate(GregorianCalendar date) {
+			this.date = date;
+		}
+
+		public int getDuree() {
+			return duree;
+		}
+		public void setDuree(int duree) {
+			this.duree = duree;
+		}
+		public int getDistance() {
+			return distance;
+		}
+		public void setDistance(int distance) {
+			this.distance = distance;
+		}
+		public String getType() {
+			return  Type;
+		}
+		public void setType(String type) {
+			Type = type;
+		}
+
+		public void affiche(){
+			// Je te laisse t'occuper de l'affichage de la date System.out.println("Séance du " + this.date.get(GregorianCalendar.DAY_OF_MONTH) + "/" + this.date.get(GregorianCalendar.MONTH) + "/"+ this.date.get(GregorianCalendar.YEAR) +" de type natation :");
+			System.out.println("Distance totale parcourue : "+this.distance+" m.");
+			System.out.println("Duree : "+this.duree + " minutes.");
+			System.out.println("Type de nage : "+this.Type+".");
+		}
+		
+		
+	}
+
+
+

From 707b06393230d38800a13fcdc5e34b358524b4fc Mon Sep 17 00:00:00 2001
From: Ichinin <r.suntharasarma@gmail.com>
Date: Sat, 9 May 2015 17:19:51 +0200
Subject: [PATCH 3/3] Delete README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index e87a1f8..0000000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Projet_Java
-Projet de java IGI452 2015
-Heheee
-ceci est un test