diff options
| author | Tobias Spitzer | 2014-05-23 07:45:15 +0200 |
|---|---|---|
| committer | Tobias Spitzer | 2014-05-23 07:45:15 +0200 |
| commit | 6719008d289cd08a0effbf931842b7213cbdffe1 (patch) | |
| tree | 13298b7ec6dcc76a9b379070e8f79b18c7d2307e /Dozentenmodul/src/models | |
| parent | d (diff) | |
| parent | Ausgabe Serverseitgi wieviele Threads laufen sollen (diff) | |
| download | tutor-module-6719008d289cd08a0effbf931842b7213cbdffe1.tar.gz tutor-module-6719008d289cd08a0effbf931842b7213cbdffe1.tar.xz tutor-module-6719008d289cd08a0effbf931842b7213cbdffe1.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Diffstat (limited to 'Dozentenmodul/src/models')
| -rw-r--r-- | Dozentenmodul/src/models/Client.java | 1 | ||||
| -rw-r--r-- | Dozentenmodul/src/models/Image.java | 3 | ||||
| -rw-r--r-- | Dozentenmodul/src/models/Lecture.java | 3 | ||||
| -rw-r--r-- | Dozentenmodul/src/models/person.java | 5 | ||||
| -rw-r--r-- | Dozentenmodul/src/models/user.java | 1 |
5 files changed, 2 insertions, 11 deletions
diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java index 6dc587f1..42eccdec 100644 --- a/Dozentenmodul/src/models/Client.java +++ b/Dozentenmodul/src/models/Client.java @@ -3,7 +3,6 @@ package models; public class Client { private server.Server.Client client; - public static Client clientcon=new Client(); public server.Server.Client getClient() { diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java index 0b3c936e..e08ed5a2 100644 --- a/Dozentenmodul/src/models/Image.java +++ b/Dozentenmodul/src/models/Image.java @@ -1,9 +1,9 @@ package models; public class Image { + private String ImageId; private String version; - private String imagename; private String newName; private String imagepath; @@ -12,7 +12,6 @@ public class Image { private int ram; private int cpu; private long filesize; - public static Image image =new Image(); diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java index 6b7e6fa1..eae05ec5 100644 --- a/Dozentenmodul/src/models/Lecture.java +++ b/Dozentenmodul/src/models/Lecture.java @@ -4,7 +4,6 @@ import java.util.Date; public class Lecture { - private String name; private String newName; private String shortDesc; @@ -14,8 +13,6 @@ public class Lecture { private boolean active; private String id; private String linkedImagename; - - public static Lecture lecture =new Lecture(); 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; } diff --git a/Dozentenmodul/src/models/user.java b/Dozentenmodul/src/models/user.java index be64937f..9aa958a4 100644 --- a/Dozentenmodul/src/models/user.java +++ b/Dozentenmodul/src/models/user.java @@ -4,6 +4,7 @@ public class user { private String userName; private String Password; + public String getUserName() { return userName; } |