summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/models/person.java
diff options
context:
space:
mode:
authorunknown2014-05-25 17:49:07 +0200
committerunknown2014-05-25 17:49:07 +0200
commitb0b65eca6b6600a57d71c5f63f8e5a066e6accd7 (patch)
tree21b55c6f7ff2c60401ede9f369738b2ae2d5f77f /Dozentenmodul/src/models/person.java
parent links + encoding (diff)
parentFreigabe Mechanismus implementiert, nun sollte die notwendige Grundlage für d... (diff)
downloadtutor-module-b0b65eca6b6600a57d71c5f63f8e5a066e6accd7.tar.gz
tutor-module-b0b65eca6b6600a57d71c5f63f8e5a066e6accd7.tar.xz
tutor-module-b0b65eca6b6600a57d71c5f63f8e5a066e6accd7.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts: ffffDozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class Dozentenmodul/bin/gui/image/DeleteImage_GUI.class Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class Dozentenmodul/bin/gui/image/SearchImage_GUI.class Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java Dozentenmodul/src/models/Links.java
Diffstat (limited to 'Dozentenmodul/src/models/person.java')
-rw-r--r--Dozentenmodul/src/models/person.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java
index 67b6b84e..0f14af51 100644
--- a/Dozentenmodul/src/models/person.java
+++ b/Dozentenmodul/src/models/person.java
@@ -3,9 +3,7 @@ package models;
public class person{
-
private String username;
-
private String Name;
private String Vorname;
private String Hochschule;
@@ -13,11 +11,8 @@ public class person{
private String Tel;
private String Fakultaet;
private boolean ischecked;
-
- //public static person verantowrtlicher=new person();
public static person verantwortlicher=new person();
-
public String getUsername() {
return username;
}