summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
diff options
context:
space:
mode:
authorNino Breuer2014-12-01 16:30:59 +0100
committerNino Breuer2014-12-01 16:30:59 +0100
commit6a90495ac046d90a749ec2ec152ffdf4d7d603f0 (patch)
tree625e5d14802ad1d3d847ab1895edd85a48167e95 /dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
parent• changed implementation of user authentication. (diff)
parent• Admin can download any image (diff)
downloadtutor-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/FTPCreateUploader_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java189
1 files changed, 105 insertions, 84 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 324ae01a..d5ab0330 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -55,6 +55,7 @@ import config.Config;
import ftp.UploadTask;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
+import gui.lecture.CreateLectureAllgemein_GUI;
@SuppressWarnings("serial")
public class FTPCreateUploader_GUI extends JFrame implements
@@ -63,8 +64,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
/**
* Logger instance for this class.
*/
- private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
-
+ private final static Logger LOGGER = Logger
+ .getLogger(FTPCreateUploader_GUI.class);
@SuppressWarnings("unused")
private JPanel contentPane;
@@ -99,18 +100,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
private boolean isCurrentlyLoading = false; // currently up or downloading
// file
Component c = null;
- private boolean isAborted = false; //down- or upload was manually aborted
+ private boolean isAborted = false; // down- or upload was manually aborted
private String uuid;
-
- private static final String HELP_MESSAGE = "<html><div align = \"center\">" +
- "Laden Sie hier Ihre .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.<br />" +
- "Wichtig ist, dass Sie zum Schluss auf \"Fertigstellen\" klicken, damit die Daten übernommen werden.<br />" +
- "Wenn Sie die Datei hochgeladen haben, dann aber auf \"zurück\" klicken, oder die Anwendung beenden,<br />" +
- "werden die Daten NICHT übernommen und auch die .vmdk-Datei wird nicht aktiv geschaltet." +
- "</div></html>";
-
-
+ private static final String HELP_MESSAGE = "<html><div align = \"center\">"
+ + "Laden Sie hier Ihre .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.<br />"
+ + "Wichtig ist, dass Sie zum Schluss auf \"Fertigstellen\" klicken, damit die Daten übernommen werden.<br />"
+ + "Wenn Sie die Datei hochgeladen haben, dann aber auf \"zurück\" klicken, oder die Anwendung beenden,<br />"
+ + "werden die Daten NICHT übernommen und auch die .vmdk-Datei wird nicht aktiv geschaltet."
+ + "</div></html>";
/**
* Create the frame.
@@ -123,8 +121,9 @@ public class FTPCreateUploader_GUI extends JFrame implements
{
uuid = client.createRandomUUID(SessionData.session.getAuthToken());
+
} catch (TException e1) {
- // TODO Auto-generated catch block
+
e1.printStackTrace();
}
@@ -148,7 +147,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
try {
client.DeleteFtpUser(user.userName, SessionData.session.getAuthToken());
} catch (TException e1) {
- // TODO Auto-generated catch block
+
e1.printStackTrace();
}
task.cancel(true);
@@ -175,12 +174,12 @@ public class FTPCreateUploader_GUI extends JFrame implements
}// end window closing
});
setResizable(false);
-
+
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (ClassNotFoundException | InstantiationException
| IllegalAccessException | UnsupportedLookAndFeelException e) {
- // TODO Auto-generated catch block
+
e.printStackTrace();
JOptionPane.showMessageDialog(c,
e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
@@ -189,13 +188,12 @@ public class FTPCreateUploader_GUI extends JFrame implements
// filename=name;
setBackground(Color.WHITE);
- setTitle("Dozentenmodul - Image erzeugen");
+ setTitle("Dozentenmodul - Image erzeugen - "+person.verantwortlicher.getUserID());
// Aktion die beim Schliessen durchgefuehrt werden soll
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
setBounds(0, 0, 603, 722);
setLocationRelativeTo(formerGUI);
-
getContentPane().setLayout(new BorderLayout());
contentPanel.setBackground(SystemColor.menu);
@@ -402,7 +400,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
LOGGER.info("Deleted FTP user.");
} catch (TException e1) {
- // TODO Auto-generated catch block
+
e1.printStackTrace();
}
task.cancel(true);
@@ -425,19 +423,28 @@ public class FTPCreateUploader_GUI extends JFrame implements
btnFinish.setEnabled(false);
btnFinish.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
-
- //save data
+
+ // save data
boolean success = writeData();
- if(success==true){
- LOGGER.info("Neues Image '"+Image.image.getImagename()+"' erfolgreich gespeichert.");
- JOptionPane.showMessageDialog(c,
- "Die Daten wurden erfolgreich gespeichert.", "Daten gespeichert",
- JOptionPane.INFORMATION_MESSAGE);
+ if (success == true) {
+ LOGGER.info("Neues Image '"
+ + Image.image.getImagename()
+ + "' erfolgreich gespeichert.");
+ JOptionPane
+ .showMessageDialog(
+ c,
+ "Die Daten wurden erfolgreich gespeichert.",
+ "Daten gespeichert",
+ JOptionPane.INFORMATION_MESSAGE);
} else {
- LOGGER.info("Neues Image '"+Image.image.getImagename()+"' konnte nicht gespeichert werden.");
- JOptionPane.showMessageDialog(c,
- "Die Daten konnten nicht gespeichert werden.", "Fehler",
- JOptionPane.ERROR_MESSAGE);
+ LOGGER.info("Neues Image '"
+ + Image.image.getImagename()
+ + "' konnte nicht gespeichert werden.");
+ JOptionPane
+ .showMessageDialog(
+ c,
+ "Die Daten konnten nicht gespeichert werden.",
+ "Fehler", JOptionPane.ERROR_MESSAGE);
}
File f = new File(lblPath.getText().trim());
@@ -449,30 +456,52 @@ public class FTPCreateUploader_GUI extends JFrame implements
Config.setLastUploadPath(f.getParentFile()
.toString());
}
-
+
// save configuration
Config.store();
- dispose();
- MainMenue_GUI m = new MainMenue_GUI(c);
- m.setVisible(true);
-
+ // dispose();
+ // MainMenue_GUI m = new MainMenue_GUI(c);
+ // m.setVisible(true);
+
if (taskrun == true) {
try {
client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
} catch (TException e1) {
- // TODO Auto-generated catch block
+
e1.printStackTrace();
- JOptionPane.showMessageDialog(
- c,
- e1.getCause() + "\n"
- + e1.getStackTrace(),
+ JOptionPane.showMessageDialog(c, e1.getCause()
+ + "\n" + e1.getStackTrace(),
"Debug-Message",
JOptionPane.ERROR_MESSAGE);
}
task.cancel(true);
}
+
+ // Erstellung Array vom Datentyp Object, Hinzufügen der
+ // Optionen
+ Object[] options = { "Neue Veranstaltung erstellen",
+ "Zum Hauptmenü zurückkehren" };
+
+ int choice = JOptionPane.showOptionDialog(c,
+ "Möchten Sie eine neue Veranstaltung zu diesem Image erstellen oder in das Hauptmenü zurückkehren?", "Alternativen",
+ JOptionPane.DEFAULT_OPTION,
+ JOptionPane.INFORMATION_MESSAGE, null, options,
+ options[0]);
+
+ // 0=New Lecture, 1=Main Menu
+ if (choice == 0) {
+ dispose();
+ CreateLectureAllgemein_GUI cl = new CreateLectureAllgemein_GUI(
+ c);
+ cl.setVisible(true);
+ } else {
+ dispose();
+ MainMenue_GUI m = new MainMenue_GUI(c);
+ m.setVisible(true);
+ }
+
}
});
@@ -493,18 +522,18 @@ public class FTPCreateUploader_GUI extends JFrame implements
try {
client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
} catch (TException e1) {
- // TODO Auto-generated catch block
+
e1.printStackTrace();
}
task.cancel(true);
// not loading files, go back one page
dispose();
- PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(c);
- //m.setVisible(true);
+ PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(
+ c);
+ // m.setVisible(true);
}// end if choice
} else {
-
int selectedOption = JOptionPane
.showConfirmDialog(
@@ -513,17 +542,17 @@ public class FTPCreateUploader_GUI extends JFrame implements
"Abbrechen und zurück",
JOptionPane.YES_NO_OPTION);
if (selectedOption == JOptionPane.YES_OPTION) {
- //System.out.println("CreateUploader X:"+formerGUI.getLocation().getX());
- //System.out.println("CreateUploader X:"+formerGUI.getLocation().getY());
- PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(c);
- //m.setLocationRelativeTo(formerGUI);
+ // System.out.println("CreateUploader X:"+formerGUI.getLocation().getX());
+ // System.out.println("CreateUploader X:"+formerGUI.getLocation().getY());
+ PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(
+ c);
+ // m.setLocationRelativeTo(formerGUI);
m.setVisible(true);
dispose();
-
+
} else {
// for actions if "no" is selected. tbd.
}
-
}// end else
}// end action
@@ -551,7 +580,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
windows = new URI(Links.getFAQ());
OpenLinks.openWebpage(windows);
} catch (URISyntaxException e) {
- // TODO Auto-generated catch block
+
e.printStackTrace();
}
}
@@ -569,7 +598,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
windows = new URI(Links.getOTRS());
open.openWebpage(windows);
} catch (URISyntaxException e) {
- // TODO Auto-generated catch block
+
e.printStackTrace();
}
}
@@ -585,16 +614,18 @@ public class FTPCreateUploader_GUI extends JFrame implements
});
menu.add(mntmAbout);
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);
- //System.out.println("userID is: "+person.verantwortlicher.getUserID());
+
c = this;
}
@@ -609,11 +640,11 @@ public class FTPCreateUploader_GUI extends JFrame implements
LOGGER.info("Getting FTP User...");
user = client.getFtpUser(SessionData.session.getAuthToken());
LOGGER.info("Received FTP user.");
- //LOGGER.debug("FTP name: " + user.userName);
- //LOGGER.debug("FTP path: " + user.path);
- //LOGGER.debug("FTP pass: " + user.password);
+ // LOGGER.debug("FTP name: " + user.userName);
+ // LOGGER.debug("FTP path: " + user.path);
+ // LOGGER.debug("FTP pass: " + user.password);
} catch (TException e) {
- // TODO Auto-generated catch block
+
LOGGER.error("Konnte vom Satellit keinen FTP-User erhalten!");
e.printStackTrace();
JOptionPane.showMessageDialog(c,
@@ -622,10 +653,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
}
DateFormat formatter = new SimpleDateFormat("yyyMMddHHmmss");
- //LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_"
- // + person.verantwortlicher.getHochschule() + "_"
- // + person.verantwortlicher.getUsername() + "_"
- // + Image.image.getImagename() + ".vmdk");
+ // LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_"
+ // + person.verantwortlicher.getHochschule() + "_"
+ // + person.verantwortlicher.getUsername() + "_"
+ // + Image.image.getImagename() + ".vmdk");
Image.image.setNewName(formatter.format(new Date()) + "_"
+ person.verantwortlicher.getHochschule() + "_"
+ person.verantwortlicher.getUsername() + "_"
@@ -653,9 +684,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
// Fertigstellen erlauben wenn upload abgeschlossen und abbrechen
// erlauben wenn kein load aktiv ist
- if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) {
+ if (isCurrentlyLoading() == false
+ || progressBar.getPercentComplete() == 1.0) {
// no upload
- //LOGGER.info("finished uploading file");
+ // LOGGER.info("finished uploading file");
btnUploadStoppen.setEnabled(false);
btnFinish.setEnabled(true);
} else {
@@ -668,8 +700,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
speed = (double) arg0.getNewValue();
// if(speed<=1){
- lblUpSpeed.setText(String.format("%.2f", speed)
- + " MB/s");
+ lblUpSpeed.setText(String.format("%.2f", speed) + " MB/s");
}
if ("bytesread" == arg0.getPropertyName()) {
@@ -701,7 +732,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
public boolean writeData() {
try {
-
+
client.writeVLdata(
Image.image.getImagename(),
Image.image.getDesc(),
@@ -721,7 +752,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
person.verantwortlicher.getUserID()
);
- System.out.println("userID is: "+person.verantwortlicher.getUserID());
+ //System.out.println("userID is: "+person.verantwortlicher.getUserID());
+ System.out.println("starting file copy...");
client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
client.writeImageRights(uuid,SessionData.session.getAuthToken(),person.verantwortlicher.getRole(),person.verantwortlicher.getHochschule(), person.verantwortlicher.getUserID());
@@ -738,22 +770,11 @@ public class FTPCreateUploader_GUI extends JFrame implements
RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(),
SessionData.session.getAuthToken()
);
- /*
- LOGGER.info(
- "Name: "+Image.image.getImagename()
- +"\tUserID: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()
- +"\tisImageRead: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead()
- +"\tisImageWrite: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite()
- +"\tisImageLInkAllowed: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed()
- +"\tisImageAdmin: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()
- );
- */
-
- }//end for
-
-
+
+ }// end for
+
} catch (TException e) {
- // TODO Auto-generated catch block
+
e.printStackTrace();
JOptionPane.showMessageDialog(c,
e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 14:02:46 +0100