mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

CUIPlugin.startup() cleanup. The method

Browse source 
was trying to get the UI thread, not necessary.
This commit is contained in:
Alain Magloire 2004-05-26 15:18:40 +00:00
parent 7aa7748a99
commit 24b52e838e
5 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,8 @@
2004-05-26 Alain Magloire
CUIPlugin.startup() cleanup. The method
was trying to get the UI thread, not necessary.
2004-05-26 Alain Magloire 2004-05-26 Alain Magloire
Jumbo Patch from Chris Wiebe. Jumbo Patch from Chris Wiebe.

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
View file

@ -20,7 +20,6 @@ import org.eclipse.cdt.core.model.ISourceRoot;
import org.eclipse.cdt.core.model.ITemplate; import org.eclipse.cdt.core.model.ITemplate;
import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
import org.eclipse.cdt.ui.CElementImageDescriptor; import org.eclipse.cdt.ui.CElementImageDescriptor;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
@ -88,10 +87,7 @@ public class CElementImageProvider {
DESC_OBJ_FOLDER= images.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); DESC_OBJ_FOLDER= images.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
} }
private ImageDescriptorRegistry fRegistry;
public CElementImageProvider() { public CElementImageProvider() {
fRegistry= CUIPlugin.getImageDescriptorRegistry();
} }
/** /**
@ -117,7 +113,7 @@ public class CElementImageProvider {
descriptor= getWorkbenchImageDescriptor((IAdaptable) element, flags); descriptor= getWorkbenchImageDescriptor((IAdaptable) element, flags);
} }
if (descriptor != null) { if (descriptor != null) {
return fRegistry.get(descriptor); return CUIPlugin.getImageDescriptorRegistry().get(descriptor);
} }
return null; return null;
} }

20
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
View file

@ -229,26 +229,6 @@ public class CPluginImages {
public static final ImageDescriptor DESC_OBJS_FILE_CHANGE= create(T_OBJ, "file_change.gif"); //$NON-NLS-1$ public static final ImageDescriptor DESC_OBJS_FILE_CHANGE= create(T_OBJ, "file_change.gif"); //$NON-NLS-1$
public static final ImageDescriptor DESC_OBJS_TEXT_EDIT= create(T_OBJ, "text_edit.gif"); //$NON-NLS-1$ public static final ImageDescriptor DESC_OBJS_TEXT_EDIT= create(T_OBJ, "text_edit.gif"); //$NON-NLS-1$
public static void initialize() {
//createManaged(registry, T_OBJ, IMG_OBJS_TUNIT);
//createManaged(registry, T_OBJ, IMG_OBJS_FIELD);
//createManaged(registry, T_OBJ, IMG_OBJS_CLASS);
//createManaged(registry, T_OBJ, IMG_OBJS_STRUCT);
//createManaged(registry, T_OBJ, IMG_OBJS_UNION);
//createManaged(registry, T_OBJ, IMG_OBJS_FUNCTION);
//createManaged(registry, T_OBJ, IMG_OBJS_INCLUDE);
//createManaged(registry, T_OBJ, IMG_OBJS_DEFINE);
//createManaged(registry, T_OBJ, IMG_OBJS_ARCHIVE);
//createManaged(registry, T_OBJ, IMG_OBJS_SHLIB);
//createManaged(registry, T_OBJ, IMG_OBJS_BINARY);
//createManaged(registry, T_OBJ, IMG_OBJS_CEXEC);
//createManaged(registry, T_OBJ, IMG_OBJS_CEXEC_DEBUG);
//createManaged(registry, T_OBJ, IMG_OBJS_CONTAINER);
//createManaged(registry, T_OBJ, IMG_OBJS_TEMPLATE);
}
private static ImageDescriptor createManaged(String prefix, String name) { private static ImageDescriptor createManaged(String prefix, String name) {
return createManaged(imageRegistry, prefix, name); return createManaged(imageRegistry, prefix, name);
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java
View file

@ -17,7 +17,6 @@ import org.eclipse.cdt.internal.ui.CElementImageProvider;
import org.eclipse.cdt.internal.ui.ErrorTickAdornmentProvider; import org.eclipse.cdt.internal.ui.ErrorTickAdornmentProvider;
import org.eclipse.cdt.internal.ui.IAdornmentProvider; import org.eclipse.cdt.internal.ui.IAdornmentProvider;
import org.eclipse.cdt.internal.ui.search.CElementLabels; import org.eclipse.cdt.internal.ui.search.CElementLabels;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.model.WorkbenchLabelProvider;
@ -82,7 +81,6 @@ public class CElementLabelProvider extends LabelProvider {
public final static int SHOW_DEFAULT= new Integer(SHOW_PARAMETERS | SHOW_OVERLAY_ICONS).intValue(); public final static int SHOW_DEFAULT= new Integer(SHOW_PARAMETERS | SHOW_OVERLAY_ICONS).intValue();
private ImageRegistry fImageRegistry;
private WorkbenchLabelProvider fWorkbenchLabelProvider; private WorkbenchLabelProvider fWorkbenchLabelProvider;
private CElementImageProvider fImageLabelProvider; private CElementImageProvider fImageLabelProvider;
private IAdornmentProvider[] fAdornmentProviders; private IAdornmentProvider[] fAdornmentProviders;
@ -104,7 +102,6 @@ public class CElementLabelProvider extends LabelProvider {
* @param imageFlags Flags defined in <code>CElementImageProvider</code>. * @param imageFlags Flags defined in <code>CElementImageProvider</code>.
*/ */
public CElementLabelProvider(int flags, IAdornmentProvider[] adormentProviders) { public CElementLabelProvider(int flags, IAdornmentProvider[] adormentProviders) {
fImageRegistry= CUIPlugin.getDefault().getImageRegistry();
fWorkbenchLabelProvider= new WorkbenchLabelProvider(); fWorkbenchLabelProvider= new WorkbenchLabelProvider();
fImageLabelProvider= new CElementImageProvider(); fImageLabelProvider= new CElementImageProvider();
@ -223,7 +220,6 @@ public class CElementLabelProvider extends LabelProvider {
fWorkbenchLabelProvider.dispose(); fWorkbenchLabelProvider.dispose();
fWorkbenchLabelProvider= null; fWorkbenchLabelProvider= null;
} }
fImageRegistry= null;
if(fImageLabelProvider != null) { if(fImageLabelProvider != null) {
fImageLabelProvider.dispose(); fImageLabelProvider.dispose();
} }

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

@ -29,7 +29,6 @@ import org.eclipse.cdt.core.model.IWorkingCopy;
import org.eclipse.cdt.internal.core.model.IBufferFactory; import org.eclipse.cdt.internal.core.model.IBufferFactory;
import org.eclipse.cdt.internal.corext.refactoring.base.Refactoring; import org.eclipse.cdt.internal.corext.refactoring.base.Refactoring;
import org.eclipse.cdt.internal.ui.CElementAdapterFactory; import org.eclipse.cdt.internal.ui.CElementAdapterFactory;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.ICStatusConstants; import org.eclipse.cdt.internal.ui.ICStatusConstants;
import org.eclipse.cdt.internal.ui.IContextMenuConstants; import org.eclipse.cdt.internal.ui.IContextMenuConstants;
import org.eclipse.cdt.internal.ui.ResourceAdapterFactory; import org.eclipse.cdt.internal.ui.ResourceAdapterFactory;
@ -399,16 +398,10 @@ public class CUIPlugin extends AbstractUIPlugin {
//Set debug tracing options //Set debug tracing options
CUIPlugin.getDefault().configurePluginDebugOptions(); CUIPlugin.getDefault().configurePluginDebugOptions();
runUI(new Runnable() { registerAdapters();
public void run() { AllTypesCache.initialize(new IWorkingCopyProvider() {
registerAdapters(); public IWorkingCopy[] getWorkingCopies() {
CPluginImages.initialize(); return CUIPlugin.getSharedWorkingCopies();
AllTypesCache.initialize(new IWorkingCopyProvider() {
public IWorkingCopy[] getWorkingCopies() {
return CUIPlugin.getSharedWorkingCopies();
}
});
} }
}); });
} }