diff --git a/DEV.3.1/TP/TP4/ex1_test/build/Controlleur.class b/DEV.3.1/TP/TP4/ex1_test/build/Controlleur.class new file mode 100644 index 0000000..49a7b0a Binary files /dev/null and b/DEV.3.1/TP/TP4/ex1_test/build/Controlleur.class differ diff --git a/DEV.3.1/TP/TP4/ex1_test/build/Fenetre.class b/DEV.3.1/TP/TP4/ex1_test/build/Fenetre.class new file mode 100644 index 0000000..789f020 Binary files /dev/null and b/DEV.3.1/TP/TP4/ex1_test/build/Fenetre.class differ diff --git a/DEV.3.1/TP/TP4/ex1_test/build/GFenetre.class b/DEV.3.1/TP/TP4/ex1_test/build/GFenetre.class deleted file mode 100644 index 00ae360..0000000 Binary files a/DEV.3.1/TP/TP4/ex1_test/build/GFenetre.class and /dev/null differ diff --git a/DEV.3.1/TP/TP4/ex1_test/build/GestionSouris.class b/DEV.3.1/TP/TP4/ex1_test/build/GestionSouris.class deleted file mode 100644 index 8d60727..0000000 Binary files a/DEV.3.1/TP/TP4/ex1_test/build/GestionSouris.class and /dev/null differ diff --git a/DEV.3.1/TP/TP4/ex1_test/build/Main.class b/DEV.3.1/TP/TP4/ex1_test/build/Main.class index 1d0d7f3..0476717 100644 Binary files a/DEV.3.1/TP/TP4/ex1_test/build/Main.class and b/DEV.3.1/TP/TP4/ex1_test/build/Main.class differ diff --git a/DEV.3.1/TP/TP4/ex1_test/res/image1.jpeg b/DEV.3.1/TP/TP4/ex1_test/res/img2.jpeg similarity index 100% rename from DEV.3.1/TP/TP4/ex1_test/res/image1.jpeg rename to DEV.3.1/TP/TP4/ex1_test/res/img2.jpeg diff --git a/DEV.3.1/TP/TP4/ex1_test/res/imag2.jpeg b/DEV.3.1/TP/TP4/ex1_test/res/img3.jpeg similarity index 100% rename from DEV.3.1/TP/TP4/ex1_test/res/imag2.jpeg rename to DEV.3.1/TP/TP4/ex1_test/res/img3.jpeg diff --git a/DEV.3.1/TP/TP4/ex1_test/res/img4.jpg b/DEV.3.1/TP/TP4/ex1_test/res/img4.jpg new file mode 100644 index 0000000..2545914 Binary files /dev/null and b/DEV.3.1/TP/TP4/ex1_test/res/img4.jpg differ diff --git a/DEV.3.1/TP/TP4/ex1_test/src/Fenetre.java b/DEV.3.1/TP/TP4/ex1_test/src/Fenetre.java index 96719f8..b81c107 100644 --- a/DEV.3.1/TP/TP4/ex1_test/src/Fenetre.java +++ b/DEV.3.1/TP/TP4/ex1_test/src/Fenetre.java @@ -11,9 +11,9 @@ public class Fenetre extends JFrame { CardLayout layout = new CardLayout(); this.setLayout(layout); - JLabel img1 = new JLabel(new ImageIcon("img1.jpg")); - JLabel img2 = new JLabel(new ImageIcon("img2.jpg")); - JLabel img3 = new JLabel(new ImageIcon("img3.jpg")); + JLabel img1 = new JLabel(new ImageIcon("../res/MICHEL.gif")); + JLabel img2 = new JLabel(new ImageIcon("img2.jpeg")); + JLabel img3 = new JLabel(new ImageIcon("img3.jpeg")); JLabel img4 = new JLabel(new ImageIcon("img4.jpg")); JLabel[] tableau = {img1, img2, img3, img4}; diff --git a/DEV.3.1/TP/TP4/ex2Quiz/src/Main.java b/DEV.3.1/TP/TP4/ex2Quiz/src/Main.java new file mode 100644 index 0000000..82d458a --- /dev/null +++ b/DEV.3.1/TP/TP4/ex2Quiz/src/Main.java @@ -0,0 +1,5 @@ +public class Main { + public static void main(String[] args) { + + } +} \ No newline at end of file diff --git a/DEV.3.1/TP/TP4/ex2Quiz/src/Modele/Question.java b/DEV.3.1/TP/TP4/ex2Quiz/src/Modele/Question.java new file mode 100644 index 0000000..821a6fb --- /dev/null +++ b/DEV.3.1/TP/TP4/ex2Quiz/src/Modele/Question.java @@ -0,0 +1,14 @@ +public class Question { + + private String[] operation; + private int operand; + + public Question() { + this.operation[] = {" + "," - "," x "," / "}; + + } + public int choixOperand() { + System.out.println("coucou manu"); + return this.operand; + } +} \ No newline at end of file