Skip to main content
summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlain Magloire2004-03-30 10:18:24 -0500
committerAlain Magloire2004-03-30 10:18:24 -0500
commit656d676a739d4e0358e9706fd5d9c9f991f369e5 (patch)
tree0e1837de39bd56f157d22b2979792621c4377c20 /core
parentad8331a0611b41e5ed2676f94c9e153fc1c241f5 (diff)
downloadorg.eclipse.cdt-656d676a739d4e0358e9706fd5d9c9f991f369e5.tar.gz
org.eclipse.cdt-656d676a739d4e0358e9706fd5d9c9f991f369e5.tar.xz
org.eclipse.cdt-656d676a739d4e0358e9706fd5d9c9f991f369e5.zip
New icon fo the namespace.
Diffstat (limited to 'core')
-rw-r--r--core/org.eclipse.cdt.ui/ChangeLog11
-rw-r--r--core/org.eclipse.cdt.ui/icons/full/obj16/namespace_obj.gifbin0 -> 133 bytes
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java18
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java2
5 files changed, 25 insertions, 12 deletions
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index f042d4d79b..36efae0f5b 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,5 +1,16 @@
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
* src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/namespace_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/namespace_obj.gif
new file mode 100644
index 0000000000..85554c5e40
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/full/obj16/namespace_obj.gif
Binary files differ
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 dacae9f450..c6e9f9193b 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
@@ -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);
}
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
index 1ed598baf6..7acf680a0d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
@@ -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;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java
index cf8c4f1f11..05b25e8420 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java
@@ -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)

Back to the top