7 files changed, 58 insertions, 43 deletions
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 328dcb86..941cabc5 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -137,6 +137,13 @@ public class CreateLectureLink_GUI extends JFrame {
 	 */
 	public CreateLectureLink_GUI(Component formerGUI) {
 		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
 		
@@ -746,12 +753,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		}
 
 		c = this;
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 	}
 
 	// Initiale Beffuelung eines Table models
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 28c5d00a..9b2df220 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -114,6 +114,13 @@ public class DeleteLecture_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public DeleteLecture_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -598,12 +605,7 @@ public class DeleteLecture_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 
 	}
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 112e535c..8f9c160b 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -149,6 +149,14 @@ public class EditLectureLink_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public EditLectureLink_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -1184,13 +1192,6 @@ public class EditLectureLink_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 		
 		c = this;
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 4aadd013..dbe3bc49 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -113,6 +113,13 @@ public class EditLectureSearch_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public EditLectureSearch_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -644,12 +651,7 @@ public class EditLectureSearch_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 
 	}
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 34ec3792..c57b13e3 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -122,6 +122,14 @@ public class PermissionCreateLecture_GUI extends JFrame {
 	// private JTable tablePermittedUsers;
 
 	public PermissionCreateLecture_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -543,12 +551,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 
 	}// end constructor
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index c42cb1bc..0278942c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -105,6 +105,14 @@ public class PermissionEditLecture_GUI extends JFrame {
 	};
 
 	public PermissionEditLecture_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -562,12 +570,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 
 	}// end constructor
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 8fa8a8e5..ff8d6d04 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -120,6 +120,13 @@ public class SearchLecture_GUI extends JFrame {
 	 */
 	public SearchLecture_GUI(Component formerGUI) {
 		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
 		
@@ -613,12 +620,7 @@ public class SearchLecture_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmAbout);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 
 	}