FileNotFound Exception handling

Author: grimpirate

src_java/com/grimpirate/JavaScript.java

@@ -1,8 +1,6 @@
 package com.grimpirate;
 
 import java.awt.Dimension;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
@@ -16,8 +14,8 @@
 public class JavaScript
 {
 	private CoordinateText[] texts;
-	
-	public JavaScript(String js, String version, Dimension dimension) throws FileNotFoundException, IOException
+
+	public JavaScript(String js, String version, Dimension dimension)
 	{
 		Context context = Context.enter();
 		Scriptable scope = new ImporterTopLevel(context);
@@ -30,11 +28,17 @@ public JavaScript(String js, String version, Dimension dimension) throws FileNot
 		ScriptableObject.putConstProperty(host, "os_arch", Context.javaToJS(System.getProperty("os.name") + " " + System.getProperty("os.arch"), scope));
 		ScriptableObject.putConstProperty(host, "time", Context.javaToJS(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), scope));
 		ScriptableObject.putConstProperty(scope, "SVGWall", Context.javaToJS(host, scope));
-		CoordinateText[] texts = Arrays.stream(((NativeArray) context.evaluateReader(scope, new java.io.FileReader(js), "<cmd>", 1, null)).toArray()).toArray(CoordinateText[]::new);
-		Context.exit();
-		this.texts = texts;
+		try
+		{
+			texts = Arrays.stream(((NativeArray) context.evaluateReader(scope, new java.io.FileReader(js), "<cmd>", 1, null)).toArray()).toArray(CoordinateText[]::new);
+		}
+		catch (Exception e)
+		{
+			Context.exit();
+			texts = new CoordinateText[] {};
+		}
 	}
-	
+
 	public CoordinateText[] getText()
 	{
 		return texts;

src_java/com/grimpirate/Painter.java

@@ -22,28 +22,26 @@ public class Painter
 
 	public Painter(String svg, Dimension dimension, CoordinateText[] texts)
 	{
-		boolean rainbow = false;
+		this.image = new BufferedImage(dimension.width, dimension.height, BufferedImage.TYPE_INT_ARGB);
+
 		try
 		{
 			this.image = new BufferedImageTranscoder(svg, (float)dimension.getWidth(), (float)dimension.getHeight()).getBufferedImage();
+			g2d = image.createGraphics();
+			g2d.setColor(Color.BLACK);
+			g2d.drawRect(0, 0, dimension.width, dimension.height);
 		}
 		catch (TranscoderException e)
 		{
-			this.image = new BufferedImage(dimension.width, dimension.height, BufferedImage.TYPE_INT_ARGB);
-			rainbow = true;
+			g2d = image.createGraphics();
+			drawRainbow();
 		}
 
-		g2d = image.createGraphics();
-		g2d.setColor(Color.BLACK);
-		g2d.drawRect(0, 0, dimension.width, dimension.height);
-		g2d.setColor(COLOR);
-		g2d.setFont(FONT);
 		g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 		g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+		g2d.setColor(COLOR);
+		g2d.setFont(FONT);
 
-		if(rainbow)
-			drawRainbow();
-		
 		drawOverlay(texts);
 	}