summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java38
1 files changed, 17 insertions, 21 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index a8c2424c..231fd82f 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -47,10 +47,9 @@ import models.person;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Server.Client;
import org.openslx.sat.thrift.iface.User;
-import thrift.ThriftConnection;
+import thrift.ThriftManager;
import util.OpenLinks;
import config.Config;
import ftp.UploadTask;
@@ -91,8 +90,6 @@ public class FTPEditUploader_GUI extends JFrame implements
boolean fileupload = false;
boolean taskrun = false;
int progress = 0;
- ThriftConnection con = new ThriftConnection();
- Client client = models.Client.clientcon.getClient();
JButton btnUploadStarten = new JButton("Upload auf Server starten");
JButton btnSpeicherortAuswhlen = new JButton("Image auswählen");
JButton btnFinish = new JButton("Fertigstellen");
@@ -135,20 +132,19 @@ public class FTPEditUploader_GUI extends JFrame implements
// 0=beenden, 1=abbrechen
if (choice == 0) {
try {
- client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
} catch (TException e1) {
e1.printStackTrace();
}
task.cancel(true);
try {
- client.setSessionInvalid(SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
} catch (TException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- con.closeThriftConnection();
try {
- client.setSessionInvalid(SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
} catch (TException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -158,7 +154,7 @@ public class FTPEditUploader_GUI extends JFrame implements
} else {
// no upload running, close window
try {
- client.setSessionInvalid(SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
} catch (TException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -375,7 +371,7 @@ public class FTPEditUploader_GUI extends JFrame implements
isAborted = true; // set flag
try {
- client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
LOGGER.info("FTP user deleted.");
} catch (TException e1) {
e1.printStackTrace();
@@ -449,7 +445,7 @@ public class FTPEditUploader_GUI extends JFrame implements
if (taskrun == true) {
try {
- client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
} catch (TException e1) {
e1.printStackTrace();
@@ -479,7 +475,7 @@ public class FTPEditUploader_GUI extends JFrame implements
// 0=beenden, 1=abbrechen
if (choice == 0) {
try {
- client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
} catch (TException e1) {
e1.printStackTrace();
}
@@ -488,7 +484,7 @@ public class FTPEditUploader_GUI extends JFrame implements
try {
- if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){
+ if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){
//user is admin and may change permissions
PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c);
@@ -519,7 +515,7 @@ public class FTPEditUploader_GUI extends JFrame implements
try {
System.out.println("userID in editimageuploader is : "+person.verantwortlicher.getUserID());
- if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true)
+ if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true)
{
//user is admin and may change permissions
PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c);
@@ -624,7 +620,7 @@ public class FTPEditUploader_GUI extends JFrame implements
try {
//LOGGER.info("Getting FTP-User...");
- user = client.getFtpUser(SessionData.session.getAuthToken());
+ user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken());
LOGGER.info("Received FTP user.");
//LOGGER.debug("FTP name: " + user.userName);
//LOGGER.debug("FTP path: " + user.path);
@@ -727,7 +723,7 @@ public class FTPEditUploader_GUI extends JFrame implements
LOGGER.debug("New file uploaded and new filename is set");
//LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath());
- client.updateImageData(
+ ThriftManager.getSatClient().updateImageData(
Image.image.getImagename(),
Image.image.getImagename(),
Image.image.getDesc(),
@@ -746,14 +742,14 @@ public class FTPEditUploader_GUI extends JFrame implements
SessionData.session.getAuthToken()
);
if (fileupload == true) {
- client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
}
} else { //no new file uploaded and old file name stays
//LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath());
LOGGER.debug("old file should remain");
- client.updateImageData(
+ ThriftManager.getSatClient().updateImageData(
Image.image.getImagename(),
Image.image.getImagename(),
Image.image.getDesc(),
@@ -773,7 +769,7 @@ public class FTPEditUploader_GUI extends JFrame implements
);
if (fileupload == true) {
- client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
+ ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
// client.startFileCopy(Image.image.getImagename());
}
}
@@ -781,7 +777,7 @@ public class FTPEditUploader_GUI extends JFrame implements
// remove all additional user permissions on first stage
- client.deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.session.getAuthToken(),person.verantwortlicher.getUserID());
+ ThriftManager.getSatClient().deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.session.getAuthToken(),person.verantwortlicher.getUserID());
// then, add user permissions as they have been set new
for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++)
@@ -795,7 +791,7 @@ public class FTPEditUploader_GUI extends JFrame implements
+ RightsManagement.rightsManagement.getPermittedUserList().size());
*/
- client.writeAdditionalImageRights(Image.image.getImageId(),
+ ThriftManager.getSatClient().writeAdditionalImageRights(Image.image.getImageId(),
RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(),
RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(),
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 19:30:58 +0100