From 04fd4de249de0d054e25f7014cbe856f381da369 Mon Sep 17 00:00:00 2001 From: John Camelon Date: Tue, 12 Aug 2003 14:31:55 +0000 Subject: [PATCH] Patch for Bogdan. --- core/org.eclipse.cdt.ui/ChangeLog | 3 +++ .../cdt/internal/ui/search/CSearchOperation.java | 7 +++---- .../src/org/eclipse/cdt/ui/CUIPlugin.java | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index f589337f01e..bd36c492a49 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,6 @@ +2003-08-11 Andrew Niefer + - Added some code to CUIPlugin to access working copies + 2003-08-10 Sean Evoy Added a new target for building DLLs on Cygwin. * plugin.xml diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchOperation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchOperation.java index 214e4ccd69e..e9aa89ad567 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchOperation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchOperation.java @@ -20,9 +20,8 @@ import org.eclipse.cdt.core.search.ICSearchConstants; import org.eclipse.cdt.core.search.ICSearchPattern; import org.eclipse.cdt.core.search.ICSearchScope; import org.eclipse.cdt.core.search.SearchEngine; -import org.eclipse.cdt.internal.core.model.IWorkingCopy; import org.eclipse.cdt.internal.ui.CPluginImages; - +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -65,8 +64,8 @@ public class CSearchOperation extends WorkspaceModifyOperation implements ICSear throws CoreException, InvocationTargetException, InterruptedException { _collector.setProgressMonitor( monitor ); - IWorkingCopy copy = null; - SearchEngine engine = new SearchEngine( ); + + SearchEngine engine = new SearchEngine( CUIPlugin.getSharedWorkingCopies() ); if( _elementPattern != null ){ engine.search( _workspace, _elementPattern, _limitTo, _scope, _collector ); } else { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java index d823b7dde43..c0cb311018c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java @@ -19,6 +19,8 @@ import java.util.ResourceBundle; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.core.model.IBufferFactory; +import org.eclipse.cdt.internal.core.model.IWorkingCopy; import org.eclipse.cdt.internal.ui.BuildConsoleManager; import org.eclipse.cdt.internal.ui.CElementAdapterFactory; import org.eclipse.cdt.internal.ui.CPluginImages; @@ -86,6 +88,17 @@ public class CUIPlugin extends AbstractUIPlugin { } } + public static IBufferFactory getBufferFactory() { + CDocumentProvider provider= CUIPlugin.getDefault().getDocumentProvider(); + if (provider != null) + return provider.getBufferFactory(); + return null; + } + + public static IWorkingCopy[] getSharedWorkingCopies() { + return CCorePlugin.getSharedWorkingCopies(getBufferFactory()); + } + public static String getResourceString(String key) { try { return fgResourceBundle.getString(key); @@ -101,7 +114,7 @@ public class CUIPlugin extends AbstractUIPlugin { public static IWorkspace getWorkspace() { return ResourcesPlugin.getWorkspace(); } - + public static String getFormattedString(String key, String arg) { return MessageFormat.format(getResourceString(key), new String[] { arg }); } @@ -357,5 +370,4 @@ public class CUIPlugin extends AbstractUIPlugin { manager.unregisterAdapters(fResourceAdapterFactory); manager.unregisterAdapters(fCElementAdapterFactory); } - }