diff options
author | Tobias Spitzer | 2014-05-15 11:39:32 +0200 |
---|---|---|
committer | Tobias Spitzer | 2014-05-15 11:39:32 +0200 |
commit | 7b08cd06526aef4165fe3fc2c46d75e2b198ec65 (patch) | |
tree | 8f9bcbe31e8c9852b5750b8aebd628c83115111f /Dozentenmodul | |
parent | Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module (diff) | |
download | tutor-module-7b08cd06526aef4165fe3fc2c46d75e2b198ec65.tar.gz tutor-module-7b08cd06526aef4165fe3fc2c46d75e2b198ec65.tar.xz tutor-module-7b08cd06526aef4165fe3fc2c46d75e2b198ec65.zip |
Fakultät in Fakultaet geändert
Diffstat (limited to 'Dozentenmodul')
-rw-r--r-- | Dozentenmodul/bin/Models/person.class | bin | 2076 -> 2032 bytes | |||
-rw-r--r-- | Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class | bin | 13362 -> 13362 bytes | |||
-rw-r--r-- | Dozentenmodul/bin/models/person.class | bin | 2076 -> 2032 bytes | |||
-rw-r--r-- | Dozentenmodul/src/Models/person.java | 11 | ||||
-rw-r--r-- | Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java | 2 | ||||
-rw-r--r-- | Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java | 2 | ||||
-rw-r--r-- | Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java | 2 | ||||
-rw-r--r-- | Dozentenmodul/src/models/person.java | 11 |
8 files changed, 13 insertions, 15 deletions
diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class Binary files differindex 89dfc798..cd28d135 100644 --- a/Dozentenmodul/bin/Models/person.class +++ b/Dozentenmodul/bin/Models/person.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Binary files differindex 02cb7abd..e6bf572b 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class Binary files differindex 89dfc798..cd28d135 100644 --- a/Dozentenmodul/bin/models/person.class +++ b/Dozentenmodul/bin/models/person.class 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; |