From d66d3e7b6a8c5ac100d46968ecc7a851f5a9d4a8 Mon Sep 17 00:00:00 2001
From: David Hoksza <david.hoksza@uni.lu>
Date: Fri, 16 Mar 2018 09:34:03 +0100
Subject: [PATCH] fix not working annotations when one of the annotations has a
parameter selected
---
.../annotation/services/ModelAnnotator.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/services/ModelAnnotator.java b/annotation/src/main/java/lcsb/mapviewer/annotation/services/ModelAnnotator.java
index dfe1637a68..414f01a803 100644
--- a/annotation/src/main/java/lcsb/mapviewer/annotation/services/ModelAnnotator.java
+++ b/annotation/src/main/java/lcsb/mapviewer/annotation/services/ModelAnnotator.java
@@ -225,7 +225,7 @@ public class ModelAnnotator {
* @param progressUpdater
* callback function used for updating progress of the function
*/
- public void performAnnotations(Model model, final IProgressUpdater progressUpdater) {
+ public void performAnnotations(Model model, final IProgressUpdater progressUpdater) {
performAnnotations(model, progressUpdater, null, null);
}
@@ -241,7 +241,7 @@ public class ModelAnnotator {
* callback function used for updating progress of the function
*/
public void performAnnotations(Model model, final IProgressUpdater progressUpdater,
- Map<Class<?>, List<ElementAnnotator>> annotators, Map<Class<?>, List<UserAnnotatorsParam>> annotatorsParams) {
+ Map<Class<?>, List<ElementAnnotator>> annotators, Map<Class<?>, List<UserAnnotatorsParam>> annotatorsParams) {
progressUpdater.setProgress(0);
List<Model> models = new ArrayList<Model>();
models.add(model);
@@ -338,7 +338,8 @@ public class ModelAnnotator {
* callback function used to refresh progress of function execution
*/
protected void annotateModel(Model model, IProgressUpdater progressUpdater,
- Map<Class<?>, List<ElementAnnotator>> annotators, Map<Class<?>, List<UserAnnotatorsParam>> annotatorsParams) {
+ Map<Class<?>, List<ElementAnnotator>> annotators, Map<Class<?>, List<UserAnnotatorsParam>> annotatorsParams) {
+
ElementUtils elementUtils = new ElementUtils();
progressUpdater.setProgress(0);
@@ -355,18 +356,19 @@ public class ModelAnnotator {
if (list == null) {
list = getDefaultAnnotators();
}
-
- for (ElementAnnotator elementAnnotator : list) {
+
+ for (ElementAnnotator elementAnnotator : list) {
try {
if (annotatorsParams != null) {
List<UserAnnotatorsParam> params = annotatorsParams.get(elementAnnotator.getClass());
if (params != null) {
elementAnnotator.annotateElement(element, params);
+ } else {
+ elementAnnotator.annotateElement(element);
}
} else {
elementAnnotator.annotateElement(element);
}
-
} catch (AnnotatorException e) {
logger.warn(elementUtils.getElementTag(element) + " " + elementAnnotator.getCommonName()
+ " annotation problem: " + e.getMessage());
--
GitLab