From a70cf355017dadb844e5a28c9bad36a9bdbde9e3 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Fri, 15 Apr 2016 12:11:20 +0000
Subject: [PATCH] bugfix sfit bug 7182: labels have additional image
---
.../tooling/base/ui/editpart/PositionedEditPartBase.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
index 497b9275b..0852bfc0d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
@@ -73,7 +73,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: CD1071857B9255A7644C2F83F6366AE1
+ * @ConQAT.Rating YELLOW Hash: B7BB6E68977D1BA5C377B722B2D560CE
*/
public abstract class PositionedEditPartBase<T extends ILayoutedModelElement> extends
GraphicalEditPartBase<T> implements NodeEditPart {
@@ -189,8 +189,10 @@ public abstract class PositionedEditPartBase<T extends ILayoutedModelElement> ex
if(labelFigure != null && labelFigure.getParent() != null) {
labelFigure.setText(determineLabelFigureText());
- labelFigure.setIcon(IModelElementHandlerService.INSTANCE.getModelElementHandler(
- getModel()).getIcon(getModel()));
+ if(labelFigure.getIcon() != null) {
+ labelFigure.setIcon(IModelElementHandlerService.INSTANCE.getModelElementHandler(
+ getModel()).getIcon(getModel()));
+ }
Rectangle labelBounds = determineLabelFigureBounds();
labelFigure.setBounds(labelBounds);
labelFigure.getParent().setConstraint(labelFigure, labelBounds);
--
GitLab