From 32dff35f3cf3a74f62b64105fd57f7da0e2027dc Mon Sep 17 00:00:00 2001 From: Tobias Spitzer Date: Thu, 15 May 2014 11:17:06 +0200 Subject: Es wird nur noch eine Verbindung zum bwLehrpoolSuite Server geöffnet. --- Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java') diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index fbbc56f3..b0f30cd9 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -66,8 +66,8 @@ public class EditLectureLink_GUI extends JFrame { private JTextField textFieldName; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Launch the application. @@ -89,6 +89,7 @@ public class EditLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + con.closeThriftConnection(); System.exit(0); } }); @@ -417,7 +418,8 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); } - thrift.closeThriftConnection(); + + MainMenue_GUI m = new MainMenue_GUI(); m.setVisible(true); dispose(); -- cgit v1.2.3-55-g7522 From 7b08cd06526aef4165fe3fc2c46d75e2b198ec65 Mon Sep 17 00:00:00 2001 From: Tobias Spitzer Date: Thu, 15 May 2014 11:39:32 +0200 Subject: Fakultät in Fakultaet geändert --- Dozentenmodul/bin/Models/person.class | Bin 2076 -> 2032 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 13362 -> 13362 bytes Dozentenmodul/bin/models/person.class | Bin 2076 -> 2032 bytes Dozentenmodul/src/Models/person.java | 11 +++++------ .../src/gui/image/FTPCreateUploader_GUI.java | 2 +- .../src/gui/lecture/CreateLectureLink_GUI.java | 2 +- .../src/gui/lecture/EditLectureLink_GUI.java | 2 +- Dozentenmodul/src/models/person.java | 11 +++++------ 8 files changed, 13 insertions(+), 15 deletions(-) (limited to 'Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java') diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class index 89dfc798..cd28d135 100644 Binary files a/Dozentenmodul/bin/Models/person.class and b/Dozentenmodul/bin/Models/person.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index 02cb7abd..e6bf572b 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class differ diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class index 89dfc798..cd28d135 100644 Binary files a/Dozentenmodul/bin/models/person.class and b/Dozentenmodul/bin/models/person.class differ diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index 64b84465..fdb5e18a 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -11,13 +11,12 @@ public class person{ private String Hochschule; private String EMail; private String Tel; - private String Fakultät; + private String Fakultaet; private boolean ischecked; //public static person verantowrtlicher=new person(); - public static person ersteller=new person(); public static person verantwortlicher=new person(); @@ -58,11 +57,11 @@ public class person{ public void setTel(String tel) { Tel = tel; } - public String getFakultät() { - return Fakultät; + public String getFakultaet() { + return Fakultaet; } - public void setFakultät(String fakultät) { - Fakultät = fakultät; + public void setFakultaet(String fakultaet) { + Fakultaet = fakultaet; } public boolean isIschecked() { return ischecked; diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 0643728f..3adb426a 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -514,7 +514,7 @@ public class FTPCreateUploader_GUI extends JFrame implements person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät(), + person.verantwortlicher.getFakultaet(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), "temp/" + Image.image.getNewName(),false,Image.image.getFilesize()); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 610df2f3..ac923dca 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -398,7 +398,7 @@ public class CreateLectureLink_GUI extends JFrame { person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät()); + person.verantwortlicher.getFakultaet()); JOptionPane .showMessageDialog( null, diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index b0f30cd9..97fdcdda 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -395,7 +395,7 @@ public class EditLectureLink_GUI extends JFrame { person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät(), + person.verantwortlicher.getFakultaet(), Lecture.lecture.getid()); JOptionPane diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java index 64b84465..fdb5e18a 100644 --- a/Dozentenmodul/src/models/person.java +++ b/Dozentenmodul/src/models/person.java @@ -11,13 +11,12 @@ public class person{ private String Hochschule; private String EMail; private String Tel; - private String Fakultät; + private String Fakultaet; private boolean ischecked; //public static person verantowrtlicher=new person(); - public static person ersteller=new person(); public static person verantwortlicher=new person(); @@ -58,11 +57,11 @@ public class person{ public void setTel(String tel) { Tel = tel; } - public String getFakultät() { - return Fakultät; + public String getFakultaet() { + return Fakultaet; } - public void setFakultät(String fakultät) { - Fakultät = fakultät; + public void setFakultaet(String fakultaet) { + Fakultaet = fakultaet; } public boolean isIschecked() { return ischecked; -- cgit v1.2.3-55-g7522