summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java71
1 files changed, 26 insertions, 45 deletions
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 9ae612f6..3e78751c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -62,9 +62,8 @@ import models.person;
import org.apache.thrift.TException;
import org.openslx.sat.thrift.iface.Image;
-import org.openslx.sat.thrift.iface.Server.Client;
-import thrift.ThriftConnection;
+import thrift.ThriftManager;
import util.OpenLinks;
@SuppressWarnings("serial")
@@ -98,8 +97,7 @@ public class EditLectureLink_GUI extends JFrame {
Component c = null;
String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
"Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" };
- ThriftConnection con = new ThriftConnection();
- Client client = models.Client.clientcon.getClient();
+
final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
public boolean isCellEditable(int rowIndex, int mColIndex) {
return false;
@@ -122,18 +120,17 @@ public class EditLectureLink_GUI extends JFrame {
modelMyImages);
final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
modelPublicVorlagen);
- private JTextField textField;
- RowFilter orFilter = null;
+ RowFilter<Object, Object> orFilter = null;
List<RowFilter<Object,Object>> orFilters = new ArrayList<RowFilter<Object,Object>>();
//needed for templates, filter for name OR desc AND temp_flag --> (name || desc) && (temp_flag)
- RowFilter andFilter = null;
+ RowFilter<Object, Object> andFilter = null;
List<RowFilter<Object,Object>> andFilters = new ArrayList<RowFilter<Object,Object>>();
//the final filter which handles the search in the templates
- RowFilter templateFilter = null;
+ RowFilter<Object, Object> templateFilter = null;
ArrayList<RowFilter<Object, Object>> finalFilters = new ArrayList<RowFilter<Object, Object>>();
@@ -152,12 +149,11 @@ public class EditLectureLink_GUI extends JFrame {
@Override
public void windowClosing(WindowEvent arg0) {
try {
- client.setSessionInvalid(SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
} catch (TException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- con.closeThriftConnection();
System.exit(0);
}
@@ -412,7 +408,7 @@ public class EditLectureLink_GUI extends JFrame {
comboBox = new JComboBox<String>();
try {
- List<String> list = client.getAllOS(SessionData.session.getAuthToken());
+ List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken());
comboBox.addItem("");
for (int i = 0; i < list.size(); i++) {
comboBox.addItem(list.get(i));
@@ -627,7 +623,7 @@ public class EditLectureLink_GUI extends JFrame {
//check which GUI to open
try {
- if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin"))){
+ if(ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin"))){
//user is admin of the lecture
PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
@@ -662,15 +658,12 @@ public class EditLectureLink_GUI extends JFrame {
if (tablemyImages.getSelectedRow() != -1) {
// a row is selected, do operations
- String imagename = tablemyImages.getValueAt(
- tablemyImages.getSelectedRow(), 0)
- .toString();
try {
DateFormat formatter = new SimpleDateFormat(
"yyyy-MM-dd HH:mm:ss");
// update the lecture
- client.updateLecturedata(
+ ThriftManager.getSatClient().updateLecturedata(
Lecture.lecture.getid(),
Lecture.lecture.getNewName(),
Lecture.lecture.getShortDesc(),
@@ -698,7 +691,7 @@ public class EditLectureLink_GUI extends JFrame {
// remove all additional user permissions on
// first stage
- client.deleteAllAdditionalLecturePermissions(
+ ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions(
Lecture.lecture.getid(),
SessionData.session.getAuthToken(),
person.verantwortlicher.getUserID());
@@ -724,7 +717,7 @@ public class EditLectureLink_GUI extends JFrame {
);
*/
- client.writeAdditionalLectureRights(
+ ThriftManager.getSatClient().writeAdditionalLectureRights(
Lecture.lecture.getid(),
RightsManagement.rightsManagement
.getPermittedUserList()
@@ -777,13 +770,10 @@ public class EditLectureLink_GUI extends JFrame {
.toString().equals(username)) {
// a row is selected, do operations
- String imagename = tablePublicVorlagen.getValueAt(
- tablePublicVorlagen.getSelectedRow(), 0)
- .toString();
try {
DateFormat formatter = new SimpleDateFormat(
"yyyy-MM-dd HH:mm:ss");
- client.updateLecturedata(
+ ThriftManager.getSatClient().updateLecturedata(
Lecture.lecture.getName(),
Lecture.lecture.getNewName(),
Lecture.lecture.getShortDesc(),
@@ -815,7 +805,7 @@ public class EditLectureLink_GUI extends JFrame {
// remove all additional user permissions on
// first stage
- client.deleteAllAdditionalLecturePermissions(
+ ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions(
Lecture.lecture.getid(),
SessionData.session.getAuthToken(),
person.verantwortlicher.getUserID());
@@ -835,7 +825,7 @@ public class EditLectureLink_GUI extends JFrame {
+ RightsManagement.rightsManagement
.getPermittedUserList()
.size());
- client.writeAdditionalLectureRights(
+ ThriftManager.getSatClient().writeAdditionalLectureRights(
Lecture.lecture.getName(),
RightsManagement.rightsManagement
.getPermittedUserList()
@@ -886,13 +876,10 @@ public class EditLectureLink_GUI extends JFrame {
4).toString().equals(username)) {
// a row is selected, do operations
- String imagename = tableAllImages.getValueAt(
- tableAllImages.getSelectedRow(), 0)
- .toString();
try {
DateFormat formatter = new SimpleDateFormat(
"yyyy-MM-dd HH:mm:ss");
- client.updateLecturedata(
+ ThriftManager.getSatClient().updateLecturedata(
Lecture.lecture.getName(),
Lecture.lecture.getNewName(),
Lecture.lecture.getShortDesc(),
@@ -922,7 +909,7 @@ public class EditLectureLink_GUI extends JFrame {
// remove all additional user permissions on
// first stage
- client.deleteAllAdditionalLecturePermissions(
+ ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions(
Lecture.lecture.getid(),
SessionData.session.getAuthToken(),
person.verantwortlicher.getUserID());
@@ -942,7 +929,7 @@ public class EditLectureLink_GUI extends JFrame {
+ RightsManagement.rightsManagement
.getPermittedUserList()
.size());
- client.writeAdditionalLectureRights(
+ ThriftManager.getSatClient().writeAdditionalLectureRights(
Lecture.lecture.getName(),
RightsManagement.rightsManagement
.getPermittedUserList()
@@ -1145,14 +1132,11 @@ public class EditLectureLink_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) {
@@ -1166,14 +1150,11 @@ public class EditLectureLink_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) {
@@ -1216,10 +1197,10 @@ public class EditLectureLink_GUI extends JFrame {
// Hole eine Liste der Images
if(person.verantwortlicher.getRole()=="Admin"){
//get complete list
- images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+ images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
} else {
//get permitted list
- images = client.getImageListPermissionLink(person.verantwortlicher
+ images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher
.getUserID(),SessionData.session.getAuthToken());
}
@@ -1259,10 +1240,10 @@ public class EditLectureLink_GUI extends JFrame {
// Hole eine Liste der Images
if(person.verantwortlicher.getRole()=="Admin"){
//get complete list
- images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+ images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
} else {
//get permitted list
- images = client.getImageListPermissionLink(person.verantwortlicher
+ images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher
.getUserID(),SessionData.session.getAuthToken());
}
@@ -1301,8 +1282,8 @@ public class EditLectureLink_GUI extends JFrame {
List<Image> images;
// Hole eine Liste der Images
- //images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
- images = client.getImageListAllTemplates(SessionData.session.getAuthToken());
+ //images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID());
+ images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.session.getAuthToken());
Iterator<Image> i = images.iterator();
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1356,7 +1337,7 @@ public class EditLectureLink_GUI extends JFrame {
try {
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
- Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken());
+ Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,SessionData.session.getAuthToken());
labelName.setText(res.get("name"));
labelOS.setText(res.get("os"));
labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 16:31:16 +0100