From ff431267b6539bf85e90b470cd07d21924c74d5a Mon Sep 17 00:00:00 2001 From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de> Date: Tue, 9 Apr 2013 16:23:11 +0000 Subject: [PATCH] individual label for AdaptationOperation git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11110 9e42b895-fcda-4063-8a3b-11be15eb1bbd --- .../AdaptationActionOperationItemProvider.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/edu.kit.ipd.descartes.mm.adaptation.edit/src/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProvider.java b/edu.kit.ipd.descartes.mm.adaptation.edit/src/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProvider.java index b59a6480..b436bf74 100644 --- a/edu.kit.ipd.descartes.mm.adaptation.edit/src/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProvider.java +++ b/edu.kit.ipd.descartes.mm.adaptation.edit/src/edu/kit/ipd/descartes/mm/adaptation/provider/AdaptationActionOperationItemProvider.java @@ -5,6 +5,7 @@ package edu.kit.ipd.descartes.mm.adaptation.provider; import edu.kit.ipd.descartes.mm.adaptation.AdaptationActionOperation; +import edu.kit.ipd.descartes.mm.adaptation.AdaptationDirection; import edu.kit.ipd.descartes.mm.adaptation.AdaptationPackage; import edu.kit.ipd.descartes.mm.adaptation.AdaptationScope; @@ -127,12 +128,19 @@ public class AdaptationActionOperationItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ @Override public String getText(Object object) { - AdaptationScope labelValue = ((AdaptationActionOperation)object).getAdaptationOperationScope(); - String label = labelValue == null ? null : labelValue.toString(); + AdaptationScope scopeLabelValue = ((AdaptationActionOperation)object).getAdaptationOperationScope(); + AdaptationDirection directionLabelValue = ((AdaptationActionOperation)object).getAdaptationOperationDirection(); + + String label; + if (scopeLabelValue == null || directionLabelValue == null) + label = null; + else + label = directionLabelValue.toString() + ", " + scopeLabelValue.toString(); + return label == null || label.length() == 0 ? getString("_UI_AdaptationActionOperation_type") : getString("_UI_AdaptationActionOperation_type") + " " + label; -- GitLab