diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings
index a78ccc70d107a9a29d69f6b3172aab4ce3678d74..b0d39817f6a7a64ec28732f60bfbbf1405715ff8 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings
@@ -1,2 +1,2 @@
ColumnHandle.java 8fc5f04cbb0127e5df8c7a9e3b2620502bf93716 GREEN
-GenericAnnotationView.java 6d5569d9a346d5fd60d28a1c60baa9963b5a4010 GREEN
+GenericAnnotationView.java 68a6eb91a4db97a58ebfacf400e73c297ab6b1a3 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
index 6d5569d9a346d5fd60d28a1c60baa9963b5a4010..68a6eb91a4db97a58ebfacf400e73c297ab6b1a3 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
@@ -15,6 +15,7 @@
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.base.ui.annotation.view.generic;
+import static org.apache.commons.lang3.reflect.MethodUtils.getMatchingMethod;
import static org.fortiss.tooling.base.ui.annotation.editingsupport.EditingSupportFactory.createEditingSupport;
import static org.fortiss.tooling.base.ui.annotation.labelprovider.LabelProviderFactory.createLabelProvider;
import static org.fortiss.tooling.kernel.utils.LoggingUtils.error;
@@ -298,7 +299,7 @@ public class GenericAnnotationView extends AnnotationViewPartBase {
*/
private void setTableItemHeight(Table table, int height) {
try {
- Method method = table.getClass().getDeclaredMethod("setItemHeight", int.class);
+ Method method = getMatchingMethod(table.getClass(), "setItemHeight", int.class);
if(method != null) {
boolean accessible = method.canAccess(table);
if(method.trySetAccessible()) {
diff --git a/org.fortiss.tooling.base/html/developer/figures/base.aird b/org.fortiss.tooling.base/html/developer/figures/base.aird
index 452dd2e72a50ec64a155eb059b96e4d82fd686fc..7caf55a35f06a2aa29c3d59a181248825cdb78bc 100644
--- a/org.fortiss.tooling.base/html/developer/figures/base.aird
+++ b/org.fortiss.tooling.base/html/developer/figures/base.aird
@@ -671,27 +671,6 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yQ9OAEosEei1a5h03EPS7w" name="IModelElementSpecificationArray" visible="false" tooltipText="" width="14" height="5">
- <target xmi:type="ecore:EDataType" href="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementSpecificationArray"/>
- <semanticElements xmi:type="ecore:EDataType" href="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementSpecificationArray"/>
- <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_19HWsEosEei1a5h03EPS7w"/>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yQ9OAUosEei1a5h03EPS7w" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="255,250,191">
- <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_yRFw4EosEei1a5h03EPS7w" name="org.fortiss.tooling.base.model.element.IModelElementSpecification[]" visible="false" tooltipText="">
- <target xmi:type="ecore:EDataType" href="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementSpecificationArray"/>
- <semanticElements xmi:type="ecore:EDataType" href="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementSpecificationArray"/>
- <decorations xmi:type="viewpoint:Decoration" xmi:id="_yRFw4kosEei1a5h03EPS7w">
- <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
- </decorations>
- <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_yRFw4UosEei1a5h03EPS7w" showIcon="false">
- <labelFormat>italic</labelFormat>
- <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@subNodeMappings[name='EC_DataType_InstanceClassName']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@subNodeMappings[name='EC_DataType_InstanceClassName']"/>
- </ownedElements>
- </ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yQ9OAkosEei1a5h03EPS7w" name="IDerivedAnnotation" tooltipText="" outgoingEdges="_yRI0P0osEei1a5h03EPS7w _yRJbQEosEei1a5h03EPS7w" width="12" height="10">
<target xmi:type="ecore:EClass" href="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IDerivedAnnotation"/>
<semanticElements xmi:type="ecore:EClass" href="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IDerivedAnnotation"/>
diff --git a/org.fortiss.tooling.base/model/.ratings b/org.fortiss.tooling.base/model/.ratings
index cf0936c1a96a22f7bbc5126b0c877dcfaa235144..8f58ba1ffdf1ae83053ebe17d4e5b7e85db128e1 100644
--- a/org.fortiss.tooling.base/model/.ratings
+++ b/org.fortiss.tooling.base/model/.ratings
@@ -1 +1 @@
-base.ecore d7254f90603d838d7371bfe830d6a7d20aa8bd59 GREEN
+base.ecore 598ac2f27293be7344b762471a3570f45e63950d GREEN
diff --git a/org.fortiss.tooling.base/model/base.ecore b/org.fortiss.tooling.base/model/base.ecore
index d7254f90603d838d7371bfe830d6a7d20aa8bd59..598ac2f27293be7344b762471a3570f45e63950d 100644
--- a/org.fortiss.tooling.base/model/base.ecore
+++ b/org.fortiss.tooling.base/model/base.ecore
@@ -146,12 +146,6 @@
<details key="documentation" value="Super class of model element specifications that represent annotations (i.e., specifications that are guaranteed to exist exactly once for the model elements for which the annotation has been registered)"/>
</eAnnotations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="IModelElementSpecificationArray"
- instanceClassName="org.fortiss.tooling.base.model.element.IModelElementSpecification[]">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="@deprecated An array of model element specifications."/>
- </eAnnotations>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IDerivedAnnotation" abstract="true"
interface="true" eSuperTypes="#//element/IAnnotatedSpecification #//element/IHiddenSpecification">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/org.fortiss.tooling.base/model/base.genmodel b/org.fortiss.tooling.base/model/base.genmodel
index f48ee617569452b85131b8fcc3d12f1f57cace95..fde899af767217ec4ed05483e87703bb3c21cbce 100644
--- a/org.fortiss.tooling.base/model/base.genmodel
+++ b/org.fortiss.tooling.base/model/base.genmodel
@@ -10,7 +10,6 @@
ecorePackage="base.ecore#/">
<nestedGenPackages prefix="Element" basePackage="org.fortiss.tooling.base.model"
disposableProviderFactory="true" ecorePackage="base.ecore#//element">
- <genDataTypes ecoreDataType="base.ecore#//element/IModelElementSpecificationArray"/>
<genClasses ecoreClass="base.ecore#//element/IModelElement">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IModelElement/specifications"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true"