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/DeleteImage_GUI.java   | 27 +++++++---------------
 1 file changed, 8 insertions(+), 19 deletions(-)

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

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index b1fde196..44e86aae 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -38,8 +38,8 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
 import javax.swing.JTable;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
 import javax.swing.ListSelectionModel;
@@ -48,8 +48,6 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
@@ -62,12 +60,11 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Image;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
-import util.GuiOrganizer;
 import util.OpenLinks;
-import javax.swing.JTextArea;
 
 @SuppressWarnings("serial")
 public class DeleteImage_GUI extends JFrame {
@@ -132,7 +129,7 @@ public class DeleteImage_GUI extends JFrame {
 			modelMyImages);
 
 
-	RowFilter rf = null;
+	RowFilter<Object, Object> rf = null;
 	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(
 			2);
 
@@ -212,8 +209,6 @@ public class DeleteImage_GUI extends JFrame {
 		setBounds(0, 0, 918, 722);
 		setLocationRelativeTo(formerGUI);
 
-		final DefaultTableModel model = new DefaultTableModel(titles, 0);
-
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -731,14 +726,11 @@ public class DeleteImage_GUI extends JFrame {
 		mntmFaq.addMouseListener(new MouseAdapter() {
 			@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) {
 
@@ -752,14 +744,11 @@ public class DeleteImage_GUI extends JFrame {
 		mntmOtrs.addMouseListener(new MouseAdapter() {
 			@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) {
 
@@ -796,7 +785,7 @@ public class DeleteImage_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
 
-		List<server.generated.Image> images;
+		List<Image> images;
 		try {
 
 			// Hole eine Liste der Images
@@ -811,7 +800,7 @@ public class DeleteImage_GUI extends JFrame {
 						SessionData.session.getAuthToken());
 			}
 
-			Iterator<server.generated.Image> i = images.iterator();
+			Iterator<Image> i = images.iterator();
 
 			System.out.println("Size of image list=" + images.size());
 
-- 
cgit v1.2.3-55-g7522