diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/interfaces/IModelElementHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/interfaces/IModelElementHandler.java index db3f78a628ec32048284216f8672caea6d37037d..296376a72e76789eace9cdc8b448edd0a5432cb4 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/interfaces/IModelElementHandler.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/interfaces/IModelElementHandler.java @@ -48,18 +48,35 @@ public interface IModelElementHandler<T extends EObject> extends /** Returns image descriptor to be used as icon image. */ public ImageDescriptor getIconImageDescriptor(); - /** Returns all children acting as nodes. */ + /** + * Returns all children acting as nodes, which are usually displayed as edit + * parts by graphical editors and entries in the navigator tree. + */ List<EObject> getSubnodes(T element); - /** Returns all children acting as connectors. */ + /** + * Returns all children acting as connectors, which are usually display as + * edit parts in graphical editors, but NOT as entries in the navigator + * tree. + */ List<EObject> getConnectors(T element); - /** Returns all connections entering this element. */ + /** + * Returns all connections entering this element, which are usually + * displayed as edit parts in graphical editors. + */ List<EObject> getIncomingConnections(T element); - /** Returns all connections leaving this element. */ + /** + * Returns all connections leaving this element, which are usually displayed + * as edit parts in graphical editors. + */ List<EObject> getOutgoingConnections(T element); - /** Returns all children acting as a (visible) specification. */ + /** + * Returns all children acting as a (visible) specification, which are + * displayed as child entries in the navigator tree, but not as edit parts + * in graphical editors. + */ List<EObject> getSpecifications(T element); } diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentProvider.java index de93fb02946f46f0935bf31098ad5de1e625dd62..1f955c28e4397ff2a975cd52cf147f9fc351d01b 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentProvider.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentProvider.java @@ -59,7 +59,11 @@ public class NavigatorTreeContentProvider implements ITreeContentProvider { IModelElementHandler<EObject> handler = IModelElementService.INSTANCE .getModelElementHandler((EObject) parentElement); if (handler != null) { - return handler.getSubnodes((EObject) parentElement).toArray(); + List<EObject> children = handler + .getSubnodes((EObject) parentElement); + children.addAll(handler + .getSpecifications((EObject) parentElement)); + return children.toArray(); } } return new Object[0];