Feature/update for new rust UI (#29)

* Updated Color Preview coordinates

Author: Kariaro

.gitignore

@@ -1,13 +1,11 @@
 # gradle
-
 .gradle/
 build/
 out/
 classes/
 logs/
 
 # idea
-
 .idea/
 *.iml
 *.ipr
@@ -18,15 +16,11 @@ logs/
 target/
 
 # vscode
-
-.settings/
 .vscode/
 bin/
 .classpath
 .project
 
 # project
-logs/
 bobrust.properties
-.project
-.classpath
+hs_err_pid*.log

build.gradle

@@ -17,11 +17,13 @@ repositories {
 project.ext {
     lwjglVersion = '3.2.3'
     log4jVersion = '2.17.1'
+    gsonVersion  = '2.10.1'
+
     majorVersion = '0'
-    minorVersion = '4'
+    minorVersion = '5'
 }
 
-version = "${majorVersion}.${minorVersion}.${getBuildId()}"
+version = "${majorVersion}.${minorVersion}.${getBuildId()}" + ""
 group = "Bob-Rust-Java"
 description = "Bob-Rust-Java"
 java.sourceCompatibility = JavaVersion.VERSION_16
@@ -70,6 +72,15 @@ dependencies {
 
     packImpl "org.apache.logging.log4j:log4j-api:$log4jVersion"
     packImpl "org.apache.logging.log4j:log4j-core:$log4jVersion"
+
+    packImpl "com.google.code.gson:gson:$gsonVersion"
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+}
+
+test {
+    useJUnitPlatform()
 }
 
 

src/main/java/com/bobrust/gui/ApplicationWindow.java

@@ -3,17 +3,18 @@
 import com.bobrust.gui.comp.JToolbarButton;
 import com.bobrust.gui.dialog.*;
 import com.bobrust.settings.Settings;
-import com.bobrust.util.ResourceUtil;
-import com.bobrust.util.ImageUtil;
-import com.bobrust.util.UrlUtils;
+import com.bobrust.util.*;
 import com.bobrust.util.data.AppConstants;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 
@@ -25,6 +26,8 @@
  * @author HardCoded
  */
 public class ApplicationWindow extends JDialog {
+	private static final Logger LOGGER = LogManager.getLogger(ApplicationWindow.class);
+	
 	private final RustFileDialog fileDialog;
 	private final SignPickerDialog signPickerDialog;
 	private final SettingsDialog settingsDialog;
@@ -74,6 +77,26 @@ public void windowClosing(WindowEvent e) {
 		panel.add(createToolbar(), BorderLayout.CENTER);
 		panel.add(createVersion(), BorderLayout.SOUTH);
 		setContentPane(panel);
+		
+		// If we are running from an IDE then we want to add some debug stuff
+		if (AppConstants.IS_IDE && AppConstants.DEBUG_AUTO_IMAGE) {
+			canvasAreaButton.setEnabled(true);
+			imageAreaButton.setEnabled(true);
+			drawButton.setEnabled(true);
+			
+			monitor = GraphicsEnvironment.getLocalGraphicsEnvironment()
+				.getDefaultScreenDevice()
+				.getDefaultConfiguration();
+			
+			canvasRect.setRect(98, 170, 1348, 671);
+			imageRect.setRect(473, 172, 691, 669);
+			
+			try {
+				drawImage = ImageIO.read(new File("src/test/resources/draw-test/draw_0.png"));
+			} catch (IOException e) {
+				LOGGER.error("Could not find image", e);
+			}
+		}
 	}
 
 	private JPanel createToolbar() {
@@ -123,9 +146,20 @@ private void importImage() {
 		}
 
 		try {
-			drawImage = ImageIO.read(image);
+			BufferedImage bi = ImageIO.read(image);
+			if (bi == null) {
+				LOGGER.warn("Unsupported image file format '{}'", image.getAbsolutePath());
+				RustWindowUtil.showWarningMessage(
+					"The file '%s' is not a readable image format, try converting the image to a png before using"
+						.formatted(image.getAbsolutePath()),
+					"Failed to read image file"
+				);
+				return;
+			}
+			drawImage = bi;
 			canvasAreaButton.setEnabled(true);
 		} catch (IOException e) {
+			LOGGER.error("Invalid file format of image", e);
 			e.printStackTrace();
 		}
 	}
@@ -135,12 +169,31 @@ private void selectCanvasRegion() {
 		monitor = region.monitor();
 		canvasRect.setBounds(region.selection());
 		imageAreaButton.setEnabled(true);
+		
+		if (region.hasChanged()) {
+			LOGGER.info("Selected canvas region [ monitor={}, size=[x={}, y={}, width={}, height={}] ]",
+				region.monitor().getDevice(),
+				region.selection().x,
+				region.selection().y,
+				region.selection().width,
+				region.selection().height
+			);
+		}
 	}
 
 	private void selectImageRegion() {
 		var region = regionSelectionDialog.openDialog(monitor, false, drawImage, imageRect);
 		imageRect.setBounds(region.selection());
 		drawButton.setEnabled(true);
+		
+		if (region.hasChanged()) {
+			LOGGER.info("Selected image region [ size=[x={}, y={}, width={}, height={}] ]",
+				region.selection().x,
+				region.selection().y,
+				region.selection().width,
+				region.selection().height
+			);
+		}
 	}
 
 	private JToolbarButton createButton(String iconPath, String tooltip, int rgb, ActionListener action) {

src/main/java/com/bobrust/gui/comp/JIntegerField.java

@@ -1,83 +1,112 @@
 package com.bobrust.gui.comp;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.text.NumberFormat;
-import java.util.Locale;
-
 import javax.swing.*;
-import javax.swing.text.NumberFormatter;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.*;
+import java.awt.event.*;
 
-public class JIntegerField extends JFormattedTextField {
-	private final NumberFormatter formatter;
+public class JIntegerField extends JTextField {
+	private int minimumValue;
+	private int maximumValue;
+	
+	// Last valid value when focus lost or when enter was pressed
+	private int lastValidValue;
+	private boolean hasBeeped;
 
 	public JIntegerField(int value, int min, int max) {
-		NumberFormat format = NumberFormat.getIntegerInstance(Locale.US);
-		format.setGroupingUsed(false);
+		this.maximumValue = max;
+		this.minimumValue = min;
+		this.lastValidValue = value;
 
-		formatter = new NumberFormatter(format);
-		formatter.setValueClass(Integer.class);
-		formatter.setMinimum(min);
-		formatter.setMaximum(max);
-		formatter.setAllowsInvalid(false);
-		formatter.setCommitsOnValidEdit(true);
-		formatter.setOverwriteMode(false);
-		formatter.setFormat(format);
+		setText("" + value);
+		setForeground(Color.black);
 
-		setFormatterFactory(new AbstractFormatterFactory() {
+		getDocument().addDocumentListener(new DocumentListener() {
 			@Override
-			public AbstractFormatter getFormatter(JFormattedTextField tf) {
-				return formatter;
+			public void insertUpdate(DocumentEvent e) {
+				update();
 			}
-		});
-		
-		getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enterAction");
-		getActionMap().put("enterAction", new AbstractAction() {
+			
 			@Override
-			public void actionPerformed(ActionEvent e) {
-				JIntegerField.this.fireActionPerformed();
-			}
-		});
-		
-		Object backspaceKey = getInputMap().get(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
-		Action backspaceAction = getActionMap().get(backspaceKey);
-		
-		getActionMap().put(backspaceKey, new AbstractAction() {
-			public boolean isDelegate() {
-				return getText().length() != 1;
+			public void removeUpdate(DocumentEvent e) {
+				update();
 			}
 
 			@Override
-			public boolean accept(Object sender) {
-				if (isDelegate()) {
-					return backspaceAction.accept(sender);
-				} else {
-					return super.accept(sender);
-				}
+			public void changedUpdate(DocumentEvent e) {
+				update();
 			}
 
+			public void update() {
+				processInput(getText(), false);
+			}
+		});
+		
+		addActionListener(e -> processInput(getText(), true));
+		addFocusListener(new FocusAdapter() {
 			@Override
-			public void actionPerformed(ActionEvent e) {
-				if (isDelegate()) {
-					backspaceAction.actionPerformed(e);
-				} else {
-					JIntegerField.this.selectAll();
-				}
+			public void focusLost(FocusEvent e) {
+				processInput(getText(), true);
 			}
 		});
+	}
+	
+	private void processInput(String text, boolean enter) {
+		boolean invalid;
+		int value = 0;
+		try {
+			value = Integer.parseInt(text);
+			invalid = value < minimumValue || value > maximumValue;
+		} catch (NumberFormatException ignore) {
+			invalid = true;
+		}
+		
+		setForeground(invalid
+			? Color.red
+			: Color.black);
+		
+		if (invalid) {
+			if (!text.isEmpty() && !hasBeeped) {
+				Toolkit.getDefaultToolkit().beep();
+				hasBeeped = true;
+			}
+		} else {
+			hasBeeped = false;
+		}
 
-		setText(Integer.toString(value));
+		if (enter) {
+			if (!invalid) {
+				lastValidValue = value;
+			}
+			
+			setText("" + lastValidValue);
+			setForeground(Color.black);
+			hasBeeped = false;
+		}
 	}
 
 	public void setMinimum(int value) {
-		formatter.setMinimum(value);
+		minimumValue = value;
 	}
 
 	public void setMaximum(int value) {
-		formatter.setMaximum(value);
+		maximumValue = value;
+	}
+	
+	public int getMinimumValue() {
+		return minimumValue;
+	}
+	
+	public int getMaximumValue() {
+		return maximumValue;
+	}
+	
+	public void setValue(int value) {
+		this.lastValidValue = Math.max(minimumValue, Math.min(maximumValue, value));
 	}
 
-	public int getNumberValue() throws NumberFormatException {
-		return Integer.parseInt(this.getText());
+	public int getNumberValue() {
+		return lastValidValue;
 	}
 }