Merge branch 'master' of git.unistra.fr:yocj/g4b

src/main/Chapeau.java

@@ -0,0 +1,14 @@
+package main;
+
+import java.util.Random;
+
+public enum Chapeau {
+    bonnet,
+    hdf,
+    absent;
+
+    public static String getRandomVal() {
+        Random random = new Random();
+        return values()[random.nextInt(values().length)].toString();
+    }
+}

src/main/Collier.java

@@ -0,0 +1,12 @@
+package main;
+import java.util.Random;
+
+public enum Collier {
+    collier,
+    absent;
+
+    public static String getRandomVal() {
+        Random random = new Random();
+        return values()[random.nextInt(values().length)].toString();
+    }
+}

src/main/Image.java

@@ -0,0 +1,35 @@
+package main;
+import main.Jul;
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+
+public class Image {
+    public Jul jul;
+    public String imgDir = "jul_img";
+    public String baseImagePath = "jul_img/jul.png";
+
+
+    public Image(Jul pjul) {
+        this.jul = pjul;
+    }
+
+    public BufferedImage genImage() {
+        BufferedImage result = null;
+        Graphics g = null;
+        try {
+            result = ImageIO.read(new File(baseImagePath));
+            g.drawImage(ImageIO.read(new File(imgDir + "/" + this.jul.getChapeau()+ ".png")), 0, 0, null);
+            g.drawImage(ImageIO.read(new File(imgDir + "/" + this.jul.getCollier()+ ".png")), 0, 0, null);
+            g.drawImage(ImageIO.read(new File(imgDir + "/" + this.jul.getMasque()+ ".png")), 0, 0, null);
+            g.drawImage(ImageIO.read(new File(imgDir + "/" + this.jul.getLunettes()+ ".png")), 0, 0, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+}

src/main/Jul.java

@@ -13,9 +13,14 @@ public class Jul {
     private String collier;
     private String chapeau;
     private boolean choisi;
-    private ArrayList<String> images;
 
-    public Jul() { this.images = new ArrayList<>(); }
+    public Jul() {
+        this.lunettes = Lunettes.getRandomVal();
+        this.masque = Masque.getRandomVal();
+        this.collier = Collier.getRandomVal();
+        this.chapeau = Chapeau.getRandomVal();
+        this.choisi = false;
+    }
 
     public String getLunettes() {
         return lunettes;
@@ -56,15 +61,4 @@ public class Jul {
     public void setEstChoisi(boolean estChoisi) {
         this.choisi = estChoisi;
     }
-
-    public ArrayList<String> getImages() {
-        return images;
-    }
-
-    public void genImages() {
-        this.images.add(this.lunettes + ".png");
-        this.images.add(this.masque + ".png");
-        this.images.add(this.collier + ".png");
-        this.images.add(this.chapeau + ".png");
-    }
 }

src/main/Lunettes.java

@@ -0,0 +1,14 @@
+package main;
+
+import java.util.Random;
+
+public enum Lunettes {
+    vue,
+    soleil,
+    absent;
+
+    public static String getRandomVal() {
+        Random random = new Random();
+        return values()[random.nextInt(values().length)].toString();
+    }
+}

src/main/Masque.java

@@ -0,0 +1,14 @@
+package main;
+
+import java.util.Random;
+
+public enum Masque {
+    med,
+    gaz,
+    absent;
+
+    public static String getRandomVal() {
+        Random random = new Random();
+        return values()[random.nextInt(values().length)].toString();
+    }
+}

src/main/main.java

@@ -0,0 +1,7 @@
+package main;
+
+public class main {
+    public static void main(String[] a) {
+
+    }
+}