• changed position where the token is written new to the server handler

9 files changed, 67 insertions, 61 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 2ed4e9e9..1fafb46b 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -166,6 +166,7 @@ public class DeleteImage_GUI extends JFrame {
 			e1.printStackTrace();
 		}
 		
+		
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
 
@@ -769,12 +770,7 @@ public class DeleteImage_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/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 6cca928f..579ff3c2 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -118,6 +118,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	public FTPCreateUploader_GUI(Component formerGUI) {
 
 		final Object[] options = { "Beenden", "Abbrechen" };
+		
+		try 
+		{
+			client.setTokenForSession(SessionData.session.getAuthToken());
+			uuid = client.createRandomUUID(); 
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		addWindowListener(new WindowAdapter() {
 
@@ -573,15 +582,6 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		});
 		menuBar.add(mnNewMenu_Info);
 		
-		try 
-		{
-			client.setTokenForSession(SessionData.session.getAuthToken());
-			uuid = client.createRandomUUID(); 
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
 		c = this;
 	}
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index b80ba12f..c435cf45 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -107,6 +107,13 @@ public class FTPEditDownloader_GUI extends JFrame implements
 	 * Create the frame.
 	 */
 	public FTPEditDownloader_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -498,13 +505,6 @@ public class FTPEditDownloader_GUI extends JFrame implements
 			}
 		});
 		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/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index d6f78ebe..c534c228 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -112,6 +112,13 @@ public class FTPEditUploader_GUI extends JFrame implements
 	 * Create the frame.
 	 */
 	public FTPEditUploader_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -540,12 +547,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 		});
 		menuBar.add(mnNewMenu_Info);
 
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 		setVisible(true);
 
 	}
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index 54d7c6a7..bce6e3f5 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -104,6 +104,13 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 	 * Create the frame.
 	 */
 	public FTPSearchDownloader_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -510,12 +517,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 		setVisible(true);
 
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 1498ffff..4a2596ed 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -120,6 +120,15 @@ public class PermissionCreateImage_GUI extends JFrame {
 	private JButton btnDeleteUser;
 
 	public PermissionCreateImage_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) {
@@ -565,13 +574,6 @@ public class PermissionCreateImage_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;		
 		
 		this.setLocationRelativeTo(formerGUI);
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 7f14aef0..a794f404 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -108,6 +108,15 @@ public class PermissionEditImage_GUI extends JFrame {
 			+ "</div></html>";
 
 	public PermissionEditImage_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) {
@@ -556,13 +565,6 @@ public class PermissionEditImage_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/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 115d6083..d0a0780d 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -147,6 +147,13 @@ public class SearchEditImage_GUI extends JFrame {
 	 */
 	public SearchEditImage_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);
@@ -737,12 +744,7 @@ public class SearchEditImage_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/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 19900dba..dd66bf38 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -169,6 +169,14 @@ public class SearchImage_GUI extends JFrame {
 		

 

 		

+		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) {

@@ -1002,13 +1010,6 @@ public class SearchImage_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;

 

 	}