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

---
 .../java/gui/image/PermissionEditImage_GUI.java    | 29 ++++++----------------
 1 file changed, 8 insertions(+), 21 deletions(-)

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

diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 6853f6d7..053d279a 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -43,7 +43,6 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
 import models.Image;
@@ -52,11 +51,10 @@ import models.RightsManagement;
 import models.SessionData;
 import models.person;
 
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Person;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Person;
-import server.generated.Server.Client;
 import util.CheckIntegrity;
 import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
@@ -64,13 +62,10 @@ import util.OpenLinks;
 @SuppressWarnings("serial")
 public class PermissionEditImage_GUI extends JFrame {
 	
-	private final static Logger LOGGER = Logger
-			.getLogger(PermissionCreateImage_GUI.class);
 	Client client = models.Client.clientcon.getClient();
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTable table;
-	private Class[] classes;
 	Object[] titles = { "Name", "Lesen", "Schreiben", "Link", "Admin", "userID" };
 	private List<Person> map = null; // List of people who have rights
 	Component c = null;
@@ -85,7 +80,7 @@ public class PermissionEditImage_GUI extends JFrame {
 			return false;
 		}
 
-		public Class getColumnClass(int c) {
+		public Class<?> getColumnClass(int c) {
 			switch (c) {
 			case 0:
 				return String.class;
@@ -203,7 +198,7 @@ public class PermissionEditImage_GUI extends JFrame {
 			try {
 								
 				map = client.getPermissionForUserAndImage(SessionData.session.getAuthToken(),Image.image.getImageId(),person.verantwortlicher.getUserID());
-				Iterator<server.generated.Person> i = map.iterator();
+				Iterator<Person> i = map.iterator();
 
 				int x = 0;
 				
@@ -244,7 +239,6 @@ public class PermissionEditImage_GUI extends JFrame {
 					.getPermittedUserList();
 			Iterator<person> i = listt.iterator();
 
-			int x = 0;
 			while (i.hasNext()) {
 				// System.out.println("current pos=" + x);
 				// erzeuge Objekte fuer die Tabelle
@@ -264,7 +258,6 @@ public class PermissionEditImage_GUI extends JFrame {
 				
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
-				x++;
 			}
 		}// end set list of permitted users
 
@@ -274,8 +267,6 @@ public class PermissionEditImage_GUI extends JFrame {
 		 * model.addRow(rowdata);
 		 */
 
-		TableCellRenderer rend = table.getTableHeader().getDefaultRenderer();
-
 		TableColumn tc1 = table.getColumnModel().getColumn(1);
 		tc1.setCellEditor(table.getDefaultEditor(Boolean.class));
 		tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));
@@ -320,9 +311,9 @@ public class PermissionEditImage_GUI extends JFrame {
 		label_7.setBounds(10, 30, 250, 20);
 		panel_2.add(label_7);
 
-		final JComboBox comboBox_1 = new JComboBox();
+		final JComboBox<String> comboBox_1 = new JComboBox<>();
 		comboBox_1
-				.setModel(new DefaultComboBoxModel(new String[] {
+				.setModel(new DefaultComboBoxModel<String>(new String[] {
 						"Lokal (Eigene Hochschule)",
 						"Öffentlich (Alle Hochschulen)" }));
 		comboBox_1.setSelectedIndex(Image.image.getShareMode());
@@ -506,13 +497,11 @@ public class PermissionEditImage_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) {
 					// TODO Auto-generated catch block
@@ -527,13 +516,11 @@ public class PermissionEditImage_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) {
 					// TODO Auto-generated catch block
-- 
cgit v1.2.3-55-g7522