diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java index 63e80788650c90b8d44fcd28b8770766c51aea9f..50d6c5356c5de869b6e624015152e93f3b492ca0 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java @@ -21,6 +21,7 @@ import java.util.List; import org.conqat.lib.commons.string.StringUtils; import org.eclipse.emf.ecore.EObject; +import org.eclipse.swt.graphics.Image; import org.fortiss.tooling.kernel.ToolingKernelActivator; import org.fortiss.tooling.kernel.service.base.EObjectAwareServiceBase; import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler; @@ -35,7 +36,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating GREEN Hash: 074E65AEBD71DD87A0C35D0D401F924E + * @ConQAT.Rating YELLOW Hash: A72B12E44F543112D26677A5004A9F06 */ public class ModelElementHandlerService extends EObjectAwareServiceBase<IModelElementHandler<EObject>> implements @@ -89,11 +90,40 @@ public class ModelElementHandlerService extends return HANDLER_CLASS_ATTRIBUTE_NAME; } + /** {@inheritDoc} */ + @Override + public String getName(EObject modelElement) { + IModelElementHandler<EObject> handler = getModelElementHandler(modelElement); + if (handler != null) { + handler.getName(modelElement); + } + return null; + } + + /** {@inheritDoc} */ + @Override + public String getDescription(EObject modelElement) { + IModelElementHandler<EObject> handler = getModelElementHandler(modelElement); + if (handler != null) { + handler.getDescription(modelElement); + } + return null; + } + + /** {@inheritDoc} */ + @Override + public Image getIcon(EObject modelElement) { + IModelElementHandler<EObject> handler = getModelElementHandler(modelElement); + if (handler != null) { + handler.getIcon(); + } + return null; + } + /** {@inheritDoc} */ @Override public String getWrappedNameDescription(EObject modelElement) { - IModelElementHandler<EObject> handler = IModelElementHandlerService.INSTANCE - .getModelElementHandler(modelElement); + IModelElementHandler<EObject> handler = getModelElementHandler(modelElement); if (handler == null) { return ""; } diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelElementHandlerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelElementHandlerService.java index 186ee7839015e1124d8b25deddf6198aad0b21fe..d65a6ba3b138b134f6d6a7df0147018b452251e8 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelElementHandlerService.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelElementHandlerService.java @@ -18,6 +18,7 @@ $Id$ package org.fortiss.tooling.kernel.ui.service; import org.eclipse.emf.ecore.EObject; +import org.eclipse.swt.graphics.Image; import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler; import org.fortiss.tooling.kernel.ui.internal.ModelElementHandlerService; @@ -30,7 +31,7 @@ import org.fortiss.tooling.kernel.ui.internal.ModelElementHandlerService; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating GREEN Hash: 4642A80BDD0135BFB39EC67906136123 + * @ConQAT.Rating YELLOW Hash: D5272CE0B76DB84B31CC7586A7837E53 */ public interface IModelElementHandlerService { @@ -46,6 +47,24 @@ public interface IModelElementHandlerService { */ IModelElementHandler<EObject> getModelElementHandler(EObject modelElement); + /** + * Returns the name of the model element (or <code>null</code> if no handler + * was found). + */ + String getName(EObject modelElement); + + /** + * Returns a description of the model element (or <code>null</code> if no + * handler was found). + */ + String getDescription(EObject modelElement); + + /** + * Returns the icon of the model element (or <code>null</code> if no handler + * was found). + */ + Image getIcon(EObject modelElement); + /** * Returns a wrapped string built from the name and description returned by * the underlying handler.