Bug 509708 - Don't try to create an image from a null descriptor.
Elements in the outline can be "virtual" without real direction of the
change (e.g. "Compilation Unit" root node). Such elements are created
from RangeDifferences with "NOCHANGE" kind (so the
DocumentMerger.Diff.fDirection is zero), and therefore they do not have
an image descriptor configured in CompareConfiguration.fgImages array.
Also increment service segment after patch.
Change-Id: I82645b097fe49a3d61e2e7934a0190a718a9ec35
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
index 6066657..cbc0c15 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
@@ -305,14 +305,20 @@
* disposed when the <code>dispose</code> method is called.
*
* @param kind the kind of change as defined in <code>Differencer</code>.
- * @return an modification of the base image reflecting the kind of change.
+ * @return an modification of the base image reflecting the kind of change
+ * or {@code null} if there is no image descriptor registered for
+ * given id.
* @see org.eclipse.compare.structuremergeviewer.Differencer
* @since 2.0
*/
public Image getImage(int kind) {
- if (fDisposed)
+ if (fDisposed) {
return null;
+ }
ImageDescriptor id= getImageDescriptor(kind);
+ if (id == null) {
+ return null;
+ }
ResourceManager rm = getResourceManager();
return rm.createImage(id);
}
diff --git a/bundles/org.eclipse.compare/pom.xml b/bundles/org.eclipse.compare/pom.xml
index 607979e..b221ea7 100644
--- a/bundles/org.eclipse.compare/pom.xml
+++ b/bundles/org.eclipse.compare/pom.xml
@@ -5,7 +5,7 @@
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
-
+
Contributors:
Igor Fedorenko - initial implementation
-->
