summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorMichael Wilson2014-11-26 15:12:06 +0100
committerMichael Wilson2014-11-26 15:12:06 +0100
commit03a8d5c38261e0663327d2c6fe454956126d8136 (patch)
tree69cd1ef7b752e264ace74b2952d58a3d15643061 /dozentenmodul/src/main/java
parent• Prozess "Erstellen eines Image" kann nun direkt weiterleiten zu "Erstellen ... (diff)
downloadtutor-module-03a8d5c38261e0663327d2c6fe454956126d8136.tar.gz
tutor-module-03a8d5c38261e0663327d2c6fe454956126d8136.tar.xz
tutor-module-03a8d5c38261e0663327d2c6fe454956126d8136.zip
• Image update now removes old file and avoids zombies
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java2
-rw-r--r--dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java14
2 files changed, 2 insertions, 14 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index dcc0bfc7..24df52be 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -469,7 +469,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
Object[] options = { "Neue Veranstaltung erstellen",
"Zum Hauptmenü zurückkehren" };
- int choice = JOptionPane.showOptionDialog(null,
+ 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,
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index bd69571e..228cf831 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -458,19 +458,7 @@ public class MainMenue_GUI extends JFrame {
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
-
- //Template for Help-Buttons
- /*
- JMenu mnNewMenu_Info = new JMenu("Info");
- mnNewMenu_Info.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent arg0) {
- JOptionPane.showMessageDialog(null, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
- }
- });
- menuBar.add(mnNewMenu_Info);
- *
- */
+
JMenuItem mntmFaq = new JMenuItem("FAQ");