test de fusion

README.md

@@ -1,3 +1,4 @@
 # Projet_Java
 Projet de java IGI452 2015
 Heheee
+ceci est un test

src/Fraction.java

@@ -0,0 +1,30 @@
+public class Fraction{	
+	int duree;
+	int distance;
+	TypeNage type;
+
+
+	public Fraction(TypeNage type,int duree, int distance){
+		this.type=type;
+		this.duree=duree;
+		this.distance=distance;
+	}
+	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 TypeNage getType() {
+		return type;
+	}
+	public void setType(TypeNage type) {
+		this.type = type;
+	}
+}

src/Natation.java

@@ -0,0 +1,51 @@
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+
+public class Natation extends S�ance {
+		public GregorianCalendar date; 
+		int duree;
+		public int distance;
+		String _n = System.getProperty("line.separator");
+		public ArrayList<Fraction> fractions;
+
+		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;
+		}
+		Natation(){
+			fractions = new ArrayList<Fraction>();
+		}
+
+		void add(Fraction s){
+			this.fractions.add(s);
+		}
+
+		public GregorianCalendar getDate() {
+			return date;
+		}
+		public void setDate(GregorianCalendar date) {
+			this.date = date;
+		}
+
+		public int getDuree() {
+			return duree;
+		}
+		public int getDistance() {
+			return distance;
+		}
+		public void affiche(){
+			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.");
+		}
+
+
+
+	}
+
+
+

src/Séance.java

@@ -5,6 +5,8 @@
 	abstract void affiche();
 	abstract int getDuree();
 	abstract int getDistance();
-	abstract String getType();
 	abstract GregorianCalendar getDate();
+	public String getType() {
+		return null;
+	}
 }

src/TypeNage.java

@@ -0,0 +1,2 @@
+public enum TypeNage{BRASSE, CRAWL, DOS, PAPILLION};
+//liste des types de nage

src/main.java

@@ -1,4 +1,13 @@
 
 public class main {
+	public static void main (String[]args){
+
+		Fraction f1 = new Fraction(TypeNage.CRAWL, 20, 20);
+		Fraction f2 = new Fraction(TypeNage.CRAWL,20, 2);
+		Natation n1 = new Natation(0, 0, 0, 0, 0, 0, 0);
+		n1.add(f1);
+		n1.add(f2);
+		n1.affiche();
+	}
 
 }