Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

17 files changed, 122 insertions, 7 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 8d3c2f21..2ed4e9e9 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -769,7 +769,12 @@ 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 8562f51d..6cca928f 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -575,6 +575,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		
 		try 
 		{
+			client.setTokenForSession(SessionData.session.getAuthToken());
 			uuid = client.createRandomUUID(); 
 		} catch (TException e1) {
 			// TODO Auto-generated catch block
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index 00ef5f8a..b80ba12f 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -499,6 +499,13 @@ 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 2c6dbc26..d6f78ebe 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -540,6 +540,12 @@ 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 c2799052..54d7c6a7 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -510,6 +510,12 @@ 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 fee3c53f..1498ffff 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -55,9 +55,11 @@ import javax.swing.table.TableColumnModel;
 import models.Image;
 import models.Links;
 import models.RightsManagement;
+import models.SessionData;
 import models.person;
 
 import org.apache.log4j.Logger;
+import org.apache.thrift.TException;
 
 import server.generated.Person;
 import server.generated.Server.Client;
@@ -562,6 +564,14 @@ 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 a346a1f9..7f14aef0 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -50,6 +50,7 @@ import javax.swing.table.TableColumn;
 import models.Image;
 import models.Links;
 import models.RightsManagement;
+import models.SessionData;
 import models.person;
 
 import org.apache.log4j.Logger;
@@ -554,6 +555,14 @@ 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 64d25b96..115d6083 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -57,6 +57,7 @@ import javax.swing.table.TableRowSorter;
 import models.Image;
 import models.ItemOwner;
 import models.Links;
+import models.SessionData;
 import models.person;
 
 import org.apache.log4j.Logger;
@@ -736,7 +737,12 @@ 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 43b2dac1..19900dba 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -56,6 +56,7 @@ import javax.swing.table.TableRowSorter;
 

 import models.Image;

 import models.Links;

+import models.SessionData;

 import models.person;

 

 import org.apache.log4j.Logger;

@@ -1000,6 +1001,14 @@ 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;

 

 	}

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 99e7aae7..561f826f 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -53,6 +53,7 @@ public class Login_GUI extends JFrame {
 	 * Logger instance for this class.
 	 */
 	private final static Logger LOGGER = Logger.getLogger(Login_GUI.class);
+	String authToken = null;
 	
 	// String constants representing the different login methods
 	private final static String LOGIN_TYPE_BWIDM = "bwidm";
@@ -321,6 +322,7 @@ public class Login_GUI extends JFrame {
 				// User-Info
 				LOGGER.info("Authentifizierung von '" + lblusername.getText() + "' erfolgreich.");
 				user = client.getUserFromToken(result.authToken);
+				authToken = result.authToken;
 
 			} catch (org.openslx.imagemaster.thrift.iface.AuthenticationException e) {
 				setStatus(
@@ -459,6 +461,14 @@ public class Login_GUI extends JFrame {
 		 */
 		//import server.generated.Server.Client;
 		server.generated.Server.Client client_2 = models.Client.clientcon.getClient();
+		try 
+		{
+			client_2.setTokenForSession(authToken);
+		
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 		try {
 			String pk_institution = client_2.setInstitution(person.verantwortlicher.getHochschule());
 			//LOGGER.info("Institution of user is: "+pk_institution);
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index b6419f6a..328dcb86 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -57,6 +57,7 @@ import models.Image;
 import models.Lecture;
 import models.Links;
 import models.RightsManagement;
+import models.SessionData;
 import models.person;
 
 import org.apache.log4j.Logger;
@@ -745,6 +746,12 @@ 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 323e70ad..28c5d00a 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -53,6 +53,7 @@ import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
 import models.Links;
+import models.SessionData;
 import models.person;
 
 import org.apache.log4j.Logger;
@@ -597,7 +598,12 @@ 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 0380b44c..112e535c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -56,6 +56,7 @@ import models.Image;
 import models.Lecture;
 import models.Links;
 import models.RightsManagement;
+import models.SessionData;
 import models.person;
 
 import org.apache.thrift.TException;
@@ -1184,6 +1185,13 @@ 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 a5e46fb2..4aadd013 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -57,6 +57,7 @@ import javax.swing.table.TableRowSorter;
 import models.ItemOwner;
 import models.Lecture;
 import models.Links;
+import models.SessionData;
 import models.person;
 
 import org.apache.thrift.TException;
@@ -643,7 +644,12 @@ 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 80874be8..34ec3792 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -55,9 +55,11 @@ import javax.swing.table.TableRowSorter;
 
 import models.Links;
 import models.RightsManagement;
+import models.SessionData;
 import models.person;
 
 import org.apache.log4j.Logger;
+import org.apache.thrift.TException;
 
 import server.generated.Person;
 import server.generated.Server.Client;
@@ -541,7 +543,12 @@ 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 b90e37b1..c42cb1bc 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -54,6 +54,7 @@ import models.Image;
 import models.Lecture;
 import models.Links;
 import models.RightsManagement;
+import models.SessionData;
 import models.person;
 import server.generated.Person;
 import server.generated.Server.Client;
@@ -561,7 +562,12 @@ 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 89abc73a..8fa8a8e5 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -55,6 +55,7 @@ import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;

 

 import models.Links;

+import models.SessionData;

 import models.person;

 

 import org.apache.thrift.TException;

@@ -612,7 +613,12 @@ 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;

 

 	}