correction a l'enonce preleminaire

.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>thermogeekostat</name>
+	<name>TP2-solution</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>

src/main/java/fr/univlille/iutinfo/m3105/Main.java → src/main/java/fr/univlille/iutinfo/m3105/q2/Main.java

-package fr.univlille.iutinfo.m3105;
+package fr.univlille.iutinfo.m3105.q2;
 
-import fr.univlille.iutinfo.m3105.modele.Echelle;
-import fr.univlille.iutinfo.m3105.modele.Thermogeekosta;
-import fr.univlille.iutinfo.m3105.vue.VueSlide;
-import fr.univlille.iutinfo.m3105.vue.VueTexte;
+import fr.univlille.iutinfo.m3105.q2.modele.Echelle;
+import fr.univlille.iutinfo.m3105.q2.modele.Thermogeekostat;
+import fr.univlille.iutinfo.m3105.q2.vue.VueSlide;
+import fr.univlille.iutinfo.m3105.q2.vue.VueTexte;
 import javafx.application.Application;
 import javafx.stage.Stage;
 
@@ -15,7 +15,7 @@ public class Main extends Application {
 
 	@Override
 	public void start(Stage primaryStage) throws Exception {
-		Thermogeekosta thermo = new Thermogeekosta();
+		Thermogeekostat thermo = new Thermogeekostat();
 		new VueTexte( thermo.getTemp(Echelle.CELSIUS));
 		new VueTexte( thermo.getTemp(Echelle.FAHRENHEIT));
 		new VueSlide( thermo.getTemp(Echelle.KELVIN));

src/main/java/fr/univlille/iutinfo/m3105/modele/Echelle.java → src/main/java/fr/univlille/iutinfo/m3105/q2/modele/Echelle.java

-package fr.univlille.iutinfo.m3105.modele;
+package fr.univlille.iutinfo.m3105.q2.modele;
 
 public enum Echelle {
 	CELSIUS("Celcius", "C", -10, 50), 

src/main/java/fr/univlille/iutinfo/m3105/modele/Temperature.java → src/main/java/fr/univlille/iutinfo/m3105/q2/modele/Temperature.java

-package fr.univlille.iutinfo.m3105.modele;
+package fr.univlille.iutinfo.m3105.q2.modele;
 
 import fr.univlille.iutinfo.m3105.utils.ConnectableProperty;
 import fr.univlille.iutinfo.m3105.utils.Subject;

src/main/java/fr/univlille/iutinfo/m3105/modele/Thermogeekosta.java → src/main/java/fr/univlille/iutinfo/m3105/q2/modele/Thermogeekostat.java

-package fr.univlille.iutinfo.m3105.modele;
+package fr.univlille.iutinfo.m3105.q2.modele;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -7,13 +7,13 @@ import java.util.Map;
 /** Main model class
  * this is actually a factory that can return Temperature object in any scale
  */
-public class Thermogeekosta {
+public class Thermogeekostat {
 	public static final Echelle DEFAULT_ECHELLE =  Echelle.CELSIUS;
 	public static final double DEFAULT_VALUE =  18.0;
 	
 	protected Map<Echelle,Temperature> temps;
 	
-	public Thermogeekosta() {
+	public Thermogeekostat() {
 		temps = new HashMap<>(Echelle.values().length);
 		
 		// initialize a default temperature to a decent value

src/main/java/fr/univlille/iutinfo/m3105/vue/AbstractVue.java → src/main/java/fr/univlille/iutinfo/m3105/q2/vue/AbstractVue.java

-package fr.univlille.iutinfo.m3105.vue;
+package fr.univlille.iutinfo.m3105.q2.vue;
 
-import fr.univlille.iutinfo.m3105.modele.Echelle;
-import fr.univlille.iutinfo.m3105.modele.Temperature;
+import fr.univlille.iutinfo.m3105.q2.modele.Echelle;
+import fr.univlille.iutinfo.m3105.q2.modele.Temperature;
 import fr.univlille.iutinfo.m3105.utils.Observer;
 import fr.univlille.iutinfo.m3105.utils.Subject;
 import javafx.scene.Scene;

src/main/java/fr/univlille/iutinfo/m3105/vue/VueSlide.java → src/main/java/fr/univlille/iutinfo/m3105/q2/vue/VueSlide.java

-package fr.univlille.iutinfo.m3105.vue;
+package fr.univlille.iutinfo.m3105.q2.vue;
 
-import fr.univlille.iutinfo.m3105.modele.Temperature;
+import fr.univlille.iutinfo.m3105.q2.modele.Temperature;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;

src/main/java/fr/univlille/iutinfo/m3105/vue/VueTexte.java → src/main/java/fr/univlille/iutinfo/m3105/q2/vue/VueTexte.java

-package fr.univlille.iutinfo.m3105.vue;
+package fr.univlille.iutinfo.m3105.q2.vue;
 
 
-import fr.univlille.iutinfo.m3105.modele.Temperature;
+import fr.univlille.iutinfo.m3105.q2.modele.Temperature;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;