Fix server.thrift file (make future-proof by using field ids), move generated thrift classes to own package

18 files changed, 41 insertions, 41 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index b862b2ce..ecf5b9df 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -40,7 +40,7 @@ import javax.swing.border.TitledBorder;
 
 import models.Image;
 import models.Links;
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 36b4f214..6e5309cb 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -59,7 +59,7 @@ import models.person;
 
 import org.apache.thrift.TException;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
@@ -1101,12 +1101,12 @@ public class DeleteImage_GUI extends JFrame {
 
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
-		List<server.Image> images;
+		List<server.generated.Image> images;
 		try {
 			// Hole eine Liste der Images
 			images = client.getImageList();
 
-			Iterator<server.Image> i = images.iterator();
+			Iterator<server.generated.Image> i = images.iterator();
 
 			int x = 0;
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index 21b27239..e4f6e0cf 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -40,7 +40,7 @@ import models.person;
 
 import org.apache.thrift.TException;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 437b8e8f..986b96d7 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -38,7 +38,7 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 8a7fda3f..9b026a59 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -47,7 +47,7 @@ import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
@@ -67,7 +67,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	JProgressBar progressBar;
 	String host = SessionData.session.getServerAdress();
 	int port = 21;
-	server.User user;
+	server.generated.User user;
 	String filename = "";
 	File uploadFile;
 	static String arg = "";
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index 8cc485b8..eb864d91 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -44,8 +44,8 @@ import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
 
-import server.Server.Client;
-import server.User;
+import server.generated.Server.Client;
+import server.generated.User;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index bbfcbd19..6d84f247 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -47,7 +47,7 @@ import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
@@ -67,7 +67,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JProgressBar progressBar;
 	String host = SessionData.session.getServerAdress();
 	int port = 21;
-	server.User user;
+	server.generated.User user;
 	String filename = "";
 	File uploadFile;
 	static String arg = "";
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index d2e5d39b..db80bc35 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -43,8 +43,8 @@ import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
 
-import server.Server.Client;
-import server.User;
+import server.generated.Server.Client;
+import server.generated.User;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 1d886c99..b3b466d6 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -59,7 +59,7 @@ import models.person;
 
 import org.apache.thrift.TException;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 //import models.person;
@@ -978,12 +978,12 @@ public class SearchEditImage_GUI extends JFrame {
 
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
-		List<server.Image> images;
+		List<server.generated.Image> images;
 		try {
 			// Hole eine Liste der Images
 			images = client.getImageList();
 
-			Iterator<server.Image> i = images.iterator();
+			Iterator<server.generated.Image> i = images.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 94f8857e..fedf27df 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -61,7 +61,7 @@ import models.person;
 

 import org.apache.thrift.TException;

 

-import server.Server.Client;

+import server.generated.Server.Client;

 import thrift.ThriftConnection;

 import util.GuiOrganizer;

 import util.OpenLinks;

@@ -887,12 +887,12 @@ public class SearchImage_GUI extends JFrame {
 

 	// Initiale Beffuelung eines Table models

 	public DefaultTableModel initTableModel(DefaultTableModel model) {

-		List<server.Image> images;

+		List<server.generated.Image> images;

 		try {

 			// Hole eine Liste der Images

 			images = client.getImageList();

 

-			Iterator<server.Image> i = images.iterator();

+			Iterator<server.generated.Image> i = images.iterator();

 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

 			int x = 0;

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index e46c4136..4465ec3a 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -254,7 +254,7 @@ public class Login_GUI extends JFrame {
 		setStatus(Color.black, "Hole Verbindungsdaten von Server...", null);
 		// set connection to bwLehrpoolSuiteServer
 		ThriftConnection bwthrift = new ThriftConnection();
-		server.Server.Client bwClient = bwthrift.getThriftConnection();
+		server.generated.Server.Client bwClient = bwthrift.getThriftConnection();
 		models.Client.clientcon.setClient(bwClient);
 
 		// User-Info
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 9eaca57b..13360e3a 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -56,7 +56,7 @@ import models.person;
 
 import org.apache.thrift.TException;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
@@ -942,12 +942,12 @@ public class CreateLectureLink_GUI extends JFrame {
 
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) throws TException, ParseException {
-		List<server.Image> images;
+		List<server.generated.Image> images;
 		
 			// Hole eine Liste der Images
 			images = client.getImageList();
 
-			Iterator<server.Image> i = images.iterator();
+			Iterator<server.generated.Image> i = images.iterator();
 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
 			int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 3c526681..dd6f6048 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -58,7 +58,7 @@ import models.person;
 
 import org.apache.thrift.TException;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
@@ -668,11 +668,11 @@ public class DeleteLecture_GUI extends JFrame {
 
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException {
-		List<server.Lecture> lectures;
+		List<server.generated.Lecture> lectures;
 		try {
 			// Hole eine Liste der Images
 			lectures = client.getLectureList();
-			Iterator<server.Lecture> i = lectures.iterator();
+			Iterator<server.generated.Lecture> i = lectures.iterator();
 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 9b727c35..35ee0af6 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -57,7 +57,7 @@ import models.person;
 
 import org.apache.thrift.TException;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
@@ -947,12 +947,12 @@ public class EditLectureLink_GUI extends JFrame {
 
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) throws TException, ParseException {
-		List<server.Image> images;
+		List<server.generated.Image> images;
 		
 			// Hole eine Liste der Images
 			images = client.getImageList();
 
-			Iterator<server.Image> i = images.iterator();
+			Iterator<server.generated.Image> i = images.iterator();
 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
 			int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index ae8f3bb7..da8ed944 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -60,7 +60,7 @@ import models.person;
 
 import org.apache.thrift.TException;
 
-import server.Server.Client;
+import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
@@ -767,11 +767,11 @@ public class EditLectureSearch_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model)
 			throws ParseException {
-		List<server.Lecture> lectures;
+		List<server.generated.Lecture> lectures;
 		try {
 			// Hole eine Liste der Images
 			lectures = client.getLectureList();
-			Iterator<server.Lecture> i = lectures.iterator();
+			Iterator<server.generated.Lecture> i = lectures.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index c34caec0..6c74cfe5 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -56,7 +56,7 @@ import models.person;
 

 import org.apache.thrift.TException;

 

-import server.Server.Client;

+import server.generated.Server.Client;

 import thrift.ThriftConnection;

 import util.GuiOrganizer;

 import util.OpenLinks;

@@ -575,11 +575,11 @@ public class SearchLecture_GUI extends JFrame {
 

 	// Initiale Beffuelung eines Table models

 	public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException {

-		List<server.Lecture> lectures;

+		List<server.generated.Lecture> lectures;

 		try {

 			// Hole eine Liste der Images

 			lectures = client.getLectureList();

-			Iterator<server.Lecture> i = lectures.iterator();

+			Iterator<server.generated.Lecture> i = lectures.iterator();

 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

 			int x = 0;

diff --git a/dozentenmodul/src/main/java/models/Client.java b/dozentenmodul/src/main/java/models/Client.java
index 42eccdec..e249127a 100644
--- a/dozentenmodul/src/main/java/models/Client.java
+++ b/dozentenmodul/src/main/java/models/Client.java
@@ -2,14 +2,14 @@ package models;
 
 public class Client {
 
-	private server.Server.Client client;
+	private server.generated.Server.Client client;
 	public static Client clientcon=new Client();
 
-	public server.Server.Client getClient() {
+	public server.generated.Server.Client getClient() {
 		return client;
 	}
 
-	public void setClient(server.Server.Client client) {
+	public void setClient(server.generated.Server.Client client) {
 		this.client = client;
 	}
 	
diff --git a/dozentenmodul/src/main/java/thrift/ThriftConnection.java b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
index 98b15604..a6fe6d53 100644
--- a/dozentenmodul/src/main/java/thrift/ThriftConnection.java
+++ b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
@@ -10,8 +10,8 @@ import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 
-import server.Server;
-import server.Server.Client;
+import server.generated.Server;
+import server.generated.Server.Client;
 
 public class ThriftConnection {