summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java52
1 files changed, 28 insertions, 24 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index a4300f97..9d65d42e 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -2,6 +2,7 @@ package gui.image;
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Component;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
@@ -14,7 +15,6 @@ import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
-import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.text.DateFormat;
@@ -47,18 +47,14 @@ import models.person;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
-import org.ini4j.InvalidFileFormatException;
-import org.ini4j.Wini;
import server.generated.Server.Client;
import thrift.ThriftConnection;
-import util.GuiOrganizer;
import util.OpenLinks;
+import config.Config;
import ftp.UploadTask;
import gui.intro.About_GUI;
-import gui.intro.Login_GUI;
import gui.intro.MainMenue_GUI;
-import config.Config;
@SuppressWarnings("serial")
public class FTPCreateUploader_GUI extends JFrame implements
@@ -103,7 +99,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
int progress = 0; // progress of upload
private boolean isCurrentlyLoading = false; // currently up or downloading
// file
-
+ Component c = null;
private boolean isAborted = false; //down- or upload was manually aborted
private static final String HELP_MESSAGE = "<html><div align = \"center\">" +
@@ -119,7 +115,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
/**
* Create the frame.
*/
- public FTPCreateUploader_GUI() {
+ public FTPCreateUploader_GUI(final Component formerGUI) {
final Object[] options = { "Beenden", "Abbrechen" };
@@ -132,7 +128,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
// check if user wants to quit.
int choice = JOptionPane
.showOptionDialog(
- null,
+ c,
"Aktuell ist ein Upload aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?",
"Upload aktiv",
JOptionPane.YES_NO_CANCEL_OPTION,
@@ -157,14 +153,14 @@ 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(null,
+ JOptionPane.showMessageDialog(c,
e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
JOptionPane.ERROR_MESSAGE);
}
@@ -176,7 +172,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
setBounds(0, 0, 603, 722);
- GuiOrganizer.centerGUI(this);
+ setLocationRelativeTo(formerGUI);
+
getContentPane().setLayout(new BorderLayout());
contentPanel.setBackground(SystemColor.menu);
@@ -409,9 +406,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
}
// save configuration
Config.store();
-
dispose();
- MainMenue_GUI m = new MainMenue_GUI();
+ MainMenue_GUI m = new MainMenue_GUI(c);
m.setVisible(true);
if (taskrun == true) {
try {
@@ -421,7 +417,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
// TODO Auto-generated catch block
e1.printStackTrace();
JOptionPane.showMessageDialog(
- null,
+ c,
e1.getCause() + "\n"
+ e1.getStackTrace(),
"Debug-Message",
@@ -439,7 +435,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
if (isCurrentlyLoading() == true) {
int choice = JOptionPane
.showOptionDialog(
- null,
+ c,
"Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?",
"Warnung",
JOptionPane.YES_NO_CANCEL_OPTION,
@@ -456,25 +452,32 @@ public class FTPCreateUploader_GUI extends JFrame implements
task.cancel(true);
// not loading files, go back one page
dispose();
- PermissionCreateImage_GUI m = new PermissionCreateImage_GUI();
- m.setVisible(true);
+ PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(c);
+ //m.setVisible(true);
}// end if choice
} else {
+
int selectedOption = JOptionPane
.showConfirmDialog(
- null,
+ c,
"<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>",
"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());
dispose();
- PermissionCreateImage_GUI m = new PermissionCreateImage_GUI();
+ PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(formerGUI);
+ m.setLocationRelativeTo(formerGUI);
+
m.setVisible(true);
+
} else {
// for actions if "no" is selected. tbd.
}
+
}// end else
}// end action
@@ -541,11 +544,12 @@ public class FTPCreateUploader_GUI extends JFrame implements
mnNewMenu_Info.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent arg0) {
- JOptionPane.showMessageDialog(null, 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;
}
private void buttonUploadActionPerformed(ActionEvent event) {
@@ -565,7 +569,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
// TODO Auto-generated catch block
LOGGER.error("Konnte vom Satellit keinen FTP-User erhalten!");
e.printStackTrace();
- JOptionPane.showMessageDialog(null,
+ JOptionPane.showMessageDialog(c,
"Konnte vom Satellit keinen FTP-User erhalten!",
"Debug-Message", JOptionPane.ERROR_MESSAGE);
}
@@ -698,7 +702,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
} catch (TException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- JOptionPane.showMessageDialog(null,
+ JOptionPane.showMessageDialog(c,
e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
JOptionPane.ERROR_MESSAGE);
return false;