mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

New icon fo the namespace.

Browse source
This commit is contained in:
Alain Magloire 2004-03-30 15:18:24 +00:00
parent ad8331a061
commit 656d676a73
5 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,14 @@
2004-03-30 Alain Magloire
Change the icons of the Namespace, folks found it
confusing to reuse the same icons as the Java package.
* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
* src/org/eclipse/cdt/internal/ui/CPluginImages.java
* src/org/eclipse/cdt/internal/ui/compare/CParserTreeBuilder.java
* icons/full/obj16/namesapce_obj.gif
2004-03-30 Alain Magloire
Fix PR 56734

BIN
core/org.eclipse.cdt.ui/icons/full/obj16/namespace_obj.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 133 B

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

@ -152,7 +152,7 @@ public class CElementImageProvider {
case ICElement.C_CLASS:
case ICElement.C_TEMPLATE_CLASS:
return CPluginImages.DESC_OBJS_CLASS;
case ICElement.C_UNION:
case ICElement.C_TEMPLATE_UNION:
return CPluginImages.DESC_OBJS_UNION;
@ -195,7 +195,7 @@ public class CElementImageProvider {
return CPluginImages.DESC_OBJS_MACRO;
case ICElement.C_NAMESPACE:
return CPluginImages.DESC_OBJS_CONTAINER;
return CPluginImages.DESC_OBJS_NAMESPACE;
}
return null;
}
@ -461,7 +461,7 @@ public class CElementImageProvider {
}
public static ImageDescriptor getVariableImageDescriptor(){
return CPluginImages.DESC_OBJS_VARIABLE;
return getImageDescriptor(ICElement.C_VARIABLE);
}
public static ImageDescriptor getLocalVariableImageDescriptor(){
@ -469,27 +469,27 @@ public class CElementImageProvider {
}
public static ImageDescriptor getFunctionImageDescriptor(){
return CPluginImages.DESC_OBJS_FUNCTION;
return getImageDescriptor(ICElement.C_FUNCTION);
}
public static ImageDescriptor getVariableDeclarationImageDescriptor(){
return CPluginImages.DESC_OBJS_VAR_DECLARARION;
return getImageDescriptor(ICElement.C_VARIABLE_DECLARATION);
}
public static ImageDescriptor getFunctionDeclarationImageDescriptor(){
return CPluginImages.DESC_OBJS_DECLARARION;
return getImageDescriptor(ICElement.C_FUNCTION_DECLARATION);
}
public static ImageDescriptor getIncludeImageDescriptor(){
return CPluginImages.DESC_OBJS_INCLUDE;
return getImageDescriptor(ICElement.C_INCLUDE);
}
public static ImageDescriptor getMacroImageDescriptor(){
return CPluginImages.DESC_OBJS_MACRO;
return getImageDescriptor(ICElement.C_MACRO);
}
public static ImageDescriptor getNamespaceImageDescriptor(){
return CPluginImages.DESC_OBJS_CONTAINER;
return getImageDescriptor(ICElement.C_NAMESPACE);
}
}

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

@ -8,7 +8,7 @@ package org.eclipse.cdt.internal.ui;
import java.net.MalformedURLException;
import java.net.URL;
import org.eclipse.cdt.ui.*;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
@ -47,6 +47,7 @@ public class CPluginImages {
public static final String IMG_OBJS_VARIABLE= NAME_PREFIX + "variable_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_LOCAL_VARIABLE= NAME_PREFIX + "variable_local_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_CLASS= NAME_PREFIX + "class_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_NAMESPACE= NAME_PREFIX + "namespace_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_STRUCT= NAME_PREFIX + "struct_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_UNION= NAME_PREFIX + "union_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_TYPEDEF= NAME_PREFIX + "typedef_obj.gif"; //$NON-NLS-1$
@ -94,6 +95,7 @@ public class CPluginImages {
public static final ImageDescriptor DESC_OBJS_VARIABLE= createManaged(T_OBJ, IMG_OBJS_VARIABLE);
public static final ImageDescriptor DESC_OBJS_LOCAL_VARIABLE= createManaged(T_OBJ, IMG_OBJS_LOCAL_VARIABLE);
public static final ImageDescriptor DESC_OBJS_CLASS= createManaged(T_OBJ, IMG_OBJS_CLASS);
public static final ImageDescriptor DESC_OBJS_NAMESPACE= createManaged(T_OBJ, IMG_OBJS_NAMESPACE);
public static final ImageDescriptor DESC_OBJS_STRUCT= createManaged(T_OBJ, IMG_OBJS_STRUCT);
public static final ImageDescriptor DESC_OBJS_UNION= createManaged(T_OBJ, IMG_OBJS_UNION);
public static final ImageDescriptor DESC_OBJS_TYPEDEF= createManaged(T_OBJ, IMG_OBJS_TYPEDEF);
@ -253,7 +255,7 @@ public class CPluginImages {
}
/**
* Helper method to access the image registry from the JavaPlugin class.
* Helper method to access the image registry from the CUIPlugin class.
*/
static ImageRegistry getImageRegistry() {
return imageRegistry;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java
View file

@ -105,7 +105,7 @@ public class CParseTreeBuilder extends SourceElementRequestorAdapter {
* @see org.eclipse.cdt.core.parser.ISourceElementRequestor#enterNamespaceDefinition(org.eclipse.cdt.core.parser.ast.IASTNamespaceDefinition)
*/
public void enterNamespaceDefinition(IASTNamespaceDefinition namespaceDefinition) {
push(ICElement.C_NAMESPACE, namespaceDefinition.getName(), namespaceDefinition.getStartingOffset());;
push(ICElement.C_NAMESPACE, namespaceDefinition.getName(), namespaceDefinition.getStartingOffset());
}
/* (non-Javadoc)