update composer BorderColor

Author: nicho92

src/main/java/org/magic/composer/MtgCardComposer.java

@@ -33,6 +33,7 @@
 import org.magic.composer.layer.FrameLayer;
 import org.magic.composer.layer.IllustrationLayer;
 import org.magic.composer.layer.TextLayer;
+import org.magic.composer.models.BorderColor;
 import org.magic.services.logging.MTGLogger;
 
 public class MtgCardComposer extends JPanel {
@@ -60,10 +61,11 @@ public MtgCardComposer(File rootDirectory) {
 
 
 	var rootColors = new DefaultMutableTreeNode("borders");
-		rootColors.add(new DefaultMutableTreeNode(Color.BLACK));
-		rootColors.add(new DefaultMutableTreeNode(Color.WHITE));
-		rootColors.add(new DefaultMutableTreeNode(Color.LIGHT_GRAY));
-		rootColors.add(new DefaultMutableTreeNode(new Color(186, 142, 35)));
+		
+	for(var bc : BorderColor.values())
+	{
+		rootColors.add(new DefaultMutableTreeNode(bc));
+	}
 
 	rootNode.add(rootColors);
 
@@ -82,7 +84,7 @@ public MtgCardComposer(File rootDirectory) {
 		    var node = (DefaultMutableTreeNode) value;
 		    String text;
 		    if (node.getUserObject() instanceof File file) {
-			text = file.getName();
+		    	text = file.getName();
 		    } else {
 			text = node.getUserObject().toString();
 		    }
@@ -167,7 +169,7 @@ public void mouseClicked(MouseEvent e) {
         		}
 		}
 
-		if (object instanceof Color c)
+		if (object instanceof BorderColor c)
 		{
 		    imageCanvas.addLayer(new BorderLayer(c));
 		}
@@ -239,8 +241,8 @@ private boolean isImageFile(File file) {
     }
 
     private boolean isFontFile(File file) {
-	var name = file.getName().toLowerCase();
-	return name.endsWith(".ttf");
+		var name = file.getName().toLowerCase();
+		return name.endsWith(".ttf");
     }
 
 
@@ -251,7 +253,7 @@ private boolean isFontFile(File file) {
     public static void main(String[] args) {
 
 	//var directry = "D:\\Téléchargements\\Full-Magic-Pack-main\\data";
-	var directry="D:\\programmation\\GIT\\mtg-card-generator-main\\assets";
+	var directry="C:\\Users\\nicolas.pihen\\Downloads\\card-rendering\\assets";
 
 	SwingUtilities.invokeLater(() -> {
 

src/main/java/org/magic/composer/layer/BorderLayer.java

@@ -4,6 +4,8 @@
 import java.awt.Graphics2D;
 import java.awt.geom.RoundRectangle2D;
 
+import org.magic.composer.models.BorderColor;
+
 import com.google.gson.JsonObject;
 
 public class BorderLayer extends AbstractLayer {
@@ -14,10 +16,15 @@ public class BorderLayer extends AbstractLayer {
     private Color color = Color.BLACK; 
 
 
-    public BorderLayer(Color c) {
-	super(null);
-	this.color=c;
-	setName(c.toString());;
+    public BorderLayer(BorderColor c) {
+		super(null);
+		this.color=c.getColor();
+		setName(c.toString());
+    }
+    
+    @Override
+    public String toString() {
+    	return "Border " + getName();
     }
 
     @Override

src/main/java/org/magic/composer/layer/TextLayer.java

@@ -42,7 +42,7 @@ public JsonObject toJson() {
        	    obj.addProperty("fontName", font.getFontName());
        	    obj.addProperty("fontFamily", font.getFamily());
        	    obj.addProperty("fontstyle", font.getStyle());
-   	    obj.addProperty("fontsyze", font.getSize());
+       	    obj.addProperty("fontstyle", font.getSize());
        	    obj.addProperty("alignment", alignment);
        	    obj.addProperty("color", color.getRGB());
        return obj;

src/main/java/org/magic/composer/models/BorderColor.java

@@ -0,0 +1,29 @@
+package org.magic.composer.models;
+
+import java.awt.Color;
+
+public enum BorderColor {
+
+	BLACK(Color.BLACK),
+	WHITE(Color.WHITE),
+	SILVER(Color.LIGHT_GRAY),
+	YELLOW(new Color(186, 142, 35)),
+	CUSTOM(Color.BLUE);
+
+	private Color color;
+
+	BorderColor(Color c) {
+		this.color = c;
+	}
+	
+	public Color getColor() {
+		return color;
+	}
+	
+	@Override
+	public String toString() {
+		return name().substring(0, 1).toUpperCase() + name().substring(1).toLowerCase();
+	}
+	
+	
+}

src/main/java/org/magic/composer/models/TextRole.java

@@ -0,0 +1,18 @@
+package org.magic.composer.models;
+
+import java.awt.Font;
+
+public enum TextRole {
+
+	TITLE (24,"Beleren",Font.PLAIN),
+    TYPE_LINE (20,"Beleren",Font.PLAIN),
+    RULES (18,"Matrix Book",Font.PLAIN),
+    FLAVOR (19,"Matrix Book Italic",Font.ITALIC),
+    POWER_TOUGHNESS(20,"Beleren",Font.PLAIN);
+
+	TextRole(int size, String fontname, int style) {
+		// TODO Auto-generated constructor stub
+	}
+	
+	
+}