From 2be2d0afed9a259e3cd1a394e33d486f960fb707 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 23 Apr 2004 18:32:02 +0000 Subject: [PATCH] Adjusting the UI to changes of the core Concerning customization of translation Unit pathc from Sam PR 52864 --- core/org.eclipse.cdt.ui/ChangeLog | 10 +++++++ .../typeinfo/TypeInfoLabelProvider.java | 10 ++----- .../internal/ui/CElementImageProvider.java | 26 +++++++------------ .../internal/ui/editor/FileSearchAction.java | 7 ++--- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index de811a7aa9c..e0e8ec476cb 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,6 +1,16 @@ 2004-04-23 Hoda Amer Fix for bug#Bug 59618 : [Refactoring] Be able to append refactor action group after my own group +2004-04-23 Alain Magloire + + Adjusting the UI to changes of the core + Concerning customization of translation Unit + pathc from Sam PR 52864 + + * browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLableProvider.java + * src/org/eclipse/cdt/internal/ui/CElementImageProvider.java + * src/org/eclipse/cdt/internal/ui/edito/FileSearchAction.java + 2004-04-23 Alain Magloire Possible NPE. * src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java index 091f3946395..9b92b519cc9 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java @@ -127,14 +127,8 @@ public class TypeInfoLabelProvider extends LabelProvider { public static Image getFileIcon(IPath path) { if (path != null) { - String ext= path.getFileExtension(); - if (ext != null) { - String[] exts = CoreModel.getDefault().getHeaderExtensions(); - for (int i = 0; i < exts.length; i++) { - if (exts[i].equalsIgnoreCase(ext)) { - return HEADER_ICON; - } - } + if (CoreModel.isValidHeaderUnitName(path.lastSegment())) { + return HEADER_ICON; } } return SOURCE_ICON; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java index 142b143d790..5ba04b36aea 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java @@ -18,6 +18,7 @@ import org.eclipse.cdt.core.model.IIncludeReference; import org.eclipse.cdt.core.model.IMethodDeclaration; import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.model.ITemplate; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; import org.eclipse.cdt.ui.CElementImageDescriptor; @@ -106,8 +107,7 @@ public class CElementImageProvider { } else if (element instanceof IFile) { // Check for Non Translation Unit. IFile file = (IFile)element; - CoreModel model = CoreModel.getDefault(); - if (model.isTranslationUnit(file)) { + if (CoreModel.isTranslationUnit(file)) { descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE; Point size= useSmallSize(flags) ? SMALL_SIZE : BIG_SIZE; descriptor = new CElementImageDescriptor(descriptor, 0, size); @@ -280,23 +280,17 @@ public class CElementImageProvider { case ICElement.C_ARCHIVE: return CPluginImages.DESC_OBJS_ARCHIVE; - case ICElement.C_UNIT: - String ext = celement.getPath().getFileExtension(); - if (ext != null) { - String[] exts = CoreModel.getDefault().getHeaderExtensions(); - for (int i = 0; i < exts.length; i++) { - if (exts[i].equalsIgnoreCase(ext)) { - return CPluginImages.DESC_OBJS_TUNIT_HEADER; - } - } - exts = CoreModel.getDefault().getAssemblyExtensions(); - for (int i = 0; i < exts.length; i++) { - if (exts[i].equalsIgnoreCase(ext)) { - return CPluginImages.DESC_OBJS_TUNIT_ASM; - } + case ICElement.C_UNIT: { + ITranslationUnit unit = (ITranslationUnit)celement; + if (unit.isHeaderUnit()) { + return CPluginImages.DESC_OBJS_TUNIT_HEADER; + } else if (unit.isSourceUnit()) { + if (unit.isASMLanguage()) { + return CPluginImages.DESC_OBJS_TUNIT_ASM; } } return CPluginImages.DESC_OBJS_TUNIT; + } case ICElement.C_CCONTAINER: if (celement instanceof ISourceRoot) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/FileSearchAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/FileSearchAction.java index 4dfa85406e7..9b289f11a92 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/FileSearchAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/FileSearchAction.java @@ -83,9 +83,10 @@ public class FileSearchAction extends Action { TextSearchScope scope= TextSearchScope.newWorkspaceScope(); // Add the extensions from the C editor definition for now // FIXME: For C/C++ not all files rely on extension to be C++ for - String[] cexts = CoreModel.getDefault().getTranslationUnitExtensions(); - for (int i = 0; i < cexts.length; i++) { - scope.addExtension("*." + cexts[i]); //$NON-NLS-1$ + String[] patterns = CoreModel.getDefault().getTranslationUnitExtensions(); + for (int i = 0; i < patterns.length; i++) { + //scope.addExtension("*." + cexts[i]); //$NON-NLS-1$ + scope.addExtension(patterns[i]); } // scope.addExtension("*.c"); // scope.addExtension("*.h");