Moved 'openLogFile' block to MainUI class, fixed log file location on…

… Windows, blocking the opening.
Piwigo · Jul 19, 2019 · 60733fb · 60733fb
1 parent fa997ec
commit 60733fb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/FinishUI.java b/remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/FinishUI.java
@@ -88,14 +88,8 @@ public void paintComponent(Graphics graphics) {
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		if (e.getSource() == this.logBtn) {
-			if (Desktop.isDesktopSupported())
-				try {
-					Desktop.getDesktop().edit(this.parent.getRemoteParent().getLogFile());
-				} catch (IOException e1) {
-					e1.printStackTrace();
-				}
-		}
+		if (e.getSource() == this.logBtn)
+			this.parent.openLogFile();
 		if (e.getSource() == this.syncBtn)
 			this.parent.sendToSync();
 	}

diff --git a/remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/MainUI.java b/remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/MainUI.java
@@ -12,11 +12,13 @@
 
 import java.awt.CardLayout;
 import java.awt.Color;
+import java.awt.Desktop;
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.io.IOException;
 
 import javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
@@ -166,6 +168,14 @@ protected void selectDirectory()
 		}
 	}
 
+	protected void openLogFile()
+	{
+		if (Desktop.isDesktopSupported())
+		try {
+			Desktop.getDesktop().edit(this.getRemoteParent().getLogFile());
+		} catch (IOException e1) {}
+	}
+
 	protected void sendToSync()
 	{
 		CardLayout cardLayout = (CardLayout) cards.getLayout();

diff --git a/remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/RemotesyncUI.java b/remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/RemotesyncUI.java
@@ -36,8 +36,7 @@ public class RemotesyncUI {
 
 	private File logFile;
 
-	private SyncConfiguration syncConfiguration = ConfigurationUtil.INSTANCE.getUserConfiguration()
-			.getCurrentSyncConfiguration();
+	private SyncConfiguration syncConfiguration = ConfigurationUtil.INSTANCE.getUserConfiguration().getCurrentSyncConfiguration();
 
 	/**
 	 * Launch the application.
@@ -96,13 +95,11 @@ private void initialize() {
 	}
 
 	private void setCustomOut() {
-		logFile = new File("./.log");
+		logFile = new File(ConfigurationUtil.INSTANCE.getUserHomeDirectory(), "log.txt");
 		PrintStream ps = null;
-		try 
-		{
+		try  {
 			ps = new PrintStream(logFile);
-		} catch (FileNotFoundException e) 
-		{
+		}  catch (FileNotFoundException e) {
 			return;
 		}
 		System.setOut(ps);