Release Version 1.1

Author: NilsFo

.gitignore

@@ -9,6 +9,7 @@
 .idea/libraries/*
 /.idea/*
 
+
 ExperimentExporter.iml
 db_credentials.xml
 NaN_errors*

out/artifacts/CellomicsPuzzleHelper_jar/CellomicsPuzzleHelper.jar

@@ -7,33 +7,25 @@
 /**
  * Created by nilfoe on 12/03/2018.
  */
+
 public class CellomicsPuzzleHelper {
 
 	public static final String NAME = "ThermoFischer SCIENTIFIC ArrayScan Cellomics Image Puzzle-Helper";
-	public static final String VERSION = "1.0";
+	public static final String VERSION = "1.1";
 	public static final String AUTHOR = "Nils Förster";
 
 	public static PuzzleHelperGUI helperGUI;
 
 	public static void main(String[] args) {
-		//JFrame frame = new JFrame("Nuls test");
-		//frame.setContentPane(new PuzzleHelperGUI().basePanel);
-		//frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		//frame.setVisible(true);
-		//frame.pack();
-		//frame.setLocationRelativeTo(null);
-
-		SwingUtilities.invokeLater(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-				} catch (ClassNotFoundException | InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) {
-					e.printStackTrace();
-				}
-
-				helperGUI = new PuzzleHelperGUI();
+
+		SwingUtilities.invokeLater(() -> {
+			try {
+				UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+			} catch (ClassNotFoundException | InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) {
+				e.printStackTrace();
 			}
+
+			helperGUI = new PuzzleHelperGUI();
 		});
 	};
 

src/de/rub/bph/CellomicsPuzzleHelper.java

@@ -96,95 +96,53 @@ public PuzzleHelperGUI() {
 		menu.add(autoUpdateCB);
 
 		item = new JMenuItem("Reset");
-		item.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				pack();
-				setLocationRelativeTo(null);
-				requestFocus();
-			}
+		item.addActionListener(actionEvent -> {
+			pack();
+			setLocationRelativeTo(null);
+			requestFocus();
 		});
 		item.setAccelerator(KeyStroke.getKeyStroke('R', Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
 		menu.add(item);
 		bar.add(menu);
 
 		menu = new JMenu("?");
 		item = new JMenuItem("About");
-		item.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				JOptionPane.showMessageDialog(PuzzleHelperGUI.this, "'" + CellomicsPuzzleHelper.NAME + "' by " + CellomicsPuzzleHelper.AUTHOR + ".\nVersion: " + CellomicsPuzzleHelper.VERSION + "\n\nCreated at the 'Ruhr University Bochum' and 'Leibniz Research Institute for environmental medicine'.", "About", JOptionPane.INFORMATION_MESSAGE);
-			}
-		});
+		item.addActionListener(actionEvent -> JOptionPane.showMessageDialog(PuzzleHelperGUI.this, "'" + CellomicsPuzzleHelper.NAME + "' by " + CellomicsPuzzleHelper.AUTHOR + ".\nVersion: " + CellomicsPuzzleHelper.VERSION + "\n\nCreated at the 'Ruhr University Bochum' and 'Leibniz Research Institute for environmental medicine'.", "About", JOptionPane.INFORMATION_MESSAGE));
 		menu.add(item);
 
 		item = new JMenuItem("View on GitHub");
-		item.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				try {
-					browseURL("https://github.com/RUB-Bioinf/CellomicsArrayScanPuzzleHelper");
-				} catch (Exception e) {
-					e.printStackTrace();
-					JOptionPane.showMessageDialog(PuzzleHelperGUI.this, "Failed to browse URL: " + e.getMessage());
-				}
+		item.addActionListener(actionEvent -> {
+			try {
+				browseURL("https://github.com/RUB-Bioinf/CellomicsArrayScanPuzzleHelper");
+			} catch (Exception e) {
+				e.printStackTrace();
+				JOptionPane.showMessageDialog(PuzzleHelperGUI.this, "Failed to browse URL: " + e.getMessage());
 			}
 		});
 		menu.add(item);
 		bar.add(menu);
 
 		setJMenuBar(bar);
 
-		button1.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				update();
-			}
-		});
-		directionCB.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				requestUpdate();
-			}
-		});
-		button3.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				previewPL.incrementFontSize();
-			}
-		});
-		button2.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				previewPL.decrementFontSize();
-			}
-		});
-		exportInstructionFileButton.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				try {
-					exportFile();
-				} catch (IOException e) {
-					e.printStackTrace();
-					JOptionPane.showMessageDialog(PuzzleHelperGUI.this, "Failed to save data to the file:\n" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
-				}
-			}
-		});
-		autoReadImageSizesButton.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				autoReadImageSize();
+		button1.addActionListener(actionEvent -> update());
+		directionCB.addActionListener(actionEvent -> requestUpdate());
+		button3.addActionListener(actionEvent -> previewPL.incrementFontSize());
+		button2.addActionListener(actionEvent -> previewPL.decrementFontSize());
+		exportInstructionFileButton.addActionListener(actionEvent -> {
+			try {
+				exportFile();
+			} catch (IOException e) {
+				e.printStackTrace();
+				JOptionPane.showMessageDialog(PuzzleHelperGUI.this, "Failed to save data to the file:\n" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
 			}
 		});
-		importBT.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent actionEvent) {
-				try {
-					actionImportFile();
-				} catch (IOException e) {
-					e.printStackTrace();
-					JOptionPane.showMessageDialog(PuzzleHelperGUI.this, "Failed to read instruction file:\n" + e.getMessage(), CellomicsPuzzleHelper.NAME, JOptionPane.ERROR_MESSAGE);
-				}
+		autoReadImageSizesButton.addActionListener(actionEvent -> autoReadImageSize());
+		importBT.addActionListener(actionEvent -> {
+			try {
+				actionImportFile();
+			} catch (IOException e) {
+				e.printStackTrace();
+				JOptionPane.showMessageDialog(PuzzleHelperGUI.this, "Failed to read instruction file:\n" + e.getMessage(), CellomicsPuzzleHelper.NAME, JOptionPane.ERROR_MESSAGE);
 			}
 		});