10 files changed, 20 insertions, 20 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;