Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRené Purrio2018-01-05 07:54:31 -0500
committerRené Purrio2018-01-05 07:54:31 -0500
commit9b8abf25dce4ef0439c6c4d3cb35435771811188 (patch)
tree70175977f77d6b2af5ccf3904e66fe73573f176b /bundles
parent4cf911ddc61831f343d61dc01979d30a0fa15aa4 (diff)
downloadeclipse.platform.team-9b8abf25dce4ef0439c6c4d3cb35435771811188.tar.gz
eclipse.platform.team-9b8abf25dce4ef0439c6c4d3cb35435771811188.tar.xz
eclipse.platform.team-9b8abf25dce4ef0439c6c4d3cb35435771811188.zip
Change-Id: If011ab24cdbd99b312b58b3e497bca63dfcc2793 Signed-off-by: René Purrio <rpurrio@itemis.de>
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java
index 9264a199d..c92c109a8 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java
@@ -378,11 +378,10 @@ public abstract class StructureCreator implements IStructureCreator2 {
for (int i= 0; i < children.length; i++) {
IStructureComparator child= (IStructureComparator) children[i];
if (child instanceof ITypedElement && child instanceof DocumentRangeNode) {
- String n1= null;
- if (child instanceof DocumentRangeNode)
- n1= ((DocumentRangeNode)child).getId();
- if (n1 == null)
+ String n1= ((DocumentRangeNode)child).getId();
+ if (n1 == null) {
n1= ((ITypedElement)child).getName();
+ }
String n2= path[index];
if (n1.equals(n2)) {
if (index == path.length-1)

Back to the top