summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src
diff options
context:
space:
mode:
authorNino Breuer2014-06-05 02:21:41 +0200
committerNino Breuer2014-06-05 02:21:41 +0200
commit20a7c033f73d284d1d79fa427d3fa69e493e6e0e (patch)
tree502a7e07930f617080eb945fee118f67e4fd7aa2 /Dozentenmodul/src
parentfenstergroeße angepasst (diff)
downloadtutor-module-20a7c033f73d284d1d79fa427d3fa69e493e6e0e.tar.gz
tutor-module-20a7c033f73d284d1d79fa427d3fa69e493e6e0e.tar.xz
tutor-module-20a7c033f73d284d1d79fa427d3fa69e493e6e0e.zip
Ausrichtung der GUI-Elemente nach Bildschirmmitte optimiert und als Klasse in utils-package ausgelagert. Feuchtes Durchwischen bei den Imports. Die meisten Warnings sollten bei den GUI-packages damit behoben sein.
Diffstat (limited to 'Dozentenmodul/src')
-rw-r--r--Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java49
-rw-r--r--Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java51
-rw-r--r--Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java51
-rw-r--r--Dozentenmodul/src/gui/image/DeleteImage_GUI.java21
-rw-r--r--Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java19
-rw-r--r--Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java54
-rw-r--r--Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java13
-rw-r--r--Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java23
-rw-r--r--Dozentenmodul/src/gui/image/FTPDownloader_GUI.java49
-rw-r--r--Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java23
-rw-r--r--Dozentenmodul/src/gui/image/SearchEditImage_GUI.java16
-rw-r--r--Dozentenmodul/src/gui/image/SearchImage_GUI.java16
-rw-r--r--Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java15
-rw-r--r--Dozentenmodul/src/gui/intro/About_GUI.java13
-rw-r--r--Dozentenmodul/src/gui/intro/BillOfRights_GUI.java14
-rw-r--r--Dozentenmodul/src/gui/intro/Login_GUI.java22
-rw-r--r--Dozentenmodul/src/gui/intro/MainMenue_GUI.java64
-rw-r--r--Dozentenmodul/src/gui/intro/VmWareLink_GUI.java49
-rw-r--r--Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java26
-rw-r--r--Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java15
-rw-r--r--Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java15
-rw-r--r--Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java25
-rw-r--r--Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java16
-rw-r--r--Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java15
-rw-r--r--Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java16
-rw-r--r--Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java17
-rw-r--r--Dozentenmodul/src/util/GuiOrganizer.java26
27 files changed, 373 insertions, 360 deletions
diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
index 9435a158..956dea25 100644
--- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
@@ -4,41 +4,38 @@ package gui.image;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
-import java.awt.Dimension;
+import java.awt.Color;
import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
-import java.awt.Color;
-import javax.swing.JLabel;
-import java.awt.Font;
-import javax.swing.JTextPane;
-import java.awt.SystemColor;
-import javax.swing.JTextField;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import javax.swing.JSeparator;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
import javax.swing.border.TitledBorder;
-import javax.swing.JTextArea;
import models.Image;
import models.Links;
import models.person;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.IOException;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class CreateImageAllgemein_GUI extends JFrame {
@@ -83,10 +80,8 @@ public class CreateImageAllgemein_GUI extends JFrame {
//Setzt den Titel
setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen");
//Zentriert das Fenster
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 722) / 2;
- int left=(screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
getContentPane().setLayout(null);
{
diff --git a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
index 99381c5d..38991942 100644
--- a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
@@ -3,38 +3,38 @@ package gui.image;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
import java.awt.Color;
-import javax.swing.JLabel;
+import java.awt.FlowLayout;
import java.awt.Font;
-import javax.swing.JTextPane;
import java.awt.SystemColor;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-import javax.swing.JSeparator;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.border.TitledBorder;
+import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.io.IOException;
+
import javax.swing.ButtonGroup;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
import models.Image;
import models.Links;
-import javax.swing.JComboBox;
-import javax.swing.DefaultComboBoxModel;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class CreateImageFreigabe_GUI extends JFrame {
@@ -65,11 +65,10 @@ public class CreateImageFreigabe_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
- // setBounds(100, 100, 603, 722);
+
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
index 91ba9573..ebcbcaec 100644
--- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
@@ -4,41 +4,39 @@ package gui.image;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
import java.awt.Color;
-import javax.swing.JLabel;
+import java.awt.FlowLayout;
import java.awt.Font;
-import javax.swing.JTextPane;
import java.awt.SystemColor;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-import javax.swing.JSeparator;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.border.TitledBorder;
-import javax.swing.JTextArea;
+import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.io.IOException;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
-import javax.swing.JRadioButton;
import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
import javax.swing.JSpinner;
+import javax.swing.JTextArea;
+import javax.swing.JTextPane;
import javax.swing.SpinnerNumberModel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
import models.Image;
import models.Links;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class CreateImageTechnisch_GUI extends JFrame {
@@ -75,11 +73,10 @@ public class CreateImageTechnisch_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 722) / 2;
- int left=(screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
- //setBounds(100, 100, 603, 722);
+
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 45edb67a..2c748679 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -2,15 +2,12 @@ package gui.image;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
-import gui.lecture.ExtendedSearchForImages_GUI;
+
import java.awt.Color;
-import java.awt.Desktop;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.HeadlessException;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -19,11 +16,9 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
import java.util.Iterator;
import java.util.List;
+
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFrame;
@@ -40,6 +35,7 @@ import javax.swing.JTabbedPane;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.JTextPane;
+import javax.swing.ListSelectionModel;
import javax.swing.RowFilter;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
@@ -50,12 +46,15 @@ import javax.swing.event.ChangeListener;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
+
import models.Links;
import models.person;
+
import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
-import javax.swing.ListSelectionModel;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class DeleteImage_GUI extends JFrame {
@@ -114,10 +113,8 @@ public class DeleteImage_GUI extends JFrame {
// Setzt den Fenstertitel
setTitle("bwLehrpool Suite *Prototyp* - Image l\u00F6schen");
// Zentriert das Fenster in die Bildmitte
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
final DefaultTableModel model = new DefaultTableModel(titles, 0);
diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
index 2ed1fc3c..d9b29d91 100644
--- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
@@ -4,22 +4,17 @@ import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
import java.awt.Color;
-import java.awt.Desktop;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
import java.util.Map;
+
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -36,12 +31,16 @@ import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-import org.apache.thrift.TException;
+
import models.Image;
import models.Links;
import models.person;
+
+import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class EditImageAllgemein_GUI extends JFrame {
@@ -88,10 +87,8 @@ public class EditImageAllgemein_GUI extends JFrame {
setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten");
// Zentriert das Fenster in der Bildmitte
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
initData();
getContentPane().setLayout(null);
{
diff --git a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
index 71b3aa15..94ec06a6 100644
--- a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
@@ -4,43 +4,38 @@ package gui.image;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
import java.awt.Color;
-import javax.swing.JLabel;
+import java.awt.FlowLayout;
import java.awt.Font;
-import javax.swing.JTextPane;
import java.awt.SystemColor;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-import javax.swing.JSeparator;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.border.TitledBorder;
-import javax.swing.JTextArea;
+import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.io.IOException;
-import javax.swing.JRadioButton;
import javax.swing.ButtonGroup;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
import models.Image;
import models.Links;
-import javax.swing.JComboBox;
-import javax.swing.DefaultComboBoxModel;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class EditImageFreigabe_GUI extends JFrame {
@@ -71,11 +66,10 @@ public class EditImageFreigabe_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 722) / 2;
- int left=(screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
- //setBounds(100, 100, 603, 722);
+
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
index 4945fcd2..4e0140c2 100644
--- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
@@ -4,18 +4,17 @@ import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
+
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
+
import javax.swing.ButtonGroup;
import javax.swing.JButton;
@@ -35,6 +34,8 @@ import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
+
+import util.GuiOrganizer;
import models.Image;
import models.Links;
@@ -79,10 +80,8 @@ public class EditImageTechnisch_GUI extends JFrame {
// Setzt den Titel des Fensters
setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten");
// Zentriert das Fenster
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
getContentPane().setLayout(null);
{
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 11664d25..91e5decb 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -2,28 +2,29 @@ package gui.image;
import java.awt.BorderLayout;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
-import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+
import javax.swing.JButton;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
@@ -33,19 +34,20 @@ import javax.swing.SwingConstants;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
+
import models.Image;
import models.Links;
import models.SessionData;
import models.person;
+
import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
import ftp.UploadTask;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
-import javax.swing.JMenuItem;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
@SuppressWarnings("serial")
public class FTPCreateUploader_GUI extends JFrame implements
@@ -119,11 +121,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
// filename=name;
setBackground(Color.WHITE);
setTitle("Dozentenmodul *Prototyp* - Image erzeugen");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
- // setBounds(100, 100, 603, 250);
+
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(new BorderLayout());
contentPanel.setBackground(SystemColor.menu);
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
index a5c973df..87a59a6b 100644
--- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
@@ -2,50 +2,49 @@ package gui.image;
import java.awt.BorderLayout;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
-import java.awt.Toolkit;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.io.File;
-import java.io.IOException;
import javax.swing.JButton;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
+import javax.swing.JSeparator;
+import javax.swing.JTextPane;
import javax.swing.SwingConstants;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
-import ftp.DownloadTask;
-import gui.intro.About_GUI;
-import gui.intro.MainMenue_GUI;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.SystemColor;
-import java.awt.Font;
-import javax.swing.JTextPane;
-import javax.swing.JSeparator;
import models.Image;
import models.Links;
import models.SessionData;
import org.apache.thrift.TException;
+
import server.Server.Client;
import server.User;
import thrift.ThriftConnection;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import util.GuiOrganizer;
+import ftp.DownloadTask;
+import gui.intro.About_GUI;
+import gui.intro.MainMenue_GUI;
@SuppressWarnings("serial")
public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener {
@@ -115,10 +114,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
setBackground(Color.WHITE);
setTitle("Dozentenmodul *Prototyp* - Image herunterladen");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(new BorderLayout());
contentPanel.setBackground(SystemColor.menu);
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index 0df37a95..298ea6ea 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -2,28 +2,29 @@ package gui.image;
import java.awt.BorderLayout;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
-import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+
import javax.swing.JButton;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
@@ -33,19 +34,20 @@ import javax.swing.SwingConstants;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
+
import models.Image;
import models.Links;
import models.SessionData;
import models.person;
+
import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
import ftp.UploadTask;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
-import javax.swing.JMenuItem;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
@SuppressWarnings("serial")
public class FTPEditUploader_GUI extends JFrame implements
@@ -116,11 +118,10 @@ public class FTPEditUploader_GUI extends JFrame implements
// filename=name;
setBackground(Color.WHITE);
setTitle("Dozentenmodul *Prototyp* - Image bearbeiten");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
- // setBounds(100, 100, 603, 250);
+
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(new BorderLayout());
contentPanel.setBackground(SystemColor.menu);
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index e5e6ad28..11dacd09 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -2,13 +2,11 @@ package gui.image;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
-import gui.lecture.ExtendedSearchForImages_GUI;
+
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -17,9 +15,9 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFrame;
@@ -46,15 +44,17 @@ import javax.swing.event.ChangeListener;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
+
import models.Image;
import models.Links;
import models.person;
-//import models.person;
import org.apache.thrift.TException;
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
+//import models.person;
@SuppressWarnings("serial")
public class SearchEditImage_GUI extends JFrame {
@@ -122,10 +122,8 @@ public class SearchEditImage_GUI extends JFrame {
// Setzt den Fenstertitel
setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten");
// Zentriert das Fenster in die Bildmitte
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
final DefaultTableModel model = new DefaultTableModel(titles, 0);
diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index 6680d8e7..9c197421 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -2,13 +2,11 @@ package gui.image;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
-import gui.lecture.ExtendedSearchForImages_GUI;
+
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -17,9 +15,9 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFrame;
@@ -46,12 +44,16 @@ import javax.swing.event.ChangeListener;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
+
import models.Image;
import models.Links;
import models.person;
+
import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class SearchImage_GUI extends JFrame {
@@ -116,10 +118,8 @@ public class SearchImage_GUI extends JFrame {
// Setzt den Fenstertitel
setTitle("bwLehrpool Suite *Prototyp* - Suche VL-Image");
// Zentriert das Fenster in die Bildmitte
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
final DefaultTableModel model = new DefaultTableModel(titles, 0);
diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java
index c80d9fe1..daef9bae 100644
--- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java
@@ -4,18 +4,16 @@ import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
+
import javax.swing.ButtonGroup;
import javax.swing.JButton;
import javax.swing.JFrame;
@@ -32,7 +30,9 @@ import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
+
import models.Links;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class SearchMethodLecture_GUI extends JFrame {
@@ -65,11 +65,10 @@ public class SearchMethodLecture_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite *Prototyp* - Suchmethode w\u00E4hlen");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 603) / 2;
- int left = (screenSize.width - 722) / 2;
- setBounds(left, top, 603, 722);
- // setBounds(100, 100, 603, 722);
+
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
diff --git a/Dozentenmodul/src/gui/intro/About_GUI.java b/Dozentenmodul/src/gui/intro/About_GUI.java
index 99398ca1..447f18ee 100644
--- a/Dozentenmodul/src/gui/intro/About_GUI.java
+++ b/Dozentenmodul/src/gui/intro/About_GUI.java
@@ -1,21 +1,22 @@
package gui.intro;
-import java.awt.Dimension;
import java.awt.Image;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JTextPane;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
-import javax.swing.JTextPane;
+
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class About_GUI extends JFrame {
@@ -46,10 +47,8 @@ public class About_GUI extends JFrame {
// Aktion die beim Schliessen durchgefuehrt werden soll
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
// Groesse des Fensters definieren
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 309) / 2;
- int left = (screenSize.width - 355) / 2;
- setBounds(left, top, 355, 309);
+ setBounds(0, 0, 355, 309);
+ GuiOrganizer.centerGUI(this);
// Erzeugen eines Panels
contentPane = new JPanel();
// Hintergrund Farbe des Panels setzen
diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java
index 652cca80..2cd45f08 100644
--- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java
+++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java
@@ -1,13 +1,13 @@
package gui.intro;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
@@ -37,8 +37,8 @@ import models.Links;
import org.ini4j.InvalidFileFormatException;
import org.ini4j.Wini;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+
+import util.GuiOrganizer;
@@ -75,10 +75,8 @@ public class BillOfRights_GUI extends JFrame {
setTitle("bwLehrpool Suite *Prototyp*");
//Zentiert das Fenster in der Bildschirmmitte
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 722) / 2;
- int left=(screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
getContentPane().setLayout(null);
{
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 5b47f4e0..06a87307 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -1,17 +1,16 @@
package gui.intro;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Image;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.io.IOException;
+
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JFrame;
@@ -20,19 +19,23 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
import javax.swing.JTextField;
+import javax.swing.SwingConstants;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
+
import models.SessionData;
import models.person;
+
import org.apache.thrift.TException;
import org.ini4j.Wini;
-import thrift.MasterThriftConnection;
+
import thrift.ImageServer.Client;
+import thrift.MasterThriftConnection;
import thrift.ThriftConnection;
import thrift.UserInfo;
+import util.GuiOrganizer;
import config.config_file;
-import javax.swing.SwingConstants;
@SuppressWarnings("serial")
public class Login_GUI extends JFrame {
@@ -106,11 +109,11 @@ public class Login_GUI extends JFrame {
setTitle("Dozentenmodul *Prototyp*");
// Aktion die beim Schliessen durchgefuehrt werden soll
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- // Groesse des Fensters definieren
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 400) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 400);
+
+ //Größe setzen und mittig ausrichten
+ setBounds(0, 0, 603, 400);
+ GuiOrganizer.centerGUI(this);
+
// Erzeugen eines Panels
contentPane = new JPanel();
// Hintergrund Farbe des Panels setzen
@@ -182,6 +185,7 @@ public class Login_GUI extends JFrame {
lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT);
lblConnectionInfo.setBounds(292, 290, 237, 20);
contentPane.add(lblConnectionInfo);
+ //GuiOrganizer.centerGUI(this);
}// end LoginGUI()
// Versuche den Benutzer einzuloggen
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index 59bd561b..abce5001 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -1,40 +1,48 @@
package gui.intro;
-import gui.image.*;
-import gui.lecture.*;
-import java.awt.Dimension;
+import gui.image.CreateImageAllgemein_GUI;
+import gui.image.DeleteImage_GUI;
+import gui.image.SearchEditImage_GUI;
+import gui.image.SearchImage_GUI;
+import gui.lecture.CreateLectureAllgemein_GUI;
+import gui.lecture.DeleteLecture_GUI;
+import gui.lecture.EditLectureSearch_GUI;
+import gui.lecture.SearchLecture_GUI;
+
import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.JLabel;
import java.awt.Font;
-import javax.swing.JTextPane;
+import java.awt.ScrollPane;
import java.awt.SystemColor;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-import javax.swing.JSeparator;
-import javax.swing.JRadioButton;
-import javax.swing.SwingConstants;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
import javax.swing.ButtonGroup;
-import javax.swing.JMenuBar;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
import javax.swing.JMenu;
+import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
+import javax.swing.JTextPane;
+import javax.swing.SwingConstants;
import javax.swing.ToolTipManager;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-import java.awt.ScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.ImageIcon;
+
import models.Links;
import models.SessionData;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class MainMenue_GUI extends JFrame {
@@ -74,11 +82,9 @@ public class MainMenue_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite *Prototyp* - Connected Server: "+SessionData.session.getServerAdress());
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
- // setBounds(100, 100, 545, 366);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
index 59f47f4b..cfe046ad 100644
--- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
+++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
@@ -2,41 +2,44 @@ package gui.intro;
import java.awt.Desktop;
-import java.awt.Dimension;
import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.JLabel;
import java.awt.Font;
-import javax.swing.JTextPane;
import java.awt.SystemColor;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-import javax.swing.JSeparator;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
+import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
import javax.swing.JCheckBox;
-import javax.swing.event.ChangeListener;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
import models.Links;
+
import org.ini4j.InvalidFileFormatException;
import org.ini4j.Wini;
+import util.GuiOrganizer;
+
@SuppressWarnings("serial")
public class VmWareLink_GUI extends JFrame {
@@ -65,11 +68,9 @@ public class VmWareLink_GUI extends JFrame {
e.printStackTrace();
}
setTitle("Dozentenmodul *Prototyp*");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 722) / 2;
- int left=(screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
- //setBounds(100, 100, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
index 1ddcc513..bf0a99be 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -2,18 +2,21 @@ package gui.lecture;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
+
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
+import java.awt.ScrollPane;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.util.Calendar;
+import java.util.Date;
+
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -22,24 +25,23 @@ import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JRadioButton;
import javax.swing.JSeparator;
+import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.JTextPane;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
+
import models.Image;
import models.Lecture;
import models.Links;
import models.person;
-import javax.swing.JTextArea;
-import java.awt.ScrollPane;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
+import util.GuiOrganizer;
+
import com.toedter.calendar.JDateChooser;
-import javax.swing.JRadioButton;
@SuppressWarnings("serial")
public class CreateLectureAllgemein_GUI extends JFrame {
@@ -89,11 +91,9 @@ public class CreateLectureAllgemein_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
- // setBounds(100, 100, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index 65006327..54c467c5 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -2,12 +2,11 @@ package gui.lecture;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
+
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -16,12 +15,12 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFrame;
@@ -43,12 +42,16 @@ import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
import javax.swing.table.DefaultTableModel;
+
import models.Lecture;
import models.Links;
import models.person;
+
import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class CreateLectureLink_GUI extends JFrame {
@@ -96,10 +99,8 @@ public class CreateLectureLink_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 603) / 2;
- int left = (screenSize.width - 722) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
final DefaultTableModel model = new DefaultTableModel(titles, 0);
diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
index 2e4d5acf..06c6b6ac 100644
--- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
@@ -2,12 +2,11 @@ package gui.lecture;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
+
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -16,9 +15,9 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -44,11 +43,15 @@ import javax.swing.event.ChangeListener;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
+
import models.Links;
import models.person;
+
import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class DeleteLecture_GUI extends JFrame {
@@ -104,10 +107,8 @@ public class DeleteLecture_GUI extends JFrame {
// Setzt den Fenstertitel
setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung l\u00F6schen");
// Zentriert das Fenster in die Bildmitte
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
final DefaultTableModel model = new DefaultTableModel(titles, 0);
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
index bf745a25..1c92026b 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
@@ -5,17 +5,18 @@ import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
+import java.awt.ScrollPane;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+
+import javax.swing.ButtonGroup;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -23,23 +24,23 @@ import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
+import javax.swing.JRadioButton;
import javax.swing.JSeparator;
+import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.JTextPane;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
+
import models.Image;
import models.Lecture;
import models.Links;
import models.person;
-import javax.swing.JTextArea;
-import java.awt.ScrollPane;
-import java.io.IOException;
+import util.GuiOrganizer;
+
import com.toedter.calendar.JDateChooser;
-import javax.swing.JRadioButton;
-import javax.swing.ButtonGroup;
@SuppressWarnings("serial")
@@ -79,12 +80,10 @@ public class EditLectureAllgemein_GUI extends JFrame {
// TODO Auto-generated catch block
e.printStackTrace();
}
- setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 722) / 2;
- int left=(screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
- //setBounds(100, 100, 603, 722);
+ setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten");;
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index ed99850e..439c5b41 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -2,12 +2,11 @@ package gui.lecture;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
+
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -16,12 +15,12 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFrame;
@@ -43,12 +42,16 @@ import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
import javax.swing.table.DefaultTableModel;
+
import models.Lecture;
import models.Links;
import models.person;
+
import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class EditLectureLink_GUI extends JFrame {
@@ -90,10 +93,9 @@ public class EditLectureLink_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 603) / 2;
- int left = (screenSize.width - 722) / 2;
- setBounds(left, top, 603, 722);
+
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
final DefaultTableModel model = new DefaultTableModel(titles, 0);
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
index 43e70bd2..a6436ebf 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
@@ -2,12 +2,11 @@ package gui.lecture;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
+
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -16,12 +15,12 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Iterator;
import java.util.List;
+
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -47,12 +46,16 @@ import javax.swing.event.ChangeListener;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
+
import models.Lecture;
import models.Links;
import models.person;
+
import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class EditLectureSearch_GUI extends JFrame {
@@ -115,10 +118,8 @@ public class EditLectureSearch_GUI extends JFrame {
// Setzt den Fenstertitel
setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten");
// Zentriert das Fenster in die Bildmitte
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
final DefaultTableModel model = new DefaultTableModel(titles, 0);
diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
index cb90fcf0..d0a18bb7 100644
--- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
@@ -5,13 +5,14 @@ import gui.image.CreateImageAllgemein_GUI;
import gui.image.FTPCreateUploader_GUI;
import gui.intro.About_GUI;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
@@ -28,10 +29,9 @@ import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
+
import models.Links;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.IOException;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class ExtendedSearchForImages_GUI extends JFrame {
@@ -57,10 +57,8 @@ public class ExtendedSearchForImages_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite *Prototyp* - Erweiterte Suche");
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 722) / 2;
- int left=(screenSize.width -603) / 2;
- setBounds(left, top, 603, 722);
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
getContentPane().setLayout(null);
{
diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
index 3fe80d68..841d17df 100644
--- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
@@ -2,12 +2,11 @@ package gui.lecture;
import gui.intro.About_GUI;
import gui.intro.MainMenue_GUI;
+
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.SystemColor;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -16,9 +15,9 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -43,11 +42,15 @@ import javax.swing.event.ChangeListener;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
+
import models.Links;
import models.person;
+
import org.apache.thrift.TException;
+
import server.Server.Client;
import thrift.ThriftConnection;
+import util.GuiOrganizer;
@SuppressWarnings("serial")
public class SearchLecture_GUI extends JFrame {
@@ -109,11 +112,9 @@ public class SearchLecture_GUI extends JFrame {
}
// Setzt den Fenstertitel
setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung suchen");
- // Zentriert das Fenster in die Bildmitte
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top = (screenSize.height - 722) / 2;
- int left = (screenSize.width - 603) / 2;
- setBounds(left, top, 603, 722);
+ // Zentriert das Fenster in die Bildmitte 2;
+ setBounds(0, 0, 603, 722);
+ GuiOrganizer.centerGUI(this);
final DefaultTableModel model = new DefaultTableModel(titles, 0);
diff --git a/Dozentenmodul/src/util/GuiOrganizer.java b/Dozentenmodul/src/util/GuiOrganizer.java
new file mode 100644
index 00000000..f03c3811
--- /dev/null
+++ b/Dozentenmodul/src/util/GuiOrganizer.java
@@ -0,0 +1,26 @@
+package util;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.Window;
+
+public abstract class GuiOrganizer {
+
+
+
+
+ /*receive GUI, set it to center of the screen*/
+ public static void centerGUI(Window gui)
+ {
+ Dimension dm = Toolkit.getDefaultToolkit().getScreenSize();
+ double width = dm.getWidth();
+ double height = dm.getHeight();
+ double xPosition = (width / 2 - gui.getWidth() / 2);
+ double yPosition = (height / 2 - gui.getHeight() / 2);
+ gui.setLocation((int) xPosition, (int) yPosition);
+ }
+
+
+
+
+}