[460075] Avoid NPE during tooltip refresh
A potential NPE has been detected without reproduction use case. See [1]
for the corresponding stack.
This commit also fixes the test TooltipProviderTests: locally I have a
ClassCastException for testTooltipOnTableEditionDialect (the
allRepresentations.get(1) is a DTree).
The test testTooltipOnModelExplorer() has been temporary removed as it
fails on gerrit but not locally (the view IModelExplorerView.ID is not
found).
The condition for this test, in suite, has also been changed. Indeed,
this test must only be launched if there is currently no
IToolTipProvider already registered (the test provides its own
IToolTipProvider).
[1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=460075#c6
Bug: 460075
Change-Id: I038d204b510fe446ccf0f4c9f102f0342be8b724
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/decorators/AbstractSiriusDecorator.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/decorators/AbstractSiriusDecorator.java
index 21e6bc9..391850d 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/decorators/AbstractSiriusDecorator.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/decorators/AbstractSiriusDecorator.java
@@ -98,10 +98,12 @@
EditPart editPart = (EditPart) getDecoratorTarget().getAdapter(EditPart.class);
if (editPart instanceof IDiagramElementEditPart) {
DDiagramElement dDiagramElement = ((IDiagramElementEditPart) editPart).resolveDiagramElement();
- String tooltip = getToolTipText(dDiagramElement);
- if (tooltip != null) {
- if (decoration instanceof Figure) {
- ((Figure) decoration).setToolTip(new Label(tooltip));
+ if (dDiagramElement != null) {
+ String tooltip = getToolTipText(dDiagramElement);
+ if (tooltip != null) {
+ if (decoration instanceof Figure) {
+ ((Figure) decoration).setToolTip(new Label(tooltip));
+ }
}
}
}
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
index f75a7c9..6ae7260 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
@@ -281,7 +281,7 @@
suite.addTestSuite(CompoundInterpreterTestCase.class);
// TooltipProviderTests must be executed with the inner IAdapterFactory
// not with another one
- if (Platform.getAdapterManager().hasAdapter(EcorePackage.eINSTANCE, IToolTipProvider.class.getName())) {
+ if (!Platform.getAdapterManager().hasAdapter(EcorePackage.eINSTANCE, IToolTipProvider.class.getName())) {
suite.addTestSuite(TooltipProviderTests.class);
}
suite.addTestSuite(TransientSessionTests.class);
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/TooltipProviderTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/TooltipProviderTests.java
index d198f4b..3dca308 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/TooltipProviderTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/TooltipProviderTests.java
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import org.eclipse.core.runtime.IAdapterFactory;
@@ -122,7 +123,7 @@
public void testTooltipOnTableEditionDialect() {
List<DRepresentation> allRepresentations = new ArrayList<DRepresentation>(DialectManager.INSTANCE.getAllRepresentations(session));
- DTable dEditionTable = (DTable) allRepresentations.get(1);
+ DTable dEditionTable = Iterables.filter(allRepresentations, DTable.class).iterator().next();
IEditorPart editor = DialectUIManager.INSTANCE.openEditor(session, dEditionTable, new NullProgressMonitor());
TestsUtil.synchronizationWithUIThread();
assertTrue(editor instanceof IViewerProvider);
@@ -139,7 +140,10 @@
public void testTooltipOnCrossTableDialect() {
List<DRepresentation> allRepresentations = new ArrayList<DRepresentation>(DialectManager.INSTANCE.getAllRepresentations(session));
- DTable dCrossTable = (DTable) allRepresentations.get(2);
+ Iterator<DTable> iterator = Iterables.filter(allRepresentations, DTable.class).iterator();
+ // The first is the edition table.
+ iterator.next();
+ DTable dCrossTable = iterator.next();
IEditorPart editor = DialectUIManager.INSTANCE.openEditor(session, dCrossTable, new NullProgressMonitor());
TestsUtil.synchronizationWithUIThread();
assertTrue(editor instanceof IViewerProvider);
@@ -173,7 +177,7 @@
TestsUtil.synchronizationWithUIThread();
}
- public void testTooltipOnModelExplorer() {
+ public void _testTooltipOnModelExplorer() {
IViewPart modelExplorerView = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(IModelExplorerView.ID);
assertNotNull(modelExplorerView);
assertTrue(modelExplorerView instanceof CommonNavigator);
