org.fortiss.tooling.kernel.ui/plugin.xml

@@ -32,6 +32,12 @@
             name="Model Navigator"
             restorable="true">
       </view>
+      <view
+            class="org.fortiss.tooling.kernel.ui.internal.views.library.LibraryViewPart"
+            id="org.fortiss.tooling.kernel.ui.internal.views.library.LibraryViewPart"
+            name="Library"
+            restorable="true">
+      </view>
       <view
             class="org.fortiss.tooling.kernel.ui.internal.views.ModelElementsViewFX"
             icon="icons/library.png"

org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings

@@ -4,7 +4,7 @@ DataBindingUtils.java 631c47881caa13fc567679a7e4416eb777af0713 GREEN
 DragAndDropUtils.java 7aab91518aa12d76533a345bf6ed0be9ac7ff0e5 GREEN
 EObjectSelectionUtils.java 128cf8f96c6b9478171dff3deda662d5934f5f44 GREEN
 HierarchicalNameViewerComparator.java 199d82e392d4e437810cc65c0fc521dab52038e0 GREEN
-KernelUIUtils.java 46d3279ef3523b104f89a6c526109f72d36f72f2 GREEN
+KernelUIUtils.java dd58b2c618b7c847aa8cfa2d3bd9956b40b73cdd GREEN
 MessageUtilsExtended.java a08055b2f0005eebfa91662374d9ec4ce4f78aab GREEN
 ObservableUtils.java 34abfd1dfaf9c0acbb31caf1f525e7b39416c116 GREEN
 PropertiesConstantUtils.java 59b1a1e4d594bb98db3aa396f2ff6474ba405920 GREEN

org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/KernelUIUtils.java

