summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/GUI
diff options
context:
space:
mode:
Diffstat (limited to 'Dozentenmodul/src/GUI')
-rw-r--r--Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java4
-rw-r--r--Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java1
-rw-r--r--Dozentenmodul/src/GUI/FTPDownloader_GUI.java44
-rw-r--r--Dozentenmodul/src/GUI/Login_GUI.java7
-rw-r--r--Dozentenmodul/src/GUI/MainMenue_GUI.java2
5 files changed, 30 insertions, 28 deletions
diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
index 34009fc7..1d30e9d0 100644
--- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
@@ -67,6 +67,7 @@ public class EditImageAllgemein_GUI extends JFrame {
@Override
public void windowClosing(WindowEvent arg0) {
//Beendet die Anwendung bei einem Klick auf das X
+ con.closeThriftConnection();
System.exit(0);
}
});
@@ -216,6 +217,7 @@ public class EditImageAllgemein_GUI extends JFrame {
@Override
public void mouseClicked(MouseEvent arg0) {
//Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar
+ con.closeThriftConnection();
EditImageAllgemein_GUI.this.setVisible(false);
MainMenue_GUI main=new MainMenue_GUI();
main.setVisible(true);
@@ -254,7 +256,7 @@ public class EditImageAllgemein_GUI extends JFrame {
//Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar
//Image.image.setImagename(imagename.getText());
-
+ con.closeThriftConnection();
MainMenue_GUI sr=new MainMenue_GUI();
sr.setVisible(true);
dispose();
diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
index e6d78898..3c6109ae 100644
--- a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
@@ -65,6 +65,7 @@ public class EditImageTechnisch_GUI extends JFrame {
@Override
public void windowClosing(WindowEvent arg0) {
//Beendet die Anwendung bei Klick auf das X
+
System.exit(0);
}
diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
index b36f0818..cb53fc3d 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
@@ -31,6 +31,8 @@ import java.awt.Font;
import javax.swing.JTextPane;
import javax.swing.JSeparator;
+import models.Image;
+
import org.apache.thrift.TException;
import server.Server.Client;
@@ -51,7 +53,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
int port = 21;
String username = "openslx";
String password = "openslx-ng";
- String downloadPath = "";
+ String downloadFile = "";
static String arg = "";
DownloadTask task;
JLabel bytesreadlbl;
@@ -64,7 +66,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
boolean taskrun = false;
ThriftConnection thrift = new ThriftConnection();
Client client = thrift.getThriftConnection();
- JButton continueButton = new JButton("Fertigstellen");
+ JButton buttonback = new JButton("Zur\u00FCck");
/**
* Launch the application.
@@ -86,6 +88,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
if (taskrun == true) {
try {
client.DeleteFtpUser(user.userName);
+ thrift.closeThriftConnection();
} catch (TException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
@@ -108,7 +111,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
e.printStackTrace();
}
- // filename=name;
+
setBackground(Color.WHITE);
setTitle("Dozentenmodul *Prototyp*");
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
@@ -263,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane, BorderLayout.SOUTH);
{
- continueButton.setEnabled(false);
- continueButton.addActionListener(new ActionListener() {
+ buttonback.setEnabled(false);
+ buttonback.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (taskrun == true) {
task.cancel(true);
@@ -275,24 +278,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
e1.printStackTrace();
}
}
+ thrift.closeThriftConnection();
+ SearchEditImage_GUI se=new SearchEditImage_GUI();
+ se.setVisible(true);
dispose();
}
});
-
- JButton cancelButton = new JButton("Zur\u00FCck");
- cancelButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
-
- dispose();
- MainMenue_GUI m = new MainMenue_GUI();
- m.setVisible(true);
-
- }
- });
- cancelButton.setActionCommand("Cancel");
- buttonPane.add(cancelButton);
- continueButton.setActionCommand("Cancel");
- buttonPane.add(continueButton);
+ buttonback.setActionCommand("Cancel");
+ buttonPane.add(buttonback);
}
}
setVisible(true);
@@ -305,14 +298,16 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
try {
user = client.getFtpUser();
- // downloadPath=client.getPathOfImage(filename);
+
+ downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion());
+
} catch (TException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
+
task = new DownloadTask(host, port, user.userName, user.password,
- user.path, lblNewLabel.getText(), this);
+ downloadFile, lblNewLabel.getText(), this);
task.addPropertyChangeListener(this);
task.execute();
taskrun = true;
@@ -326,9 +321,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
progress = (Integer) arg0.getNewValue();
progressBar.setValue(progress);
if (progress == 100) {
- continueButton.setEnabled(true);
+ buttonback.setEnabled(true);
}
}
+
if ("speed" == arg0.getPropertyName()) {
speed = (double) arg0.getNewValue();
// if(speed<=1){
diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java
index 8ad73e20..172895d6 100644
--- a/Dozentenmodul/src/GUI/Login_GUI.java
+++ b/Dozentenmodul/src/GUI/Login_GUI.java
@@ -23,6 +23,8 @@ import javax.swing.JTextField;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
+
+import models.SessionData;
import models.person;
import org.apache.thrift.TException;
//import org.apache.thrift.protocol.TBinaryProtocol;
@@ -185,7 +187,7 @@ public class Login_GUI extends JFrame {
String passText = new String(pass.getPassword());
System.out.println(username.getText() + " " + passText);
result = client.authenticate(username.getText(), passText);
-
+
} catch (thrift.AuthenticationException e) {
System.out.println("Authentifizierung fehlgeschlagen: " + e.message);
JOptionPane.showMessageDialog(null,
@@ -227,11 +229,12 @@ public class Login_GUI extends JFrame {
setVisible(false);
} else {
UserInfo user = client.getUserFromToken(token);
-
+
String hochschule = user.eMail.substring(user.eMail
.indexOf("@") + 1, user.eMail.indexOf(".",
user.eMail.indexOf("@")));
// System.out.println("hochschule="+hochschule);
+
person.verantwortlicher.setUsername(username.getText());
person.verantwortlicher.setName(user.lastName);
person.verantwortlicher.setVorname(user.firstName);
diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java
index 621f6561..e68e4bbd 100644
--- a/Dozentenmodul/src/GUI/MainMenue_GUI.java
+++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java
@@ -355,7 +355,7 @@ public class MainMenue_GUI extends JFrame {
+ "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image <br>"
+ "\"Programmieren\".</html>");
lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class
- .getResource("/gui/Image_zu_Veranstaltung_gr\u00FCn.png")));
+ .getResource("/Image_zu_Veranstaltung_gr\u00FCn.png")));
// ToolTipp lange anzeigen - 60sec
ToolTipManager.sharedInstance().setDismissDelay(60000);
ToolTipManager.sharedInstance().registerComponent(lblGrafik);
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-06-23 21:36:58 +0200