mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-12 10:45:37 +02:00
Code Issues Wiki Activity

Bug 355299: When looking for dirty editors during search: Only consider text editors

Browse source
This commit is contained in:
Markus Schorn 2014-08-29 08:39:38 +02:00
parent 8c148855bf
commit e7cbbb7412
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
View file

@ -67,6 +67,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.ui.preferences.ScopedPreferenceStore; import org.eclipse.ui.preferences.ScopedPreferenceStore;
import org.eclipse.ui.texteditor.ChainedPreferenceStore; import org.eclipse.ui.texteditor.ChainedPreferenceStore;
import org.eclipse.ui.texteditor.ConfigurationElementSorter; import org.eclipse.ui.texteditor.ConfigurationElementSorter;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.themes.IThemeManager; import org.eclipse.ui.themes.IThemeManager;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
@ -430,7 +431,7 @@ public class CUIPlugin extends AbstractUIPlugin {
private WorkingCopyManager fWorkingCopyManager; private WorkingCopyManager fWorkingCopyManager;
private CTextTools fTextTools; private CTextTools fTextTools;
private ProblemMarkerManager fProblemMarkerManager; private ProblemMarkerManager fProblemMarkerManager;
private Map<String, BuildConsoleManager> fBuildConsoleManagers; private final Map<String, BuildConsoleManager> fBuildConsoleManagers;
private ResourceAdapterFactory fResourceAdapterFactory; private ResourceAdapterFactory fResourceAdapterFactory;
private CElementAdapterFactory fCElementAdapterFactory; private CElementAdapterFactory fCElementAdapterFactory;
@ -647,8 +648,8 @@ public class CUIPlugin extends AbstractUIPlugin {
} }
if (fBuildConsoleManagers != null ) { if (fBuildConsoleManagers != null ) {
Object[] bcm = fBuildConsoleManagers.values().toArray(); Object[] bcm = fBuildConsoleManagers.values().toArray();
for (int i = 0; i < bcm.length; ++i) { for (Object element : bcm) {
BuildConsoleManager m = (BuildConsoleManager)bcm[i]; BuildConsoleManager m = (BuildConsoleManager)element;
if (m != null) if (m != null)
m.shutdown(); m.shutdown();
} }
@ -791,7 +792,7 @@ public class CUIPlugin extends AbstractUIPlugin {
} }
/** /**
* Returns an array of all editors that have an unsaved content. If the identical content is * Returns an array of all text editors that have an unsaved content. If the identical content is
* presented in more than one editor, only one of those editor parts is part of the result. * presented in more than one editor, only one of those editor parts is part of the result.
* *
* @return an array of all dirty editor parts. * @return an array of all dirty editor parts.
@ -800,22 +801,23 @@ public class CUIPlugin extends AbstractUIPlugin {
Set<IEditorInput> inputs= new HashSet<IEditorInput>(); Set<IEditorInput> inputs= new HashSet<IEditorInput>();
List<IEditorPart> result= new ArrayList<IEditorPart>(0); List<IEditorPart> result= new ArrayList<IEditorPart>(0);
IWorkbench workbench= getDefault().getWorkbench(); IWorkbench workbench= getDefault().getWorkbench();
IWorkbenchWindow[] windows= workbench.getWorkbenchWindows(); for (IWorkbenchWindow window : workbench.getWorkbenchWindows()) {
for (IWorkbenchWindow window : windows) { for (IWorkbenchPage page : window.getPages()) {
IWorkbenchPage[] pages= window.getPages(); for (IEditorReference editorRef : page.getEditorReferences()) {
for (IWorkbenchPage page : pages) { IEditorPart ep= editorRef.getEditor(false);
IEditorPart[] editors= page.getDirtyEditors(); if (ep instanceof ITextEditor && ep.isDirty()) {
for (IEditorPart ep : editors) { IEditorInput input= ep.getEditorInput();
IEditorInput input= ep.getEditorInput(); if (!inputs.contains(input)) {
if (!inputs.contains(input)) { inputs.add(input);
inputs.add(input); result.add(ep);
result.add(ep); }
} }
} }
} }
} }
return result.toArray(new IEditorPart[result.size()]); return result.toArray(new IEditorPart[result.size()]);
} }
/** /**
* Returns an array of all instantiated editors. * Returns an array of all instantiated editors.
*/ */