diff options
| author | Karsten Thoms | 2017-12-04 09:04:59 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-01-31 13:34:47 +0000 |
| commit | c2db55c5f733313a0a9c9665fdf5e8013aedcfe1 (patch) | |
| tree | f8b404f42d374cb140774bd8a906490b97d9dcd2 | |
| parent | b06731f79c30b48d85ca3021f21f61d7a4afd02a (diff) | |
| download | eclipse.platform.ua-c2db55c5f733313a0a9c9665fdf5e8013aedcfe1.tar.gz eclipse.platform.ua-c2db55c5f733313a0a9c9665fdf5e8013aedcfe1.tar.xz eclipse.platform.ua-c2db55c5f733313a0a9c9665fdf5e8013aedcfe1.zip | |
Bug 528080 - Added disposal checksI20180216-0415I20180215-2000I20180214-2000I20180213-2000I20180213-0125I20180212-2000I20180211-2000I20180210-1500I20180209-2000I20180208-2000I20180207-2000I20180206-2000I20180206-0315I20180205-2000I20180204-2000I20180203-1500I20180202-2000I20180202-0315I20180201-2325I20180201-2000I20180201-0200I20180131-2000
Also indentation cleanup
Change-Id: Ibf8ba0c057a1fd27c7d3e4f18f1e3265474d15c6
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
| -rw-r--r-- | org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java index 1a4cd2be7..8781a5639 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java @@ -593,32 +593,32 @@ public class SearchPart extends AbstractFormPart implements IHelpPart, IHelpUICo @Override public void accept(ISearchEngineResult[] searchResults) { results.add(ed, searchResults); - if (ed.getEngine() instanceof LocalHelp) + if (ed.getEngine() instanceof LocalHelp && !container.isDisposed()) { - container.getDisplay().asyncExec(new Thread(){ + container.getDisplay().asyncExec(new Thread() { - @Override + @Override public void run(){ if (alternateQuerySection!=null) { alternateQuerySection.dispose(); alternateQuerySection = null; } - List<String> alts = ((LocalHelp) ed.getEngine()).getAlternates(); + List<String> alts = ((LocalHelp) ed.getEngine()).getAlternates(); if (!alts.isEmpty()) { createAlternateQueriesSection(toolkit); for (int b=0;b<alts.size();b++) { - Hyperlink link = toolkit.createHyperlink( - alternateQueryComposite, alts.get(b), SWT.NONE); + Hyperlink link = toolkit.createHyperlink( + alternateQueryComposite, alts.get(b), SWT.NONE); link.addHyperlinkListener(new HyperlinkAdapter(){ - - @Override + @Override public void linkActivated(HyperlinkEvent e) { - - searchWordCombo.setText(((Hyperlink)e.getSource()).getText()); - doSearch(((Hyperlink)e.getSource()).getText()); + if (!searchWordCombo.getControl().isDisposed()) { + searchWordCombo.setText(((Hyperlink)e.getSource()).getText()); + doSearch(((Hyperlink)e.getSource()).getText()); + } } }); } |