Skip to content
Snippets Groups Projects
Commit 1bac7104 authored by Simon Barner's avatar Simon Barner
Browse files

setTableItemHeight(): Avoid using deprecated method isAccessible()

* AccessibleObject::isAccessible() is deprecated for Java 9 and above
* Use AccessibleObject::canAccess(Object) instead
* Log a warning when the security manager denies to enable access to
  Table::setItemHeight()
* Log an error when an error occurs when trying to set the table height

Issue-Ref: 3696
Issue-Url: https://af3-developer.fortiss.org/issues/3696



Signed-off-by: default avatarSimon Barner <barner@fortiss.org>
parent d8010612
No related branches found
No related tags found
1 merge request!543696: Memory Modeling
ColumnHandle.java 8fc5f04cbb0127e5df8c7a9e3b2620502bf93716 GREEN
GenericAnnotationView.java 494cbcade7fd5d66b9629b86549eb25d4d4c93dd YELLOW
GenericAnnotationView.java 6d5569d9a346d5fd60d28a1c60baa9963b5a4010 YELLOW
......@@ -17,6 +17,8 @@ package org.fortiss.tooling.base.ui.annotation.view.generic;
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;
import static org.fortiss.tooling.kernel.utils.LoggingUtils.warning;
import java.lang.reflect.Method;
import java.util.Collection;
......@@ -70,6 +72,7 @@ import org.fortiss.tooling.base.annotation.valueprovider.IAnnotationValueProvide
import org.fortiss.tooling.base.annotation.valueprovider.IAnnotationValueProvider.AnnotationActionParameters;
import org.fortiss.tooling.base.model.element.IAnnotatedSpecification;
import org.fortiss.tooling.base.model.element.IModelElement;
import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
import org.fortiss.tooling.base.ui.annotation.editingsupport.EditingSupportFactory;
import org.fortiss.tooling.base.ui.annotation.editingsupport.ElementCommentEditingSupport;
import org.fortiss.tooling.base.ui.annotation.editingsupport.ElementNameEditingSupport;
......@@ -297,13 +300,17 @@ public class GenericAnnotationView extends AnnotationViewPartBase {
try {
Method method = table.getClass().getDeclaredMethod("setItemHeight", int.class);
if(method != null) {
boolean accessible = method.isAccessible();
method.setAccessible(true);
method.invoke(table, height);
method.setAccessible(accessible);
boolean accessible = method.canAccess(table);
if(method.trySetAccessible()) {
method.invoke(table, height);
method.setAccessible(accessible);
} else {
warning(ToolingBaseUIActivator.getDefault(),
"Could not set annotation table height.");
}
}
} catch(Exception e) {
return;
error(ToolingBaseUIActivator.getDefault(), "Failed to set annotation table height.", e);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment