diff options
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java | 10 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java index a7114c6f..9a777b7f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java @@ -119,14 +119,10 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements @Override public void fetchedLectureDetails(LectureRead lectureDetails, ImageDetailsRead imageDetails) { synchronized (me) { - if (image != null) { + lecture = lectureDetails; image = imageDetails; - if (lecture != null) { - lecture = lectureDetails; - fill(); - } - } } + fill(); } @Override public void fetchedLecturePermissions(Map<String, LecturePermissions> permissions) { return; } @@ -139,9 +135,9 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements private void fill() { if (lecture == null || image == null) return; + txtImageName.setText(image.getImageName()); txtTitle.setText(lecture.getLectureName()); txtDescription.setText(lecture.getDescription()); - txtImageName.setText(image.getImageName()); lblOwner.setUser(UserCache.find(lecture.getOwnerId())); lblUpdater.setUser(UserCache.find(lecture.getUpdaterId())); lblCreateTime.setText(FormatHelper.longDate(lecture.getCreateTime())); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java index 06a5cc91..b6f86003 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java @@ -589,12 +589,18 @@ public class ThriftActions { @Override public void fire() { final LectureRead lecture = ThriftActions.getLectureDetails(frame, lectureId); - final ImageDetailsRead image = ThriftActions.getImageDetails(frame, lecture.getImageBaseId()); + ImageDetailsRead image = null; + if (lecture != null) { + image = ThriftActions.getImageDetails(frame, lecture.getImageBaseId()); + } + if (image == null) + return; + final ImageDetailsRead fImage = image; Gui.asyncExec(new Runnable() { @Override public void run() { if (callback != null) { - callback.fetchedLectureDetails(lecture, image); + callback.fetchedLectureDetails(lecture, fImage); } } }); |