From ee218fdd6c71737b33306709eaa2334a4da470f0 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 11 Sep 2019 09:08:14 +0200
Subject: [PATCH] OO-4243: don't calculate size of no size available
---
.../ui/editor/interactions/HotspotEditorController.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotEditorController.java
index b8fdfd28381..c58fb62716f 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotEditorController.java
@@ -97,10 +97,11 @@ public class HotspotEditorController extends FormBasicController {
private RichTextElement textEl;
private FileElement backgroundEl;
private SingleSelection resizeEl;
+ private FormLink newRectButton;
+ private FormLink newCircleButton;
private SingleSelection cardinalityEl;
private FormLayoutContainer hotspotsCont;
private MultipleSelectionElement responsiveEl;
- private FormLink newCircleButton, newRectButton;
private MultipleSelectionElement correctHotspotsEl;
private SingleSelection layoutEl;
private MultipleSelectionElement shadowEl;
@@ -303,7 +304,7 @@ public class HotspotEditorController extends FormBasicController {
correctHotspotsEl.clearError();
if(!restrictedEdit && !readOnly) {
- if(correctHotspotsEl.getSelectedKeys().size() == 0) {
+ if(correctHotspotsEl.getSelectedKeys().isEmpty()) {
correctHotspotsEl.setErrorKey("error.need.correct.answer", null);
allOk &= false;
}
@@ -345,7 +346,7 @@ public class HotspotEditorController extends FormBasicController {
createHotspotChoice(Shape.RECT, "50,50,100,100");
updateHotspots(ureq);
} else if(backgroundEl == source) {
- //upload in itemDirectory;
+ // upload in item directory;
if(FileElementEvent.DELETE.equals(event.getCommand())) {
if(backgroundEl.getUploadFile() != null && backgroundEl.getUploadFile() != backgroundEl.getInitialFile()) {
backgroundEl.reset();
@@ -570,6 +571,8 @@ public class HotspotEditorController extends FormBasicController {
}
private void optimizeResizeEl(Size size, boolean selectSize) {
+ if(size == null) return;
+
List<String> keys = new ArrayList<>();
List<String> values = new ArrayList<>();
--
GitLab