diff options
| author | Michael Wilson | 2014-08-25 17:50:38 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-08-25 17:50:38 +0200 |
| commit | 7c08e2fb5958666edabdd46ea5665be04577fe6d (patch) | |
| tree | 365e0b859d640dd69c0ea72d9ea31bacadea45da /Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java | |
| parent | Verhindere unerlaubtes zurückgehen auf vorige Seite während Up-DOwnloads (diff) | |
| parent | Letzter Down- und Uploadpfad werden nun in die Konfig geschrieben (diff) | |
| download | tutor-module-7c08e2fb5958666edabdd46ea5665be04577fe6d.tar.gz tutor-module-7c08e2fb5958666edabdd46ea5665be04577fe6d.tar.xz tutor-module-7c08e2fb5958666edabdd46ea5665be04577fe6d.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/ftp/DownloadTask.class
Dozentenmodul/bin/ftp/UploadTask.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
Diffstat (limited to 'Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java')
| -rw-r--r-- | Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java index c68ccff2..aae76861 100644 --- a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java @@ -72,6 +72,7 @@ public class FTPEditDownloader_GUI extends JFrame implements JLabel lblBytesread; JLabel lblNewLabel_3; JLabel labelVerbleibend; + JFileChooser fc; long filesize; double speed; int progress = 0; // progress of download @@ -152,10 +153,7 @@ public class FTPEditDownloader_GUI extends JFrame implements "Speicherort ausw\u00E4hlen"); btnSpeicherortAuswhlen.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - JFileChooser fc = new JFileChooser(); - fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - fc.showOpenDialog(getParent()); try { Wini ini = new Wini( new File( @@ -163,7 +161,10 @@ public class FTPEditDownloader_GUI extends JFrame implements + System.getProperty("user.name") + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); System.out.println("FileChooser Pfad: "+ini.get("main", "Letzter Downloadpfad", String.class)); - fc.setCurrentDirectory(new File(ini.get("main", "Letzter Downloadpfad", String.class))); + fc = new JFileChooser(ini.get("main", "Letzter Downloadpfad", String.class)); + fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + + fc.showOpenDialog(getParent()); } catch (InvalidFileFormatException e2) { // TODO Auto-generated catch block e2.printStackTrace(); @@ -171,6 +172,7 @@ public class FTPEditDownloader_GUI extends JFrame implements // TODO Auto-generated catch block e2.printStackTrace(); } + File dir = fc.getSelectedFile(); // check if directory is selected if (dir != null) { @@ -572,4 +574,4 @@ public class FTPEditDownloader_GUI extends JFrame implements System.out.println("isCurrentlyLoading"+isCurrentlyLoading); return isCurrentlyLoading; }// end isCurrentlyLoading() -}// end class
\ No newline at end of file +}// end class |