diff options
| author | Nino Breuer | 2014-12-01 16:30:59 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-12-01 16:30:59 +0100 |
| commit | 6a90495ac046d90a749ec2ec152ffdf4d7d603f0 (patch) | |
| tree | 625e5d14802ad1d3d847ab1895edd85a48167e95 /dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java | |
| parent | • changed implementation of user authentication. (diff) | |
| parent | • Admin can download any image (diff) | |
| download | tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.tar.gz tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.tar.xz tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
möp. großes geschrei, fehler bitte an mich.
dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
dozentenmodulserver/src/main/java/server/ServerHandler.java
dozentenmodulserver/src/main/java/server/generated/Server.java
dozentenmodulserver/thrift/server.thrift
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java | 57 |
1 files changed, 35 insertions, 22 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java index 34e3efb3..437f6c77 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java @@ -40,6 +40,7 @@ import javax.swing.border.EmptyBorder; import models.Image; import models.Links; import models.SessionData; +import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; @@ -99,16 +100,16 @@ public class FTPEditDownloader_GUI extends JFrame implements private boolean isCurrentlyLoading = false; // currently up or downloading // file private boolean isAborted = false; // down- or upload was manually aborted - private static final String HELP_MESSAGE = "<html><div align=\"center\">" + - "Hier können Sie Images herunterladen.<br />" + - "Klicken Sie anschließend auf \"Zurück\", um zu Ihrer vorherigen Auswahl zurückzugelangen.<br />" + - "</div></html>"; + private static final String HELP_MESSAGE = "<html><div align=\"center\">" + + "Hier können Sie Images herunterladen.<br />" + + "Klicken Sie anschließend auf \"Zurück\", um zu Ihrer vorherigen Auswahl zurückzugelangen.<br />" + + "</div></html>"; /** * Create the frame. */ public FTPEditDownloader_GUI(Component formerGUI) { - + final Object[] options = { "Beenden", "Abbrechen" }; @@ -137,7 +138,7 @@ public class FTPEditDownloader_GUI extends JFrame implements e1.printStackTrace(); } } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } task.cancel(true); @@ -160,12 +161,12 @@ public class FTPEditDownloader_GUI extends JFrame implements UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } setBackground(Color.WHITE); - setTitle("Dozentenmodul - Image herunterladen"); + setTitle("Dozentenmodul - Image herunterladen - "+person.verantwortlicher.getUserID()); // Aktion die beim Schliessen durchgefuehrt werden soll setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); @@ -311,6 +312,15 @@ public class FTPEditDownloader_GUI extends JFrame implements label_1.setForeground(Color.BLUE); label_1.setBounds(20, 92, 61, 20); contentPanel.add(label_1); + label_1.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + // oeffnet das Hauptmenue + dispose(); + MainMenue_GUI main = new MainMenue_GUI(c); + main.setVisible(true); + } + }); JLabel label_2 = new JLabel(">"); label_2.setBounds(80, 95, 14, 14); @@ -345,8 +355,7 @@ public class FTPEditDownloader_GUI extends JFrame implements lblSchritt_3.setBounds(20, 423, 57, 14); contentPanel.add(lblSchritt_3); - JLabel lblKlickenSieAuf = new JLabel( - "Klicken Sie auf \"Zurück\"."); + JLabel lblKlickenSieAuf = new JLabel("Klicken Sie auf \"Zurück\"."); lblKlickenSieAuf.setBounds(102, 423, 241, 14); contentPanel.add(lblKlickenSieAuf); @@ -367,7 +376,7 @@ public class FTPEditDownloader_GUI extends JFrame implements windows = new URI(Links.getFAQ()); open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -385,7 +394,7 @@ public class FTPEditDownloader_GUI extends JFrame implements windows = new URI(Links.getOTRS()); open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -415,7 +424,7 @@ public class FTPEditDownloader_GUI extends JFrame implements anleitung = new URI(Links.getAnleitungVMDK()); open.openWebpage(anleitung); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -430,7 +439,7 @@ public class FTPEditDownloader_GUI extends JFrame implements client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("FTP user deleted."); } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } task.cancel(true); @@ -468,12 +477,13 @@ public class FTPEditDownloader_GUI extends JFrame implements try { client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } // go back one page - SearchEditImage_GUI se = new SearchEditImage_GUI(c); + SearchEditImage_GUI se = new SearchEditImage_GUI( + c); se.setVisible(true); dispose(); }// end choice @@ -503,16 +513,18 @@ public class FTPEditDownloader_GUI extends JFrame implements } } setVisible(true); - + JMenu mnNewMenu_Info = new JMenu("Info"); mnNewMenu_Info.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(c, HELP_MESSAGE, + "Hilfe zu dieser Oberfläche", + JOptionPane.INFORMATION_MESSAGE); } }); menuBar.add(mnNewMenu_Info); - + c = this; } @@ -533,7 +545,7 @@ public class FTPEditDownloader_GUI extends JFrame implements Image.image.getVersion(),SessionData.session.getAuthToken()); } catch (TException e) { - // TODO Auto-generated catch block + e.printStackTrace(); JOptionPane.showMessageDialog(c, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", @@ -566,9 +578,10 @@ public class FTPEditDownloader_GUI extends JFrame implements } // Button zum Fertigstellen freischalten, wenn 100% erreicht sind - if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) { + if (isCurrentlyLoading() == false + || progressBar.getPercentComplete() == 1.0) { // no download - //LOGGER.info("finished downloading file"); + // LOGGER.info("finished downloading file"); btnDownloadStoppen.setEnabled(false); } else { // currently uploading, don't let user interact |
