[client] Seperated filechooser from ImageUploadPage and also added it as directory chooser to download buttons.

3 files changed, 92 insertions, 39 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/FileChooser.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/FileChooser.java
new file mode 100644
index 00000000..b83f9c48
--- /dev/null
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/FileChooser.java
@@ -0,0 +1,53 @@
+package org.openslx.dozmod.gui.helper;
+
+import java.awt.Component;
+
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import javax.swing.LookAndFeel;
+import javax.swing.UIManager;
+
+import org.openslx.dozmod.Config;
+
+public class FileChooser extends JFileChooser {
+	/**
+	 * @param isFileChooser wether filechooser is for selecting image to upload or selecting directory for download
+	 */
+	public FileChooser(boolean isFileChooser){
+		super(isFileChooser ? Config.getUploadPath() : Config.getUploadPath());
+		
+		// Ugly hack to get a prettier file chooser with GTK - should be moved to helper/util class
+		LookAndFeel old = UIManager.getLookAndFeel();
+		if (!old.getName().toLowerCase().contains("gtk")) {
+			old = null;
+		} else {
+			try {
+				UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		if (old != null) {
+			updateUI();
+			try {
+				UIManager.setLookAndFeel(old);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			refreshUI(this, false);
+		}
+		setFileSelectionMode(isFileChooser ? JFileChooser.FILES_ONLY : JFileChooser.DIRECTORIES_ONLY);
+	}
+
+	private static void refreshUI(JComponent c, boolean includeParent) {
+		if (includeParent)
+			c.updateUI();
+
+		for (int i = 0; i < c.getComponentCount(); i++) {
+			Component child = c.getComponent(i);
+			if (child instanceof JComponent) {
+				refreshUI((JComponent) child, true);
+			}
+		}
+	}
+}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
index 0914bac7..ba8f2d36 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
@@ -5,8 +5,11 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.util.List;
 
+import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JMenuItem;
 import javax.swing.RowFilter;
@@ -20,8 +23,11 @@ import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.bwlp.thrift.iface.TAuthorizationException;
 import org.openslx.bwlp.thrift.iface.TNotFoundException;
+import org.openslx.bwlp.thrift.iface.TransferInformation;
+import org.openslx.dozmod.filetransfer.DownloadTask;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
+import org.openslx.dozmod.gui.helper.FileChooser;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.helper.PopupMenu;
 import org.openslx.dozmod.gui.window.layout.ImageListWindowLayout;
@@ -42,13 +48,13 @@ public class ImageListWindow extends ImageListWindowLayout {
 	private JMenuItem popupItemNewLecture = new JMenuItem("Neue Veranstaltung");
 	private JMenuItem popupItemDelete = new JMenuItem("Löschen");
 	private JMenuItem popupItemDownload = new JMenuItem("Download");
-	
+
 	public ImageListWindow() {
 		super();
 
 		// filter the objects in the table depending on the search field
 		searchTextField.getDocument().addDocumentListener(new DocumentListener() {
-			
+
 			@Override
 			public void removeUpdate(DocumentEvent e) {
 				changedUpdate(e);
@@ -80,7 +86,7 @@ public class ImageListWindow extends ImageListWindowLayout {
 					LOGGER.debug("New lecture clicked");
 				}
 				if (e.getSource().equals(popupItemDownload)) {
-					// Download
+					performImageDownload();
 					LOGGER.debug("Download image clicked");
 				}
 				if (e.getSource().equals(popupItemDelete)) {
@@ -95,7 +101,7 @@ public class ImageListWindow extends ImageListWindowLayout {
 		pop.addMenuItem(popupItemDownload);
 		pop.addSeparator();
 		pop.addMenuItem(popupItemDelete);
-		
+
 		imageTable.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
@@ -140,7 +146,7 @@ public class ImageListWindow extends ImageListWindowLayout {
 		downloadButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				// TODO open download popup
+				performImageDownload();	
 			}
 		});
 
@@ -177,7 +183,7 @@ public class ImageListWindow extends ImageListWindowLayout {
 				MainWindow.showPage(MainMenuWindow.class);
 			}
 		});
-		
+
 	}
 
 	private void refreshList(final boolean forceRefresh) {
@@ -214,4 +220,29 @@ public class ImageListWindow extends ImageListWindowLayout {
 	public void requestShow() {
 		refreshList(false);
 	}
+
+	private void performImageDownload() {
+		FileChooser fc = new FileChooser(false);
+		int action = fc.showOpenDialog(me);
+		File file = fc.getSelectedFile();
+		if (action != JFileChooser.APPROVE_OPTION || file == null)
+			return;
+		TransferInformation transInf = null;
+		try {
+			transInf = ThriftManager.getSatClient().requestDownload(Session.getSatelliteToken(), imageTable.getSelectedItem().latestVersionId);
+		} catch ( TException e) {
+			LOGGER.error("Failed to get transfer information: ", e);
+			return;
+		}
+		if (transInf == null) 
+			return;
+
+		// TODO fix filename/path and consider multiplatform
+		try {
+			DownloadTask dlTask = new DownloadTask(Session.getSatelliteAddress(), transInf.getPlainPort(), transInf.getToken(), new File(file.getAbsolutePath() + "/HanneloreKraft"), imageTable.getSelectedItem().getFileSize(), null);
+		} catch (FileNotFoundException e) {
+			LOGGER.error("Failed to get download: ", e);
+		}
+		LOGGER.info(file.getAbsolutePath());
+	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
index e7f9700f..4f1b6788 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
@@ -23,6 +23,7 @@ import org.openslx.dozmod.Config;
 import org.openslx.dozmod.filetransfer.UploadTask;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
+import org.openslx.dozmod.gui.helper.FileChooser;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.ImageUploadPageLayout;
@@ -69,30 +70,9 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 	}
 
 	private void browseForVm() {
-		// Ugly hack to get a prettier file chooser with GTK - should be moved to helper/util class
-		LookAndFeel old = UIManager.getLookAndFeel();
-		if (!old.getName().toLowerCase().contains("gtk")) {
-			old = null;
-		} else {
-			try {
-				UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		JFileChooser fc = new JFileChooser(Config.getUploadPath());
-		if (old != null) {
-			fc.updateUI();
-			try {
-				UIManager.setLookAndFeel(old);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			refreshUI(fc, false);
-		}
+		FileChooser fc = new FileChooser(true);
 		FileNameExtensionFilter filter = new FileNameExtensionFilter("VMware Virtual Machine", "vmx");
 		fc.setFileFilter(filter);
-		fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
 
 		int action = fc.showOpenDialog(getDialog());
 		File file = fc.getSelectedFile();
@@ -101,17 +81,6 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 		vmxSelected(file.getAbsoluteFile());
 	}
 
-	private static void refreshUI(JComponent c, boolean includeParent) {
-		if (includeParent)
-			c.updateUI();
-
-		for (int i = 0; i < c.getComponentCount(); i++) {
-			Component child = c.getComponent(i);
-			if (child instanceof JComponent) {
-				refreshUI((JComponent) child, true);
-			}
-		}
-	}
 
 	private void vmxSelected(File file) {
 		Config.setUploadPath(file.getParent());