From 265946d452f1374d2a43c71f1403a4da7712194c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 19 Feb 2015 17:52:27 +0100
Subject: Remove client -> server dependency, move thrift classes to
 master-sync-shared

---
 .../src/main/java/gui/image/SearchImage_GUI.java   | 40 ++++++++--------------
 1 file changed, 15 insertions(+), 25 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java')

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 9aff1648..18f4a1e7 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -59,21 +59,15 @@ import models.Links;
 import models.SessionData;
 import models.person;
 
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
 public class SearchImage_GUI extends JFrame {
 
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger.getLogger(SearchImage_GUI.class);
-	
 	private final JPanel contentPanel = new JPanel();
 	JLabel labelName;
 	JLabel labelUpdate;
@@ -149,16 +143,16 @@ public class SearchImage_GUI extends JFrame {
 	
 	
 	
-	RowFilter orFilter = null;
-	List<RowFilter<Object,Object>> orFilters = new ArrayList<RowFilter<Object,Object>>();
+	RowFilter<Object,Object> orFilter = null;
+	List<RowFilter<Object,Object>> orFilters = new ArrayList<>();
 	
 	//needed for templates, filter for name OR desc AND temp_flag --> (name || desc) && (temp_flag)
-	RowFilter andFilter = null; 
-	List<RowFilter<Object,Object>> andFilters = new ArrayList<RowFilter<Object,Object>>();
+	RowFilter<Object,Object> andFilter = null; 
+	List<RowFilter<Object,Object>> andFilters = new ArrayList<>();
 
 	//the final filter which handles the search in the templates
-	RowFilter templateFilter = null;
-	ArrayList<RowFilter<Object, Object>> finalFilters = new ArrayList<RowFilter<Object, Object>>();
+	RowFilter<Object,Object> templateFilter = null;
+	ArrayList<RowFilter<Object, Object>> finalFilters = new ArrayList<>();
 	
 	
 	
@@ -929,13 +923,11 @@ public class SearchImage_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					 
@@ -950,13 +942,11 @@ public class SearchImage_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					 
@@ -991,7 +981,7 @@ public class SearchImage_GUI extends JFrame {
 
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
-		List<server.generated.Image> images;
+		List<org.openslx.sat.thrift.iface.Image> images;
 		try {
 			
 			// Hole eine Liste der Images
@@ -1002,7 +992,7 @@ public class SearchImage_GUI extends JFrame {
 				images = client.getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 			}
 
-			Iterator<server.generated.Image> i = images.iterator();
+			Iterator<org.openslx.sat.thrift.iface.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;
@@ -1044,12 +1034,12 @@ public class SearchImage_GUI extends JFrame {
 	}
 	
 	public DefaultTableModel initTableModelAll(DefaultTableModel model) {
-		List<server.generated.Image> images;
+		List<org.openslx.sat.thrift.iface.Image> images;
 		try {
 			// Hole eine Liste der Images
 			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 
-			Iterator<server.generated.Image> i = images.iterator();
+			Iterator<org.openslx.sat.thrift.iface.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;
@@ -1094,12 +1084,12 @@ public class SearchImage_GUI extends JFrame {
 	
 	// Initiale Beffuelung eines Table models
 		public DefaultTableModel initTableModelTemplates(DefaultTableModel model) {
-			List<server.generated.Image> images;
+			List<org.openslx.sat.thrift.iface.Image> images;
 			try {
 				// Hole eine Liste der Images
 				images = client.getImageListAllTemplates(SessionData.session.getAuthToken());
 
-				Iterator<server.generated.Image> i = images.iterator();
+				Iterator<org.openslx.sat.thrift.iface.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;
-- 
cgit v1.2.3-55-g7522