@@ -48,7 +48,7 @@ public class KernelUIUtils {
 		if(editorClazz.isInstance(editor)) {
 			return (E)editor;
 		}
-		if(editor.getSite() instanceof MultiPageEditorSite) {
+		if(editor != null && editor.getSite() instanceof MultiPageEditorSite) {
 			MultiPageEditorSite multiEditor = (MultiPageEditorSite)editor.getSite();
 			ExtendableMultiPageEditor multiPage =
 					(ExtendableMultiPageEditor)multiEditor.getMultiPageEditor();

org.fortiss.tooling.kernel/META-INF/MANIFEST.MF

@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.fortiss.tooling.kernel;singleton:=true
-Bundle-Version: 2.18.0.qualifier
+Bundle-Version: 2.19.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.fortiss.tooling.kernel.ToolingKernelActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.fortiss.tooling.common;visibility:=reexport;bundle-version="2.18.0",
+Require-Bundle: org.fortiss.tooling.common;visibility:=reexport;bundle-version="2.19.0",
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport;bundle-version="2.7.0",
  org.eclipse.emf.transaction;visibility:=reexport;bundle-version="1.4.0",

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/internal/.ratings

@@ -9,7 +9,7 @@ LibraryService.java a56e71191cd9bab5a6be461000e7e9b605c7b0db GREEN
 LoggingService.java da784259f7b456b54bf75c41ec268f64919ce78d GREEN
 MigrationService.java 017c8438262065f663427a998536035bc7732fe1 GREEN
 PersistencyService.java 621898863371959d822edcde0f83c8a4d2757972 GREEN
-PrototypeService.java 04093ccaea091776e8ed6f8fc723a62e4619ddb6 GREEN
+PrototypeService.java 34fef95b51bb14f6c31144a9a92769141208c23a GREEN
 ToolingKernelInternal.java f6e7114825748683c7f1d040b41ab854a6c4d79b GREEN
 TransformationService.java 64ee4fb5ccc623f8acfba20866fc2b0944c4adab GREEN
 TutorialService.java 675d3f365ce062869f86baa3779d50687674bda0 GREEN

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/internal/PrototypeService.java

@@ -16,6 +16,7 @@
 package org.fortiss.tooling.kernel.internal;
 
 import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
 import static org.conqat.lib.commons.collections.CollectionUtils.asUnmodifiable;
 import static org.fortiss.tooling.kernel.utils.ExtensionPointUtils.getBundle;
 import static org.fortiss.tooling.kernel.utils.ExtensionPointUtils.getConfigurationElements;
@@ -23,8 +24,10 @@ import static org.fortiss.tooling.kernel.utils.ExtensionPointUtils.loadClass;
 import static org.fortiss.tooling.kernel.utils.LoggingUtils.error;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.conqat.lib.commons.collections.UnmodifiableList;
@@ -71,6 +74,10 @@ public class PrototypeService implements IPrototypeService, IIntrospectiveKernel
 	/** The tutorial service instance. */
 	private ITutorialService tutorialService;
 
+	/** Cache for (expensive) {@link #getComposablePrototypes(Class)}. */
+	private Map<Class<? extends EObject>, List<Prototype>> composablePrototypesCache =
+			new HashMap<>();
+
 	/** Initializes the service. */
 	public void initializeService() {
 		setupPrototypes();
@@ -189,14 +196,20 @@ public class PrototypeService implements IPrototypeService, IIntrospectiveKernel
 	/** {@inheritDoc} */
 	@Override
 	public List<Prototype> getComposablePrototypes(Class<? extends EObject> modelElementType) {
+		List<Prototype> composablePrototypes = composablePrototypesCache.get(modelElementType);
+		if(composablePrototypes != null) {
+			return composablePrototypes;
+		}
 		IElementCompositorService ecs = IElementCompositorService.getInstance();
-		List<Prototype> result = new LinkedList<Prototype>();
+		composablePrototypes = new LinkedList<Prototype>();
 		for(Prototype prototype : getAllPrototypes()) {
 			if(ecs.canComposePrototype(modelElementType, prototype)) {
-				result.add(prototype);
+				composablePrototypes.add(prototype);
 			}
 		}
-		return result;
+		composablePrototypes = unmodifiableList(composablePrototypes);
+		composablePrototypesCache.put(modelElementType, composablePrototypes);
+		return composablePrototypes;
 	}
 
 	/** {@inheritDoc} */

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/.ratings

@@ -5,4 +5,4 @@ IEObjectAware2.java 1e34fc55934f0c1e7ac55a7e5dba5b52db72f1c9 GREEN
 IObjectAware.java 0027a3854c54e6197c9ba022625b38851db8f6bd GREEN
 IObjectAware2.java ec03db09b2162e30df788abdd11557c6f4adeaf9 GREEN
 ObjectAware2ServiceBase.java 1583f2e3f72ca2f01343a218dce2ed97e7db4c57 GREEN
-ObjectAwareServiceBase.java 4be963c95a5a69db95fc68f306f3a5b2e3f3c0a1 GREEN
+ObjectAwareServiceBase.java 1d5665c36339e1b16b50d32959cade48935f53b4 GREEN

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java

@@ -83,10 +83,11 @@ public abstract class ObjectAwareServiceBase<T extends IObjectAware<? extends Ob
 	/**
 	 * Returns the list of registered handlers for the given class.
 	 * 
-	 * IMPORTANT: this method only returns the first registered handler which is found. A different
-	 * implementation where all registered handlers are returned can be found in
-	 * org.fortiss.tooling.base.annotation.AnnotationValueService#getRegisteredHandlers.
-	 * If this behavior will be reused we should change this method. (Refs 2270)
+	 * IMPORTANT: this method only returns the handlers that are registered for the provided
+	 * {@code modelElementClass}. In case also the handlers registered for the super-types of the
+	 * this class should be retrieved, the implementation
+	 * {@code org.fortiss.tooling.base.annotation.AnnotationValueService#getRegisteredHandlers}
+	 * should be generalized and made available here (#2270)
 	 */
 	public List<T> getRegisteredHandlers(Class<?> modelElementClass) {
 		return performNearestClassLookup(modelElementClass, handlerMap);

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings

 CompositionUtils.java 34c0a191bd0fb4176c94b4d61abb5c88a679d5e8 GREEN
 EMFResourceUtils.java 68e6712a52349548bf85346900b17aa65b5f0ea9 GREEN
 EcoreSerializerBase.java 0a0c2969d793d2e68094c55c8f7b0a662ef6e5d5 GREEN
-EcoreUtils.java 18416b5c214410a02eb35596fd807a1cc27d6b35 GREEN
+EcoreUtils.java 14f59a93b81dca8d75c192e4bc7c936d4eed799a GREEN
 ExtensionPointUtils.java 7ce63242b49eb9a7cd4eaadd223f5ebce1dfd75b GREEN
 HierarchicalNameComparator.java 6face1b673126701a0721af48ead2f9766c17d46 GREEN
 IdentifierUtils.java fff43dc4e84cdd89c3ece4f5d9d89aec4b0749c2 GREEN

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/EcoreUtils.java

@@ -22,6 +22,8 @@ import static org.eclipse.emf.ecore.util.EcoreUtil.getAllContents;
 import static org.eclipse.emf.ecore.util.EcoreUtil.getRootContainer;
 import static org.eclipse.emf.ecore.util.EcoreUtil.replace;
 import static org.eclipse.emf.ecore.util.EcoreUtil.UsageCrossReferencer.find;
+import static org.fortiss.tooling.common.util.LambdaUtils.asStream;
+import static org.fortiss.tooling.common.util.LambdaUtils.isAssignableFromAny;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -268,6 +270,33 @@ public class EcoreUtils {
 		return getChildrenWith(parent, isAssignable);
 	}
 
+	/**
+	 * For the given {@code parent}, return the most nested ancestors of the given {@code type} that
+	 * does not have any ancestors of any of the given {@code admissibleSpecializations}.
+	 * 
+	 * @param parent
+	 *            the parent {@link EObject}.
+	 * @param type
+	 *            the type.
+	 * @param admissibleSpecializations
+	 *            {@link Collection} of admissible specializations of the given type.
+	 * @return a list of children.
+	 */
+	@SuppressWarnings({"rawtypes", "unchecked"})
+	public static <T extends EObject> Collection<T> getChildrenWithType(EObject parent,
+			Class<T> type, Collection<Class<? extends T>> admissibleSpecializations) {
+
+		Predicate<? super EObject> hasApplicableChildren =
+				modelElement -> asStream(modelElement.eAllContents())
+						.anyMatch(c -> isAssignableFromAny((Collection)admissibleSpecializations,
+								c.getClass()));
+
+		Stream<T> children = asStream(parent.eAllContents()).filter(type::isInstance)
+				.filter(hasApplicableChildren.negate()).map(type::cast);
+
+		return children.collect(toList());
+	}
+
 	/**
 	 * For a given {@link EObject}, recursively returns the first child that satisfies the given
 	 * {@link Predicate}.

org.fortiss.tooling.spiderchart.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Spider Chart
 Bundle-SymbolicName: org.fortiss.tooling.spiderchart.ui;singleton:=true
-Bundle-Version: 2.18.0.qualifier
+Bundle-Version: 2.19.0.qualifier
 Bundle-Vendor: fortiss GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Developer: Amit Kumar Mondal (admin@amitinside.com)