diff options
| author | Chris Goldthorpe | 2009-09-17 22:38:03 +0000 |
|---|---|---|
| committer | Chris Goldthorpe | 2009-09-17 22:38:03 +0000 |
| commit | c65dbff9c873fd7de9df738960a4aa872e14f842 (patch) | |
| tree | a074ef47c4ed8969abdf3bb0760b83566fe86dff /org.eclipse.help | |
| parent | 71832027e7d5a370f0b54e97df5b5105380b1784 (diff) | |
| download | eclipse.platform.ua-c65dbff9c873fd7de9df738960a4aa872e14f842.tar.gz eclipse.platform.ua-c65dbff9c873fd7de9df738960a4aa872e14f842.tar.xz eclipse.platform.ua-c65dbff9c873fd7de9df738960a4aa872e14f842.zip | |
Bug 289616 [Help][Context] Topics from multiple contexts in single context file aren't merged
Diffstat (limited to 'org.eclipse.help')
| -rw-r--r-- | org.eclipse.help/src/org/eclipse/help/internal/context/ContextFileProvider.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextFileProvider.java b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextFileProvider.java index e4378f6a9..10b60fead 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextFileProvider.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextFileProvider.java @@ -220,7 +220,12 @@ public class ContextFileProvider extends AbstractContextProvider { Context context = (Context)children[i]; String id = context.getId(); if (id != null) { - contexts.put(id, context); + Object existingContext = contexts.get(id); + if (existingContext != null) { + ((Context)existingContext).mergeContext(context); + } else { + contexts.put(id, context); + } } } } |