summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/lecture
diff options
context:
space:
mode:
authorJonathan Bauer2015-03-02 13:22:44 +0100
committerJonathan Bauer2015-03-02 13:22:44 +0100
commitea9f9848a6e7a68dc90decc2e38bd3e1081ebf8a (patch)
tree1e252164aa23b6b74d30c6185fda06ceddcd6041 /dozentenmodul/src/main/java/gui/lecture
parentpom.xml (diff)
downloadtutor-module-ea9f9848a6e7a68dc90decc2e38bd3e1081ebf8a.tar.gz
tutor-module-ea9f9848a6e7a68dc90decc2e38bd3e1081ebf8a.tar.xz
tutor-module-ea9f9848a6e7a68dc90decc2e38bd3e1081ebf8a.zip
ThriftManager class: use getSatClient() and getMasterClient() to get the singleton instances of the thrift clients to satellite and master servers
DO NOT CREATE NEW THRIFT OBJECTS!!!
Diffstat (limited to 'dozentenmodul/src/main/java/gui/lecture')
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java13
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java40
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java32
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java6
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java71
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java30
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java79
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java18
8 files changed, 75 insertions, 214 deletions
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
index 54a22d9f..1bac4642 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -46,8 +46,8 @@ import models.SessionData;
import models.person;
import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Server.Client;
+import thrift.ThriftManager;
import util.OpenLinks;
import com.toedter.calendar.JDateChooser;
@@ -70,7 +70,6 @@ public class CreateLectureAllgemein_GUI extends JFrame {
Date startDate = new Date();
Date endDate;
Component c = null;
- Client client = models.Client.clientcon.getClient();
private boolean descriptionLengthOK = false; // description may not be
// longer than
// MAX_DESCRIPTION_LENGTH
@@ -94,7 +93,7 @@ public class CreateLectureAllgemein_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();
@@ -512,11 +511,10 @@ public class CreateLectureAllgemein_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) {
e.printStackTrace();
@@ -529,13 +527,10 @@ public class CreateLectureAllgemein_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) {
e.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 14b050a9..837b6683 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -63,9 +63,8 @@ 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 thrift.ThriftConnection;
+import thrift.ThriftManager;
import util.OpenLinks;
@SuppressWarnings("serial")
@@ -100,8 +99,6 @@ public class CreateLectureLink_GUI extends JFrame {
private String uuid = 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();
private static final String HELP_MESSAGE = "<html><div align=\"center\">"
+ "Damit Ihre Veranstaltung geladen werden kann, muss sie mit einem Image verbunden werden.<br />"
@@ -126,7 +123,7 @@ public class CreateLectureLink_GUI extends JFrame {
- RowFilter rf = null;
+ RowFilter<Object, Object> rf = null;
List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
/**
@@ -142,12 +139,11 @@ public class CreateLectureLink_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);
}
@@ -216,8 +212,6 @@ public class CreateLectureLink_GUI extends JFrame {
setBounds(0, 0, 918, 722);
setLocationRelativeTo(formerGUI);
- final DefaultTableModel model = new DefaultTableModel(titles, 0);
-
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
@@ -300,7 +294,7 @@ public class CreateLectureLink_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));
@@ -443,8 +437,6 @@ public class CreateLectureLink_GUI extends JFrame {
"Veranstaltung erzeugen und abschließen");
doLinkButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- String username = person.verantwortlicher.getName()
- + " " + person.verantwortlicher.getVorname();
// check if a row is selected
if (tablemyImages.getSelectedRow() != -1) {
@@ -457,7 +449,7 @@ public class CreateLectureLink_GUI extends JFrame {
"yyyy-MM-dd HH:mm:ss");
//create new lecture
- client.writeLecturedata(
+ ThriftManager.getSatClient().writeLecturedata(
Lecture.lecture.getName(),
Lecture.lecture.getShortDesc(),
Lecture.lecture.getDesc(),
@@ -474,7 +466,7 @@ public class CreateLectureLink_GUI extends JFrame {
System.out.println("lectureID" + " " + uuid);
//set rights for this user
- client.writeLectureRights(
+ ThriftManager.getSatClient().writeLectureRights(
uuid,
person.verantwortlicher.getRole(),
SessionData.session.getAuthToken(),
@@ -485,7 +477,7 @@ public class CreateLectureLink_GUI extends JFrame {
//set rights for additional users
for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){
//System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+(i+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
- client.writeAdditionalLectureRights(
+ ThriftManager.getSatClient().writeAdditionalLectureRights(
uuid,
RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(),
@@ -682,14 +674,11 @@ public class CreateLectureLink_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) {
@@ -703,14 +692,11 @@ public class CreateLectureLink_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) {
@@ -743,7 +729,7 @@ public class CreateLectureLink_GUI extends JFrame {
try
{
- uuid = client.createRandomUUID(SessionData.session.getAuthToken());
+ uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.session.getAuthToken());
}
catch (TException e1)
{
@@ -763,9 +749,9 @@ public class CreateLectureLink_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 {
- images = client.getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+ images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
}
Iterator<Image> i = images.iterator();
@@ -819,7 +805,7 @@ public class CreateLectureLink_GUI extends JFrame {
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"))));
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 438e817f..0dd68697 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -59,9 +59,8 @@ import models.person;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.openslx.sat.thrift.iface.Lecture;
-import org.openslx.sat.thrift.iface.Server.Client;
-import thrift.ThriftConnection;
+import thrift.ThriftManager;
import util.OpenLinks;
@SuppressWarnings("serial")
@@ -90,9 +89,6 @@ public class DeleteLecture_GUI extends JFrame {
"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
"Verantwortlicher", "Image", "Schlagwort", "ID" };
- ThriftConnection con = new ThriftConnection();
- Client client = models.Client.clientcon.getClient();
-
final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){
public boolean isCellEditable(int rowIndex, int mColIndex) {
return false;
@@ -106,7 +102,6 @@ public class DeleteLecture_GUI extends JFrame {
modelMyLectures);
private JButton button;
- private JTextField textField;
Component c = null;
private static final String HELP_MESSAGE = "<html><div align=\"center\">"
@@ -115,7 +110,7 @@ public class DeleteLecture_GUI extends JFrame {
+ "Veraltet bedeutet, dass Veranstaltungen, die drei Monate lang nicht augerufen wurden, vorerst deaktiviert werden."
+ "</div></html>";
- RowFilter rf = null;
+ RowFilter<Object, Object> rf = null;
List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
/**
@@ -132,12 +127,11 @@ public class DeleteLecture_GUI extends JFrame {
public void windowClosing(WindowEvent arg0) {
// Beendet die Anwendung nach klick auf X
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);
}
@@ -376,8 +370,6 @@ public class DeleteLecture_GUI extends JFrame {
String lectureID = "";
int eingabe;
- String username = person.verantwortlicher.getName() + " "
- + person.verantwortlicher.getVorname();
// check if a row is selected
if (tablemyLectures.getSelectedRowCount() != 0) {
// a row is selected
@@ -401,7 +393,7 @@ public class DeleteLecture_GUI extends JFrame {
// LOGGER.info("Lösche Veranstaltung: " + lectureID);
try {
- if (client.deleteLecture(
+ if (ThriftManager.getSatClient().deleteLecture(
lectureID,
SessionData.session.getAuthToken(),
person.verantwortlicher.getHochschule()
@@ -568,14 +560,11 @@ public class DeleteLecture_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) {
@@ -589,14 +578,11 @@ public class DeleteLecture_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) {
@@ -641,12 +627,12 @@ public class DeleteLecture_GUI extends JFrame {
if(person.verantwortlicher.getRole()=="Admin")
{
//get complete list
- lectures = client.getLectureList(SessionData.session.getAuthToken());
+ lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());
}
else
{
//get permitted list
- lectures = client.getLectureListPermissionAdmin(SessionData.session.getAuthToken());
+ lectures = ThriftManager.getSatClient().getLectureListPermissionAdmin(SessionData.session.getAuthToken());
}
Iterator<Lecture> i = lectures.iterator();
@@ -704,7 +690,7 @@ public class DeleteLecture_GUI extends JFrame {
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.getLectureData(id,SessionData.session.getAuthToken());
+ Map<String, String> res = ThriftManager.getSatClient().getLectureData(id,SessionData.session.getAuthToken());
labelName.setText(res.get("name"));
labelAktiv.setText(res.get("isActive"));
labeldesc.setText(res.get("desc"));
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index 88a79fb6..597a3539 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -556,11 +556,10 @@ public class EditLectureAllgemein_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) {
e.printStackTrace();
@@ -573,11 +572,10 @@ public class EditLectureAllgemein_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) {
e.printStackTrace();
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"))));
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index a3119b79..3f2da363 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -61,9 +61,8 @@ import models.SessionData;
import models.person;
import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Server.Client;
-import thrift.ThriftConnection;
+import thrift.ThriftManager;
import util.OpenLinks;
@SuppressWarnings("serial")
@@ -89,8 +88,6 @@ public class EditLectureSearch_GUI extends JFrame {
String[] titles = { "Veranstaltungsname", "Beschreibung",
"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
"Verantwortlicher", "Image", "Schlagwort", "ID" };
- ThriftConnection con = new ThriftConnection();
- Client client = models.Client.clientcon.getClient();
private static final String HELP_MESSAGE = "<html><div align=\"center\">"
+ "Suchen Sie hier Ihre Veranstaltungen und wählen Sie sie für weitere Schritte aus.<br />"
+ "Klicken Sie anschließend auf \"Weiter\", um die Details der Veranstaltung sowie die Berechtigungen zu ändern."
@@ -105,7 +102,7 @@ public class EditLectureSearch_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);
@@ -123,12 +120,11 @@ public class EditLectureSearch_GUI extends JFrame {
public void windowClosing(WindowEvent arg0) {
// Beendet die Anwendung nach klick auf X
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);
}
@@ -392,8 +388,6 @@ public class EditLectureSearch_GUI extends JFrame {
JButton btnContinue = new JButton("Weiter");
btnContinue.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- String username = person.verantwortlicher.getName()
- + " " + person.verantwortlicher.getVorname();
// check if a row is selected
if (tablemyLectures.getSelectedRow() != -1) {
@@ -598,14 +592,11 @@ public class EditLectureSearch_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) {
@@ -619,14 +610,11 @@ public class EditLectureSearch_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) {
@@ -670,10 +658,10 @@ public class EditLectureSearch_GUI extends JFrame {
// Hole eine Liste der erlaubten Images für die diese Person
if(person.verantwortlicher.getRole()=="Admin"){
//get complete list
- lectures = client.getLectureList(SessionData.session.getAuthToken());
+ lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());
} else {
//get permitted list
- lectures = client.getLectureListPermissionWrite(SessionData.session.getAuthToken());
+ lectures = ThriftManager.getSatClient().getLectureListPermissionWrite(SessionData.session.getAuthToken());
}
Iterator<org.openslx.sat.thrift.iface.Lecture> i = lectures.iterator();
@@ -732,7 +720,7 @@ public class EditLectureSearch_GUI extends JFrame {
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.getLectureData(id,SessionData.session.getAuthToken());
+ Map<String, String> res = ThriftManager.getSatClient().getLectureData(id,SessionData.session.getAuthToken());
labelName.setText(res.get("name"));
labelAktiv.setText(res.get("isActive"));
labeldesc.setText(res.get("desc"));
@@ -750,7 +738,7 @@ public class EditLectureSearch_GUI extends JFrame {
try {
// get values from server and set them in model
- map = client.getItemOwner(lectureid,SessionData.session.getAuthToken());
+ map = ThriftManager.getSatClient().getItemOwner(lectureid,SessionData.session.getAuthToken());
ItemOwner.itemOwner.setUserID(map.get("userID"));
ItemOwner.itemOwner.setUsername(map.get("loginName"));
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index ab53c43d..5eb40b0b 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -42,7 +42,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.Lecture;
@@ -53,8 +52,8 @@ import models.person;
import org.apache.thrift.TException;
import org.openslx.sat.thrift.iface.Person;
-import org.openslx.sat.thrift.iface.Server.Client;
+import thrift.ThriftManager;
import util.CheckIntegrity;
import util.ListAllOtherUsers_GUI;
import util.OpenLinks;
@@ -62,7 +61,6 @@ import util.OpenLinks;
@SuppressWarnings("serial")
public class PermissionEditLecture_GUI extends JFrame {
- Client client = models.Client.clientcon.getClient();
private final JPanel contentPanel = new JPanel();
String[] result;
private JTable table;
@@ -102,7 +100,7 @@ public class PermissionEditLecture_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();
@@ -229,7 +227,7 @@ public class PermissionEditLecture_GUI extends JFrame {
//System.out.println("Loading data from db");
try {
- map = client.getPermissionForUserAndLecture(
+ map = ThriftManager.getSatClient().getPermissionForUserAndLecture(
SessionData.session.getAuthToken(),Lecture.lecture.getid(),person.verantwortlicher.getUserID()
);
Iterator<Person> i = map.iterator();
@@ -268,9 +266,7 @@ public class PermissionEditLecture_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
person temp = i.next();
@@ -286,7 +282,6 @@ public class PermissionEditLecture_GUI extends JFrame {
// + temp.isLecture_admin() + ", " + temp.getUserID());
// Fuege diese Objekte der Tabelle hinzu
model.addRow(obj);
- x++;
}
}// end set list of permitted users
@@ -294,7 +289,6 @@ public class PermissionEditLecture_GUI extends JFrame {
// Boolean(false),new Boolean(false),new Boolean(false)};
// model.addRow(rowdata);
- TableCellRenderer rend = table.getTableHeader().getDefaultRenderer();
TableColumn tc1 = table.getColumnModel().getColumn(1);
tc1.setCellEditor(table.getDefaultEditor(Boolean.class));
@@ -503,14 +497,11 @@ public class PermissionEditLecture_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) {
@@ -524,14 +515,11 @@ public class PermissionEditLecture_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) {
@@ -593,8 +581,6 @@ public class PermissionEditLecture_GUI extends JFrame {
// save the entered rights into the model and prepare them to be written to
// the database
private void saveTableToList() {
- //System.out.println("Saving Table to List");
-
List<person> list = new ArrayList<person>();
int seperatorIndex = 0;
@@ -608,22 +594,6 @@ public class PermissionEditLecture_GUI extends JFrame {
seperatorIndex = table.getModel().getValueAt(i, 0).toString()
.indexOf(",");
- //LOGGER.info(table.getModel().getValueAt(i, 4).toString()
- // + " (userID)\t"
- // + Boolean.parseBoolean(table.getModel().getValueAt(i, 3)
- // .toString())
- // + "(admin)\t"
- // + Boolean.parseBoolean(table.getModel().getValueAt(i, 2)
- // .toString())
- // + "(write)\t"
- // + Boolean.parseBoolean(table.getModel().getValueAt(i, 1)
- // .toString())
- // + "(read)\t"
- // + table.getModel().getValueAt(i, 0).toString()
- // .substring(0, seperatorIndex)
- // + "(Nachname)\t"
- // + table.getModel().getValueAt(i, 0).toString()
- // .substring(seperatorIndex + 2) + "(Vorname)");
temp.setUserID(table.getModel().getValueAt(i, 4).toString()); // get
// userID
@@ -651,10 +621,6 @@ public class PermissionEditLecture_GUI extends JFrame {
}
}
- //for (int y = 0; y < list.size(); y++) {
- // System.out.println("" + list.get(y).getName());
- //}
-
RightsManagement.rightsManagement.setPermittedUserList(list);
}// end saveTableToList()
@@ -712,38 +678,3 @@ public class PermissionEditLecture_GUI extends JFrame {
}
}
}
-/*
- * class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
- * MouseListener { protected CheckBoxHeader rendererComponent; protected int
- * column; protected boolean mousePressed = false;
- *
- * public CheckBoxHeader(ItemListener itemListener ,String text) {
- * rendererComponent = this; rendererComponent.addItemListener(itemListener);
- * rendererComponent.setText(text); }
- *
- * public Component getTableCellRendererComponent( JTable table, Object value,
- * boolean isSelected, boolean hasFocus, int row, int column) { if (table !=
- * null) { JTableHeader header = table.getTableHeader(); if (header != null) {
- * rendererComponent.setForeground(header.getForeground());
- * rendererComponent.setBackground(header.getBackground());
- * rendererComponent.setFont(header.getFont());
- * rendererComponent.setBorder(header.getBorder());
- * header.addMouseListener(rendererComponent); } } setColumn(column);
- * //rendererComponent.setText("Check All");
- * //setBorder(UIManager.getBorder("TableHeader.cellBorder"));
- *
- * return rendererComponent; } protected void setColumn(int column) {
- * this.column = column; } public int getColumn() { return column; } protected
- * void handleClickEvent(MouseEvent e) { if (mousePressed) { mousePressed=false;
- * JTableHeader header = (JTableHeader)(e.getSource()); JTable tableView =
- * header.getTable(); TableColumnModel columnModel = tableView.getColumnModel();
- * int viewColumn = columnModel.getColumnIndexAtX(e.getX()); int column =
- * tableView.convertColumnIndexToModel(viewColumn);
- *
- * if (viewColumn == this.column && e.getClickCount() == 1 && column != -1) {
- * doClick(); } } } public void mouseClicked(MouseEvent e) {
- * handleClickEvent(e); ((JTableHeader)e.getSource()).repaint(); } public void
- * mousePressed(MouseEvent e) { mousePressed = true; } public void
- * mouseReleased(MouseEvent e) { } public void mouseEntered(MouseEvent e) { }
- * public void mouseExited(MouseEvent e) { } }
- */
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index bd387fab..fbb24849 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -60,9 +60,8 @@ import models.person;
import org.apache.thrift.TException;
import org.openslx.sat.thrift.iface.Lecture;
-import org.openslx.sat.thrift.iface.Server.Client;
-import thrift.ThriftConnection;
+import thrift.ThriftManager;
import util.OpenLinks;
@SuppressWarnings("serial")
@@ -89,8 +88,6 @@ public class SearchLecture_GUI extends JFrame {
String[] titles = { "Veranstaltungsname", "Beschreibung",
"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
"Verantwortlicher", "Image", "Schlagwort", "ID" };
- ThriftConnection con = new ThriftConnection();
- Client client = models.Client.clientcon.getClient();
final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
public boolean isCellEditable(int rowIndex, int mColIndex) {
@@ -127,9 +124,8 @@ public class SearchLecture_GUI extends JFrame {
@Override
public void windowClosing(WindowEvent arg0) {
// Beendet die Anwendung nach klick auf X
- con.closeThriftConnection();
try {
- client.setSessionInvalid(SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
} catch (TException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -628,10 +624,10 @@ public class SearchLecture_GUI extends JFrame {
// Hole eine Liste der erlaubten Images für die diese Person
if(person.verantwortlicher.getRole()=="Admin"){
//get complete list
- lectures = client.getLectureList(SessionData.session.getAuthToken());
+ lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());
} else {
//get permitted list
- lectures = client.getLectureListPermissionRead(SessionData.session.getAuthToken());
+ lectures = ThriftManager.getSatClient().getLectureListPermissionRead(SessionData.session.getAuthToken());
}
Iterator<Lecture> i = lectures.iterator();
@@ -671,8 +667,8 @@ public class SearchLecture_GUI extends JFrame {
List<Lecture> lectures;
try {
// Hole eine Liste der erlaubten Images für die diese Person
- //lectures = client.getLectureList();
- lectures = client.getLectureList(SessionData.session.getAuthToken());
+ //lectures = ThriftManager.getSatClient().getLectureList();
+ lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());
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");
@@ -725,7 +721,7 @@ public class SearchLecture_GUI extends JFrame {
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.getLectureData(id,SessionData.session.getAuthToken());
+ Map<String,String> res=ThriftManager.getSatClient().getLectureData(id,SessionData.session.getAuthToken());
labelName.setText(res.get("name"));
labelAktiv.setText(res.get("isActive"));
labeldesc.setText(res.get("desc"));
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 16:52:35 +0100