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 dfe1637a68abe0d90ce01601e3663b2ea2747d21..414f01a803a455b0c81fd04c244e77936e16df44 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());