From 111b251b62b324204cc6e376cd114f6429737f8e Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Mon, 17 Dec 2007 15:14:04 +0000
Subject: [PATCH] Shows read and write access of variables in call-hierarchy,
 bug 156692.

---
 .../index/tests/IndexUpdateTests.java         |   1 +
 core/org.eclipse.cdt.ui/icons/ovr16/read.gif  | Bin 0 -> 834 bytes
 .../icons/ovr16/readwrite.gif                 | Bin 0 -> 839 bytes
 core/org.eclipse.cdt.ui/icons/ovr16/write.gif | Bin 0 -> 831 bytes
 .../cdt/internal/ui/CPluginImages.java        |   6 +++-
 .../ui/callhierarchy/CHContentProvider.java   |  10 +++++++
 .../ui/callhierarchy/CHLabelProvider.java     |   6 ++++
 .../cdt/internal/ui/callhierarchy/CHNode.java |  19 ++++++++++--
 .../cdt/ui/CElementImageDescriptor.java       |  28 ++++++++++++++++--
 9 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 core/org.eclipse.cdt.ui/icons/ovr16/read.gif
 create mode 100644 core/org.eclipse.cdt.ui/icons/ovr16/readwrite.gif
 create mode 100644 core/org.eclipse.cdt.ui/icons/ovr16/write.gif

diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexUpdateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexUpdateTests.java
index c0c79fa3b4f..2a33c402919 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexUpdateTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexUpdateTests.java
@@ -88,6 +88,7 @@ public class IndexUpdateTests extends IndexTestBase {
 		if (fCProject == null) {
 			fCProject= CProjectHelper.createCProject("indexUpdateTestsC", null, IPDOMManager.ID_FAST_INDEXER);
 		}
+		CCorePlugin.getIndexManager().joinIndexer(INDEXER_WAIT_TIME, NPM);
 		fIndex= CCorePlugin.getIndexManager().getIndex(new ICProject[] {fCProject, fCppProject});
 	}
 
diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/read.gif b/core/org.eclipse.cdt.ui/icons/ovr16/read.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5a4e725e3a8af1ea1245c189c663463f1a1fd013
GIT binary patch
literal 834
zcmW+#v8q;Q5In+_L<mUg1k}bV50GFn-4($iZ!n~?R1j?EfRACZ7Gj+@m}_fcZ6U0W
zaJvvBS!eIU;rstRJ2N};{r}@9m%sn<*PY|`@z1e!-aO~capv23UZuWVz5jSkKtKTo
z8W;cs2@yq@XkxfS6eN^jp@q@HSWuw~E_7jPiD<|u!$uopgqjUCs^LaArV%j?G^l|G
zJ(vMjoLXXfK^!o>l*l4YHaVHnwj`ElvBeRybcR%{qKjReVr&E^vrL<9ju~SiQnQ+F
zc5|As8fpz|=wT0M2q<D&qw<>2K%ltdswGx0NSR76Rg$HaCb&{oOsh&Rb!kcoF-vEt
zEL&}jl~`jVuxh#0t!X9b7z<I2JnGSmfQr>n*T!7E5f)hFiq#seUK52~aOG>ILL8ca
zGLpuYtGa5!<Vs{&F)h2=HLhH0Ld?<`a#wdvSFSm+#ztVC>ZzFmoS<VYMBYpGz@W*s
z8ftIM9vU*W<|F1c8e1`um9yZ=d!<4gnt(Er##Y;7qs_K@S9H7E^X>ZW+jr-APJZWe
z%*~NApHdJ0y|{H8KODd1<+1;X<Hvi)-Cti^{{80a^{4;;d->|m`yZbD^vlDipI>~%
M^PlftTpW+S0}hqMi2wiq

literal 0
HcmV?d00001

diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/readwrite.gif b/core/org.eclipse.cdt.ui/icons/ovr16/readwrite.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1a563ebafbf34a1d2f9c2bb427e9e403d5d98032
GIT binary patch
literal 839
zcmW+#vC36v5IllGe+c*t0qq1^CB@hz!51)1V6gH5Y=t?!y<J!XA+;|c^QRT@2?F~9
zLbTEll6Cf9IDGf+*_qjy@7|vt{doVulZ)e<<MXj~UOng4apv23UZ(!K{NwFM0s;y!
z(7*s7NQfxHL=(duq9CCJ3oVQm#)1k}aG?uROGHCP88+G&Bh+lDQ4Ke`F^!0Epg|2h
z=)nxI;?xq;3*vz3r9>8KvdPJmwk5Gdi!F|rr8A^r6<zG&6k{VWnPu8+bIceEk($+X
zvzyb5)lh3#Ll1j6LqHMJ8kN_C1_H$uS1qx6LCREmsgf+UG{Kd!Vp>&lsY_Ezh*>&A
zW!Y+Lti&1{fmO?`ZcQse$5@DJ<WY}i1XQesx;EzOjj+HXSFF}(^_nQ`f-7Gu72?nY
zl#w*HT-8+*CRZZMifP%^u5sm36JnOmkh{8Tx^m5lH8ukCR8P$m-~=6GA@W|b2L?^9
z)lhq5_Rx^2H6Jmr(b$TKtegc`-YXU2&;*o`G`89v8*R4LyQ16Oo_{~SdiDExo|E7C
z9CLN#%%{|M|6IRz95;@;d3o%A;<$PH`1Rt$%fHV*pTGbAzh{qM|91KG+gta4`Esv*
RcyaOO&byyK@!@fN{}n!E$^QTV

literal 0
HcmV?d00001

diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/write.gif b/core/org.eclipse.cdt.ui/icons/ovr16/write.gif
new file mode 100644
index 0000000000000000000000000000000000000000..56cfe9975b87aa187b329fbeaa1dc56d0237b803
GIT binary patch
literal 831
zcmW+#J&IIe5PX7*KZ%*qCPpUaDh7p#B6x>#Ged7s0|p+WHxQ3uZ76yLp|7w;B7$x8
zHVofPPghk}eeb<~^Xl32i+jh}@%z|1-F!|r$0@%~r>oS@t1sWL2?!{_Km!ASAR(d%
z6HN?vh=PO?EVM9M7z-*?!G$hNEfEbFW!PwAj8L<oMm5~%#xx?vfd)13pa(O+ic?EW
zFNg!Cml9c|$tEXL+Lpu;Ew(sfmd=ohRdlh7Q;dzkWR_{O%`syvL~2&k&2COJRzs~}
z4L$7P3;{(<YgAqn8VD3uT(!jN1u0YMrAo5Y(gat^ifL8Jr7le=A!g|em1V1~u@Y-+
z1XeA#x;3o?9b+M?kw-n65m2!j>e`sAH^KsoT(MfC)oY@#3$A>vRER?pP)5?&a#dGN
zm|Tf0E2d>vyT+AEO^8`KL+<LX>B==H*4PNlQ$00PfD?3#g~)r!9vC#aRzvNL*+WC7
z)_lagMq?``vT_z&d9PH6LlaO&(%5QyY_!={?}~1Bd;VTuUVc8EPLt<+j=4E<=3DB~
zpWC;N<IeFUe;)fz9Cy!;2j|}&e|Y!u<L!G7-@gBF@%7XFvwuIH{;I3IBQO2~iW<VO

literal 0
HcmV?d00001

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 da3ab14252d..c41ce010512 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
@@ -16,12 +16,13 @@ package org.eclipse.cdt.internal.ui;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
 
+import org.eclipse.cdt.ui.CUIPlugin;
+
 /**
  * Bundle of all images used by the C plugin.
  */
@@ -264,6 +265,9 @@ public class CPluginImages {
     public static final ImageDescriptor DESC_OVR_SYSTEM_INCLUDE= create(T_OVR, "systeminclude_co.gif"); //$NON-NLS-1$
     public static final ImageDescriptor DESC_OVR_DEFINES= create(T_OVR, "defines_co.gif"); //$NON-NLS-1$
     public static final ImageDescriptor DESC_OVR_INACTIVE= create(T_OVR, "inactive_co.gif"); //$NON-NLS-1$
+    public static final ImageDescriptor DESC_OVR_READ_ACCESS= create(T_OVR, "read.gif"); //$NON-NLS-1$
+    public static final ImageDescriptor DESC_OVR_READ_WRITE_ACCESS= create(T_OVR, "readwrite.gif"); //$NON-NLS-1$
+    public static final ImageDescriptor DESC_OVR_WRITE_ACCESS= create(T_OVR, "write.gif"); //$NON-NLS-1$
     
 	public static final ImageDescriptor DESC_OVR_WARNING= create(T_OVR, "warning_co.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_OVR_ERROR= create(T_OVR, "error_co.gif"); //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
index 20252d33f1b..33a7b14deec 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
@@ -197,10 +197,15 @@ public class CHContentProvider extends AsyncTreeContentProvider {
 		if (element instanceof IVariable || element instanceof IEnumerator) {
 			node.setInitializer(true);
 		}
+		boolean readAccess= false;
+		boolean writeAccess= false;
 		for (int i = 0; i < refs.length; i++) {
 			IIndexName reference = refs[i];
 			node.addReference(new CHReferenceInfo(reference.getNodeOffset(), reference.getNodeLength()));
+			readAccess= (readAccess || reference.isReadAccess());
+			writeAccess= (writeAccess || reference.isWriteAccess());
 		}
+		node.setRWAccess(readAccess, writeAccess);
 		node.sortReferencesByOffset();
 		return node;
 	}
@@ -236,11 +241,16 @@ public class CHContentProvider extends AsyncTreeContentProvider {
 			node= new CHMultiDefNode(parent, tu, timestamp, elements);
 		}
 		
+		boolean readAccess= false;
+		boolean writeAccess= false;
 		for (int i = 0; i < references.length; i++) {
 			IIndexName reference = references[i];
 			node.addReference(new CHReferenceInfo(reference.getNodeOffset(), reference.getNodeLength()));
+			readAccess= (readAccess || reference.isReadAccess());
+			writeAccess= (writeAccess || reference.isWriteAccess());
 		}
 		node.sortReferencesByOffset();
+		node.setRWAccess(readAccess, writeAccess);
 		return node;
 	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHLabelProvider.java
index cd62b7f47bf..95975db6c97 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHLabelProvider.java
@@ -142,6 +142,12 @@ public class CHLabelProvider extends LabelProvider implements IColorProvider {
             	}
             }
         }
+        if (node.isReadAccess()) {
+        	flags |= CElementImageDescriptor.READ_ACCESS;
+        }
+        if (node.isWriteAccess()) {
+        	flags |= CElementImageDescriptor.WRITE_ACCESS;
+        }
 
         String key= image.toString()+String.valueOf(flags);
         Image result= (Image) fCachedImages.get(key);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java
index abffc892749..c85532172fa 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java
@@ -28,16 +28,18 @@ import org.eclipse.cdt.internal.ui.util.CoreUtility;
 /**
  * Represents a node in the include browser
  */
-public class CHNode implements IAdaptable {
+public class CHNode implements IAdaptable {	
 	private CHNode fParent;
 	private ICElement fRepresentedDecl;
 	private ITranslationUnit fFileOfReferences;
     private List fReferences;
     
     private int fHashCode;
-    private boolean fIsRecursive;
     private long fTimestamp;
+    private boolean fIsRecursive;
 	private boolean fIsInitializer;
+	private boolean fIsReadAccess;
+	private boolean fIsWriteAccess;
 
     /**
      * Creates a new node for the include browser
@@ -175,4 +177,17 @@ public class CHNode implements IAdaptable {
 			Collections.sort(fReferences, CHReferenceInfo.COMPARE_OFFSET);
 		}
 	}
+
+	public void setRWAccess(boolean readAccess, boolean writeAccess) {
+		fIsReadAccess= readAccess;
+		fIsWriteAccess= writeAccess;
+	}
+
+	public boolean isReadAccess() {
+		return fIsReadAccess;
+	}
+
+	public boolean isWriteAccess() {
+		return fIsWriteAccess;
+	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java
index 4180f298107..a9906412995 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java
@@ -12,13 +12,13 @@
  *******************************************************************************/
 package org.eclipse.cdt.ui;
 
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.resource.CompositeImageDescriptor;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.Point;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.core.runtime.Assert;
 
 
 /**
@@ -91,6 +91,12 @@ public class CElementImageDescriptor extends CompositeImageDescriptor {
     /** Flag to render the 'inactive' adornment for include directives */
     public final static int INACTIVE= 0x8000;      
 
+    /** Flag to render the 'read access' adornment for references to variables or fields */
+	public static final int READ_ACCESS = 0x10000;      
+
+    /** Flag to render the 'read access' adornment for references to variables or fields */
+	public static final int WRITE_ACCESS = 0x20000;      
+
 	private ImageDescriptor fBaseImage;
 	private int fFlags;
 	private Point fSize;
@@ -270,6 +276,22 @@ public class CElementImageDescriptor extends CompositeImageDescriptor {
 			data= CPluginImages.DESC_OVR_INACTIVE.getImageData();
 			drawImage(data, 0, 0);
 		} 
+		
+		final boolean isReadAccess= (fFlags & READ_ACCESS) != 0;
+		final boolean isWriteAccess= (fFlags & WRITE_ACCESS) != 0;
+		if (isReadAccess) {
+			if (isWriteAccess) {
+				data= CPluginImages.DESC_OVR_READ_WRITE_ACCESS.getImageData();
+			}
+			else {
+				data= CPluginImages.DESC_OVR_READ_ACCESS.getImageData();
+			}
+			drawImage(data, 0, 0);
+		}
+		else if (isWriteAccess) {
+			data= CPluginImages.DESC_OVR_WRITE_ACCESS.getImageData();
+			drawImage(data, 0, 0);
+		}
 	}		
 
 	private void drawBottomLeft() {