1 files changed, 8 insertions, 13 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index cb783a59..bd387fab 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -7,7 +7,6 @@ import java.awt.Color;
 import java.awt.Component;

 import java.awt.FlowLayout;

 import java.awt.Font;

-import java.awt.Point;

 import java.awt.SystemColor;

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

@@ -38,6 +37,7 @@ 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;

@@ -59,13 +59,11 @@ import models.SessionData;
 import models.person;

 

 import org.apache.thrift.TException;

+import org.openslx.sat.thrift.iface.Lecture;

+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;

-import javax.swing.ScrollPaneConstants;

 

 @SuppressWarnings("serial")

 public class SearchLecture_GUI extends JFrame {

@@ -112,7 +110,7 @@ public class SearchLecture_GUI extends JFrame {
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(

 			modelMyLectures);

 

-	RowFilter rf = null;

+	RowFilter<Object, Object> rf = null;

 	List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);

 

 	/**

@@ -342,9 +340,6 @@ public class SearchLecture_GUI extends JFrame {
 		tabbedPane.addChangeListener(new ChangeListener() {

 			public void stateChanged(ChangeEvent arg0) {

 				if (tabbedPane.getSelectedIndex() == 0) {

-

-					String username = person.verantwortlicher.getName() + " "

-							+ person.verantwortlicher.getVorname();

 					//rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(username, 5));

 				} else if (tabbedPane.getSelectedIndex() == 1) {

 

@@ -627,7 +622,7 @@ public class SearchLecture_GUI extends JFrame {
 

 	// Initiale Beffuelung eines Table models

 	public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException {

-		List<server.generated.Lecture> lectures;

+		List<Lecture> lectures;

 		try {

 			

 			// Hole eine Liste der erlaubten Images für die diese Person

@@ -639,7 +634,7 @@ public class SearchLecture_GUI extends JFrame {
 				lectures = client.getLectureListPermissionRead(SessionData.session.getAuthToken());

 			}

 			

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

+			Iterator<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;

@@ -673,12 +668,12 @@ public class SearchLecture_GUI extends JFrame {
 	

 	// Initiale Beffuelung eines Table models

 	public DefaultTableModel initTableModelAll(DefaultTableModel model) throws ParseException {

-		List<server.generated.Lecture> lectures;

+		List<Lecture> lectures;

 		try {

 			// Hole eine Liste der erlaubten Images für die diese Person

 			//lectures = client.getLectureList();

 			lectures = client.getLectureList(SessionData.session.getAuthToken());

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

+			Iterator<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;