[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] ILibraryReference cdt.ui
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.79
diff -u -r1.79 ChangeLog
--- ChangeLog 2 Apr 2003 15:06:19 -0000 1.79
+++ ChangeLog 3 Apr 2003 04:26:16 -0000
@@ -1,5 +1,16 @@
2003-04-02 Alain Magloire
+ Show LibraryReference in the CViewer.
+
+ * src/org/eclipse/internal/ui/cview/CViewSorter.java:
+ * src/org/eclipse/internal/ui/BaseCElementContentProvider.java:
+ Call CProject.getLibraryReferences().
+ * src/org/eclipse/internal/ui/CElementImagerProvider.java:
+ * src/org/eclipse/internal/ui/CPluginImages.java:
+ lib_obj.gif.
+
+2003-04-02 Alain Magloire
+
Bug fix and cleanup in CView
* src/org/eclipse/internal/ui/cview/CView.java:
Index: src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java,v
retrieving revision 1.5
diff -u -r1.5 BaseCElementContentProvider.java
--- src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java 31 Mar 2003 03:52:56 -0000 1.5
+++ src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java 3 Apr 2003 04:26:18 -0000
@@ -18,6 +18,7 @@
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICModel;
import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.ILibraryReference;
import org.eclipse.cdt.core.model.IParent;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.core.resources.IContainer;
@@ -210,6 +211,11 @@
IBinaryContainer bins = cproject.getBinaryContainer();
if (bins.hasChildren()) {
objects = concatenate(objects, new Object[] {bins});
+ }
+ try {
+ ILibraryReference[] refs = cproject.getLibraryReferences();
+ objects = concatenate(objects, refs);
+ } catch (CModelException e) {
}
return objects;
}
Index: src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java,v
retrieving revision 1.10
diff -u -r1.10 CElementImageProvider.java
--- src/org/eclipse/cdt/internal/ui/CElementImageProvider.java 1 Apr 2003 18:41:54 -0000 1.10
+++ src/org/eclipse/cdt/internal/ui/CElementImageProvider.java 3 Apr 2003 04:26:19 -0000
@@ -10,6 +10,7 @@
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IDeclaration;
+import org.eclipse.cdt.core.model.ILibraryReference;
import org.eclipse.cdt.core.model.IMember;
import org.eclipse.cdt.core.model.IMethodDeclaration;
import org.eclipse.cdt.core.model.IField;
@@ -162,6 +163,8 @@
case ICElement.C_VCONTAINER:
if (celement instanceof IBinaryModule) {
return CPluginImages.DESC_OBJS_BINARY;
+ } else if (celement instanceof ILibraryReference) {
+ return CPluginImages.DESC_OBJS_LIBRARY;
}
return CPluginImages.DESC_OBJS_CONTAINER;
Index: src/org/eclipse/cdt/internal/ui/CPluginImages.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java,v
retrieving revision 1.7
diff -u -r1.7 CPluginImages.java
--- src/org/eclipse/cdt/internal/ui/CPluginImages.java 1 Apr 2003 18:41:54 -0000 1.7
+++ src/org/eclipse/cdt/internal/ui/CPluginImages.java 3 Apr 2003 04:26:20 -0000
@@ -68,6 +68,7 @@
public static final String IMG_OBJS_CEXEC_DEBUG= NAME_PREFIX + "exec_dbg_obj.gif";
public static final String IMG_OBJS_CORE= NAME_PREFIX + "core_obj.gif";
public static final String IMG_OBJS_CONTAINER= NAME_PREFIX + "container_obj.gif";
+ public static final String IMG_OBJS_LIBRARY= NAME_PREFIX + "lib_obj.gif";
// Breakpoint images
public static final String IMG_OBJS_BREAKPOINT = NAME_PREFIX + "breakpoint.gif";
@@ -99,6 +100,7 @@
public static final ImageDescriptor DESC_OBJS_CEXEC_DEBUG= createManaged(T_OBJ, IMG_OBJS_CEXEC_DEBUG);
public static final ImageDescriptor DESC_OBJS_CORE= createManaged(T_OBJ, IMG_OBJS_CORE);
public static final ImageDescriptor DESC_OBJS_CONTAINER= createManaged(T_OBJ, IMG_OBJS_CONTAINER);
+ public static final ImageDescriptor DESC_OBJS_LIBRARY= createManaged(T_OBJ, IMG_OBJS_LIBRARY);
// Breakpoint image descriptors
public static final ImageDescriptor DESC_OBJS_BREAKPOINT = createManaged( T_OBJ, IMG_OBJS_BREAKPOINT );
Index: src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java,v
retrieving revision 1.4
diff -u -r1.4 CViewSorter.java
--- src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java 27 Mar 2003 16:12:17 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java 3 Apr 2003 04:26:21 -0000
@@ -18,6 +18,7 @@
import org.eclipse.cdt.core.model.IFunction;
import org.eclipse.cdt.core.model.IFunctionDeclaration;
import org.eclipse.cdt.core.model.IInclude;
+import org.eclipse.cdt.core.model.ILibraryReference;
import org.eclipse.cdt.core.model.IMacro;
import org.eclipse.cdt.core.model.IMethod;
import org.eclipse.cdt.core.model.IMethodDeclaration;
@@ -109,19 +110,21 @@
return 134;
}
return 140;
+ } else if (element instanceof IArchive) {
+ return 150;
+ } else if (element instanceof IBinary) {
+ return 160;
+ } else if (element instanceof ILibraryReference) {
+ return 170;
} else if (element instanceof ICElement) {
String name = ((ICElement)element).getElementName();
if (name.startsWith("__")) {
- return 142;
+ return 172;
}
if (name.charAt(0) == '_') {
- return 144;
+ return 174;
}
- return 150;
- } else if (element instanceof IArchive) {
- return 160;
- } else if (element instanceof IBinary) {
- return 170;
+ return 180;
}
return 200;
}
