Attachment 16952 Details for Bug 74559 – patch to org.eclipse.debug.ui

[patch] patch to org.eclipse.debug.ui

ui.txt (text/plain), 24.98 KB, created by Samantha Chan

on 2005-01-05 15:33:40 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Samantha Chan

Created: 2005-01-05 15:33:40 EST

Size: 24.98 KB

patch

obsolete

>Index: ui/org/eclipse/debug/internal/ui/views/memory/ASCIIRenderer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ASCIIRenderer.java,v
>retrieving revision 1.3
>diff -u -r1.3 ASCIIRenderer.java
>--- ui/org/eclipse/debug/internal/ui/views/memory/ASCIIRenderer.java	10 Nov 2004 22:19:53 -0000	1.3
>+++ ui/org/eclipse/debug/internal/ui/views/memory/ASCIIRenderer.java	5 Jan 2005 20:22:19 -0000
>@@ -49,7 +49,7 @@
> 		byte[] bytes =  super.getBytes(renderingId, address, currentValues, data);
> 		
> 		// undo the replacement of 1's to 0's.
>-		for (int i=0; i<bytes.length; i++)
>+		for (int i=0; i<bytes.length && i < currentValues.length; i++)
> 		{
> 			if (bytes[i] == 1 && currentValues[i].getValue() == 0)
> 			{
>Index: ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockViewSynchronizer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockViewSynchronizer.java,v
>retrieving revision 1.3
>diff -u -r1.3 IMemoryBlockViewSynchronizer.java
>--- ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockViewSynchronizer.java	6 Dec 2004 20:57:38 -0000	1.3
>+++ ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockViewSynchronizer.java	5 Jan 2005 20:22:19 -0000
>@@ -71,11 +71,12 @@
> 	 * A change event will be fired if the value provided is different from the
> 	 * value stored in the synchronizer.  Otherwise, no change event will be
> 	 * fired.
>+	 * @param eventSrc
> 	 * @param memoryBlock
> 	 * @param propertyId
> 	 * @param value
> 	 */
>-	public void setSynchronizedProperty(IMemoryBlock memoryBlock, String propertyId, Object value);
>+	public void setSynchronizedProperty(Object eventSrc, IMemoryBlock memoryBlock, String propertyId, Object value);
> 	
> 	/**
> 	 * Get the property from the synchronizer for a memory block
>Index: ui/org/eclipse/debug/internal/ui/views/memory/ISynchronizedMemoryBlockView.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ISynchronizedMemoryBlockView.java,v
>retrieving revision 1.2
>diff -u -r1.2 ISynchronizedMemoryBlockView.java
>--- ui/org/eclipse/debug/internal/ui/views/memory/ISynchronizedMemoryBlockView.java	9 Nov 2004 15:22:55 -0000	1.2
>+++ ui/org/eclipse/debug/internal/ui/views/memory/ISynchronizedMemoryBlockView.java	5 Jan 2005 20:22:19 -0000
>@@ -33,7 +33,7 @@
> 	 * @param propertyId
> 	 * @param value
> 	 */
>-	public void propertyChanged(String propertyId, Object value);
>+	public void propertyChanged(Object eventSrc, String propertyId, Object value);
> 	
> 	/**
> 	 * Return the value of a property.  Return null if the property
>Index: ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlockViewSynchronizer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlockViewSynchronizer.java,v
>retrieving revision 1.6
>diff -u -r1.6 MemoryBlockViewSynchronizer.java
>--- ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlockViewSynchronizer.java	6 Dec 2004 20:57:38 -0000	1.6
>+++ ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlockViewSynchronizer.java	5 Jan 2005 20:22:19 -0000
>@@ -110,7 +110,7 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.debug.ui.IMemoryBlockViewSynchronizer#setSynchronizedProperty(org.eclipse.debug.ui.ISynchronizedMemoryBlockView, java.lang.String, java.lang.Object)
> 	 */
>-	public void setSynchronizedProperty(IMemoryBlock memoryBlock, String propertyId, Object value)
>+	public void setSynchronizedProperty(Object eventSrc, IMemoryBlock memoryBlock, String propertyId, Object value)
> 	{
> 		// find the synchronize info object for the memory block
> 		SynchronizeInfo info = (SynchronizeInfo)fSynchronizeInfo.get(memoryBlock);
>@@ -130,7 +130,7 @@
> 			// if the value has never been added to the info object
> 			// set the property and fire a change event
> 			info.setProperty(propertyId, value);
>-			info.firePropertyChanged(propertyId);
>+			info.firePropertyChanged(eventSrc, propertyId);
> 			return;
> 		}
> 		else if (!oldValue.equals(value))
>@@ -138,7 +138,7 @@
> 			// if the value has changed
> 			// set the property and fire a change event
> 			info.setProperty(propertyId, value);
>-			info.firePropertyChanged(propertyId);
>+			info.firePropertyChanged(eventSrc, propertyId);
> 		}
> 	}
> 
>Index: ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java,v
>retrieving revision 1.18
>diff -u -r1.18 MemoryViewTab.java
>--- ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java	15 Dec 2004 22:03:16 -0000	1.18
>+++ ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java	5 Jan 2005 20:22:19 -0000
>@@ -114,12 +114,15 @@
> 	
> 	private int fBytePerLine;								// number of bytes per line: 16
> 	private int fColumnSize;								// number of bytes per column:  1,2,4,8
>+	private int fAddressibleSize;
> 	
> 	// font change listener
> 	private FontChangeListener fFontChangeListener;
> 	private TabFolderDisposeListener fTabFolderDisposeListener;
> 	
> 	private boolean fUpdateTabLabel = true;
>+	
>+	private EventHandleLock fEvtHandleLock = new EventHandleLock(); 
> 
> 	private static final int[] ignoreEvents =
> 	{
>@@ -158,7 +161,36 @@
> 		SWT.CTRL,
> 		SWT.ALT
> 	};
>-	private int fAddressibleSize;
>+	
>+	private class EventHandleLock
>+	{
>+		Object fOwner;
>+		
>+		public boolean acquireLock(Object client)
>+		{
>+			if (fOwner == null)
>+			{
>+				fOwner = client;
>+				return true;
>+			}
>+			return false;
>+		}
>+		
>+		public boolean releaseLock(Object client)
>+		{
>+			if (fOwner == client)
>+			{
>+				fOwner = null;
>+				return true;
>+			}
>+			return false;
>+		}
>+		
>+		public boolean isLocked()
>+		{
>+			return (fOwner != null);
>+		}
>+	}
> 	
> 	private final class TabFolderDisposeListener implements DisposeListener
> 	{
>@@ -218,7 +250,7 @@
> 
> 		if (fTableViewer != null)
> 		{	
>-			fTableViewer.getTable().setTopIndex(TABLE_PREBUFFER);
>+			setTopIndex(fTableViewer.getTable(),  TABLE_PREBUFFER);
> 		}
> 		
> 		addViewTabToSynchronizer();
>@@ -255,6 +287,13 @@
> 				displayError(e);				
> 			}
> 		}
>+		
>+		if (!isDisplayingError())
>+		{
>+			updateSyncColSize();
>+			updateSyncTopAddress(true);
>+			updateSyncSelectedAddress(true);
>+		}
> 	}
> 	
> 	private void addViewTabToSynchronizer()
>@@ -289,15 +328,22 @@
> 	 */
> 	private void updateSyncSelectedAddress(boolean update) {
> 		
>+		if (!fTabCreated)
>+			return;
>+		
> 		if (update)
>-			getMemoryBlockViewSynchronizer().setSynchronizedProperty(getMemoryBlock(), IMemoryViewConstants.PROPERTY_SELECTED_ADDRESS, fSelectedAddress);
>+			getMemoryBlockViewSynchronizer().setSynchronizedProperty(this, getMemoryBlock(), IMemoryViewConstants.PROPERTY_SELECTED_ADDRESS, fSelectedAddress);
> 	}
> 
> 	/**
> 	 * update column size in synchronizer
> 	 */
> 	private void updateSyncColSize() {
>-		getMemoryBlockViewSynchronizer().setSynchronizedProperty(getMemoryBlock(), IMemoryViewConstants.PROPERTY_COL_SIZE, new Integer(fColumnSize));
>+		
>+		if (!fTabCreated)
>+			return;
>+		
>+		getMemoryBlockViewSynchronizer().setSynchronizedProperty(this, getMemoryBlock(), IMemoryViewConstants.PROPERTY_COL_SIZE, new Integer(fColumnSize));
> 	}
> 	
> 	/**
>@@ -305,9 +351,12 @@
> 	 */
> 	protected void updateSyncTopAddress(boolean updateToSynchronizer) {
> 		
>+		if (!fTabCreated)
>+			return;
>+		
> 		if (updateToSynchronizer)
> 		{
>-			getMemoryBlockViewSynchronizer().setSynchronizedProperty(getMemoryBlock(), IMemoryViewConstants.PROPERTY_TOP_ADDRESS, getTopVisibleAddress());
>+			getMemoryBlockViewSynchronizer().setSynchronizedProperty(this, getMemoryBlock(), IMemoryViewConstants.PROPERTY_TOP_ADDRESS, getTopVisibleAddress());
> 		}
> 	}
> 
>@@ -436,7 +485,7 @@
> 	private Control createFolderPage(AbstractMemoryRenderer renderer) {
> 		
> 		contentProvider = new MemoryViewContentProvider(fMemoryBlock, fTabItem);
>-		fTableViewer= new TableViewer(fTabItem.getParent(),  SWT.FULL_SELECTION | SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.HIDE_SELECTION | SWT.BORDER);
>+		fTableViewer= new TableViewer(fTabItem.getParent(),   SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.HIDE_SELECTION | SWT.BORDER);
> 		fTableViewer.setContentProvider(contentProvider);		
> 		
> 		if (renderer != null)
>@@ -726,14 +775,14 @@
> 	 */
> 	private void refreshTableViewer() {
> 		
>-		int i = fTableViewer.getTable().getTopIndex();
>+		int i = getTopVisibleIndex(fTableViewer.getTable());
> 		
> 		// refresh if the view is already created
> 		fTableViewer.refresh();
> 		
> 		// if top index has changed, restore it
>-		if (i != fTableViewer.getTable().getTopIndex())
>-			fTableViewer.getTable().setTopIndex(i);
>+		if (i != getTopVisibleIndex(fTableViewer.getTable()))
>+			setTopIndex(fTableViewer.getTable(),  i);
> 	}
> 
> 	private void setColumnHeadings()
>@@ -902,19 +951,26 @@
> 	 */
> 	protected void updateTableSelection()
> 	{
>+		
>+		MemoryViewUtil.linuxWorkAround(fTableViewer.getTable());
>+		
> 		// do not update selection if address is out of range
> 		// otherwise, screws up top index
> 		if (isAddressOutOfRange(fSelectedAddress))
> 			return;
> 		
> 		int index = findAddressIndex(getTopVisibleAddress());
>-
> 		// update table selection
> 		fTableViewer.getTable().setSelection(fCursorManager.fRow);
>+	
>+		
>+		MemoryViewUtil.linuxWorkAround(fTableViewer.getTable());
> 		
> 		// if top index has changed, restore
>-		if (fTableViewer.getTable().getTopIndex() != index)
>-			fTableViewer.getTable().setTopIndex(index);
>+		if (getTopVisibleIndex(fTableViewer.getTable()) != index)
>+			setTopIndex(fTableViewer.getTable(),  index);
>+		
>+		MemoryViewUtil.linuxWorkAround(fTableViewer.getTable());
> 	}
> 	
> 	/**
>@@ -1015,6 +1071,10 @@
> 						case SWT.PAGE_DOWN :
> 						case SWT.ARROW_DOWN :
> 						case SWT.ARROW_RIGHT:
>+							
>+							if (!fEvtHandleLock.acquireLock(this))
>+								return;
>+							
> 							// If blocking an extended memory block,
> 							// check to see if additional memory needs to be obtained.
> 							if (fMemoryBlock instanceof IMemoryBlockExtension)
>@@ -1032,6 +1092,7 @@
> 									updateSyncSelectedAddress(true);
> 									
> 									fCursorManager.setCursorFocus();
>+									fEvtHandleLock.releaseLock(this);
> 									break;
> 								}
> 								//if we are approaching the limits of the currently loaded memory, reload the table
>@@ -1044,6 +1105,7 @@
> 										if (topAddress.equals(BigInteger.valueOf(0)))
> 										{
> 											// do not reload if we are already at zero
>+											fEvtHandleLock.releaseLock(this);
> 											break;
> 										}
> 										reloadTable(BigInteger.valueOf(0), false);
>@@ -1077,7 +1139,7 @@
> 									// when it is selected
> 								}
> 						}
>-
>+							fEvtHandleLock.releaseLock(this);
> 							break;
> 						default :
> 							
>@@ -1112,7 +1174,7 @@
> 			return BigInteger.valueOf(0);
> 
> 		Table table = fTableViewer.getTable();
>-		int topIndex = table.getTopIndex();
>+		int topIndex = getTopVisibleIndex(table);
> 
> 		if (topIndex < 1) { topIndex = 0; }
> 
>@@ -1131,7 +1193,6 @@
> 			}
> 			
> 			BigInteger bigInt = new BigInteger(calculatedAddress, 16);
>-			
> 			return bigInt;
> 		}
> 		return BigInteger.valueOf(0);
>@@ -1171,7 +1232,6 @@
> 			numLines = getNumberOfVisibleLines()+TABLE_PREBUFFER+TABLE_POSTBUFFER;
> 		}
> 
>-
> 		// tell content provider to get memory and refresh
> 		contentProvider.getMemoryToFitTable(topBufferAddress, numLines, updateDelta);
> 		contentProvider.forceRefresh();
>@@ -1183,7 +1243,7 @@
> 			
> 			if (topIdx != -1)
> 			{
>-				table.setTopIndex(topIdx);
>+				setTopIndex(table, topIdx);
> 			}
> 			
> 			// TODO:  Revisit this part again
>@@ -1203,8 +1263,10 @@
> 				
> 				if (newIdx != topIdx  && topIdx != -1)
> 				{	
>-					table.setTopIndex(topIdx);
>+					setTopIndex(table, topIdx);
> 				}
>+				
>+				MemoryViewUtil.linuxWorkAround(table);
> 							
> 				if (isAddressVisible(fSelectedAddress))
> 				{
>@@ -1223,6 +1285,8 @@
> 		
> 		// try to display the table every time it's reloaded
> 		displayTable();
>+		
>+		MemoryViewUtil.linuxWorkAround(fTableViewer.getTable());
> 	}
> 	
> 	private int findAddressIndex(BigInteger address)
>@@ -1283,19 +1347,22 @@
> 		// setting cursor selection or table selection changes
> 		// the top index of the table... and may mess up top index in the talbe
> 		// save up old top index
>-		int oldTop = fTableViewer.getTable().getTopIndex();
>+		int oldTop = getTopVisibleIndex(fTableViewer.getTable());
> 		
> 		// update cursor position and table selection
> 		fCursorManager.updateCursorPosition(row, col, isAddressVisible(fSelectedAddress));
> 		updateTableSelection();
> 
> 		// reset top index to make sure the table is not moved
>-		fTableViewer.getTable().setTopIndex(oldTop);
>+		if (!MemoryViewUtil.isLinuxGTK())
>+			setTopIndex(fTableViewer.getTable(),  oldTop);
> 		
> 		if (isAddressVisible(fSelectedAddress))
> 		{	
> 			fCursorManager.showCursor();
>-			fTableViewer.getTable().deselectAll();
>+			
>+			if (!MemoryViewUtil.isLinuxGTK())
>+				fTableViewer.getTable().deselectAll();
> 		}
> 		else
> 			fCursorManager.hideCursor();
>@@ -1423,7 +1490,7 @@
> 				if (table.isDisposed())
> 					return;
> 				
>-				int topIndex = table.getTopIndex();
>+				int topIndex = getTopVisibleIndex(table);
> 				if (topIndex < 0)
> 				{
> 					return;
>@@ -1468,14 +1535,18 @@
> 					// since the position may change
> 					
> 					updateCursorPosition();
>-					fTableViewer.getTable().deselectAll();
>+
>+					// this is commented out to reduce the amount
>+					// of flashing happening on Linux GTK
>+					if (!MemoryViewUtil.isLinuxGTK())
>+						fTableViewer.getTable().deselectAll();
> 					
> 					if (!getTopVisibleAddress().equals(oldTopAddress))
> 					{	
> 						int i = findAddressIndex(oldTopAddress);
> 						
> 						if (i != -1)
>-							fTableViewer.getTable().setTopIndex(i);
>+							setTopIndex(fTableViewer.getTable(),  i);
> 					}
> 				}
> 				
>@@ -1488,8 +1559,14 @@
> 	 * Handle scrollling and reload table if necessary
> 	 * @param event
> 	 */
>-	private void handleScrollBarSelection(SelectionEvent event)
>-	{	
>+	private synchronized void handleScrollBarSelection(SelectionEvent event)
>+	{
>+		if (fEvtHandleLock.isLocked())
>+			return;
>+		
>+		if (!fTabCreated)
>+			return;
>+		
> 		if (!(fMemoryBlock instanceof IMemoryBlockExtension))
> 		{
> 			// if not instance of extended memory block
>@@ -1503,7 +1580,7 @@
> 		
> 		// Must run on UI Thread asynchronously
> 		// Otherwise, another event could have been recevied before the reload is completed
>-		Display.getDefault().asyncExec(new Runnable()
>+		Display.getDefault().syncExec(new Runnable()
> 		{
> 			public void run()
> 			{
>@@ -1511,6 +1588,7 @@
> 				{
> 					switch (evt.detail)
> 					{
>+						case 0:
> 						case SWT.DRAG :
> 						case SWT.END :
> 						case SWT.PAGE_DOWN :
>@@ -1518,6 +1596,10 @@
> 						case SWT.HOME :
> 						case SWT.PAGE_UP :
> 						case SWT.ARROW_UP :
>+							
>+							if (!fEvtHandleLock.acquireLock(this))
>+								return;
>+							
> 							if (fMemoryBlock instanceof IMemoryBlockExtension)
> 							{
> 								updateSyncTopAddress(true);
>@@ -1525,12 +1607,14 @@
> 								if (needMoreLines())
> 								{
> 									BigInteger topAddress = getTopVisibleAddress();
>+									
> 									//if we're near 0, just go there immediately (hard stop at 0, don't try to scroll/wrap)
> 									if (topAddress.compareTo(BigInteger.valueOf(96)) <= 0)
> 									{
> 										if (topAddress.equals(BigInteger.valueOf(0)))
> 										{
> 											// do not reload if we are already at zero
>+											fEvtHandleLock.releaseLock(this);
> 											break;
> 										}
> 										reloadTable(BigInteger.valueOf(0), false);
>@@ -1548,6 +1632,7 @@
> 								updateCursorPosition();
> 								fCursorManager.setCursorFocus();
> 							}
>+							fEvtHandleLock.releaseLock(this);
> 							break;
> 						default:
> 							break;
>@@ -1819,7 +1904,7 @@
> 				// go to top of the table 
> 				BigInteger address = BigInteger.valueOf(mem.getStartAddress());
> 				setSelectedAddress(address, true);
>-				getTableViewer().getTable().setTopIndex(0);
>+				setTopIndex(fTableViewer.getTable(),  0);
> 				updateCursorPosition();
> 				updateTableSelection();
> 				setCursorFocus();
>@@ -1938,17 +2023,17 @@
> 	 */
> 	public void setFont(Font font)
> 	{	
>-		int oldIdx = fTableViewer.getTable().getTopIndex();
>+		int oldIdx = getTopVisibleIndex(fTableViewer.getTable());
> 		
> 		// BUG in table, if font is changed when table is not starting
> 		// from the top, causes table gridline to be misaligned.
>-		fTableViewer.getTable().setTopIndex(0);
>+		setTopIndex(fTableViewer.getTable(),  0);
> 		
> 		// set font
> 		fTableViewer.getTable().setFont(font);
> 		fCursorManager.setFont(font);
> 		
>-		fTableViewer.getTable().setTopIndex(oldIdx);
>+		setTopIndex(fTableViewer.getTable(),  oldIdx);
> 		
> 		packColumns();
> 		
>@@ -2012,6 +2097,9 @@
> 			return;
> 		}
> 		
>+		if (!fEvtHandleLock.acquireLock(this))
>+			return;
>+		
> 		try
> 		{
> 			if (!fSelectedAddress.equals(address))
>@@ -2034,6 +2122,7 @@
> 		{
> 			displayError(e);
> 		}
>+		fEvtHandleLock.releaseLock(this);
> 	}
> 	
> 	/**
>@@ -2048,6 +2137,9 @@
> 			if (!isEnabled())
> 				return;
> 			
>+			if (!fEvtHandleLock.acquireLock(this))
>+				return;
>+			
> 			if (!address.equals(getTopVisibleAddress()))
> 			{
> 				if (getMemoryBlock() instanceof IMemoryBlockExtension)
>@@ -2074,7 +2166,7 @@
> 						if (index >= 3 && table.getItemCount() - (index+getNumberOfVisibleLines()) >= 3)
> 						{
> 							// update cursor position
>-							table.setTopIndex(index);
>+							setTopIndex(table, index);
> 							
> 							if (!isAddressVisible(fSelectedAddress))
> 							{
>@@ -2084,7 +2176,7 @@
> 							{
> 								updateCursorPosition();
> 								updateTableSelection();
>-								table.setTopIndex(index);
>+								setTopIndex(table,  index);
> 								
> 								// BUG 64831:  to get around SWT problem with
> 								// the table cursor not painted properly after
>@@ -2127,7 +2219,7 @@
> 					
> 					if (index >= 0)
> 					{
>-						table.setTopIndex(index);
>+						setTopIndex(table,  index);
> 								
> 						if (!isAddressVisible(fSelectedAddress))
> 						{
>@@ -2137,7 +2229,7 @@
> 						{
> 							updateCursorPosition();
> 							updateTableSelection();
>-							table.setTopIndex(index);
>+							setTopIndex(table,  index);
> 							
> 							// BUG 64831:  to get around SWT problem with
> 							// the table cursor not painted properly after
>@@ -2153,6 +2245,7 @@
> 		{
> 			displayError(e);
> 		}
>+		fEvtHandleLock.releaseLock(this);
> 	}
> 	
> 	/**
>@@ -2238,11 +2331,14 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.debug.ui.ISynchronizedMemoryBlockView#propertyChanged(java.lang.String, java.lang.Object)
> 	 */
>-	public void propertyChanged(String propertyName, Object value)
>+	public void propertyChanged(Object evtSrc, String propertyName, Object value)
> 	{	
> 		if (isDisplayingError())
> 			return;
> 		
>+		if (evtSrc == this)
>+			return;
>+		
> 		if (propertyName.equals(IMemoryViewConstants.PROPERTY_SELECTED_ADDRESS) && value instanceof BigInteger)
> 		{
> 			try {
>@@ -2441,6 +2537,29 @@
> 		// an error and if it's enabled
> 		if (!isDisplayingError() && enabled && fEnabled)
> 			synchronize();
>+	}
>+	
>+	private static int getTopVisibleIndex(Table table)
>+	{
>+		MemoryViewUtil.linuxWorkAround(table);
>+		int index = table.getTopIndex();
>+		
>+		TableItem item = table.getItem(index);
>+		
>+		MemoryViewUtil.linuxWorkAround(table);
>+		while (item.getBounds(0).y < 0)
>+		{
>+			index++;
>+			item = table.getItem(index);
>+		}
>+		
>+		return index;
>+	}
>+	
>+	private static void  setTopIndex(Table table, int index)
>+	{
>+		MemoryViewUtil.linuxWorkAround(table);
>+		table.setTopIndex(index);
> 	}
> }	
> 
>Index: ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java,v
>retrieving revision 1.6
>diff -u -r1.6 MemoryViewUtil.java
>--- ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java	23 Nov 2004 14:23:10 -0000	1.6
>+++ ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java	5 Jan 2005 20:22:19 -0000
>@@ -10,6 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.debug.internal.ui.views.memory;
> 
>+import org.eclipse.core.runtime.Platform;
> import org.eclipse.debug.core.DebugPlugin;
> import org.eclipse.debug.core.IMemoryBlockManager;
> import org.eclipse.debug.core.model.IDebugElement;
>@@ -20,6 +21,7 @@
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.swt.widgets.Table;
> 
> /**
>  * Util class for Memory View
>@@ -97,4 +99,24 @@
> 	{
> 		return DebugPlugin.getDefault().getMemoryBlockManager();
> 	}
>+
>+
>+	static void linuxWorkAround(Table table)
>+	{
>+		if (table == null)
>+			return;
>+		
>+		if (table.isDisposed())
>+			return;
>+		
>+		if(isLinuxGTK())
>+			while(table.getDisplay().readAndDispatch()){}
>+	}
>+	
>+	static boolean isLinuxGTK()
>+	{
>+		String ws = Platform.getWS();
>+		return ws.equals(Platform.WS_GTK);
>+	}
>+	
> }
>Index: ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java,v
>retrieving revision 1.7
>diff -u -r1.7 SynchronizeInfo.java
>--- ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java	6 Dec 2004 20:57:38 -0000	1.7
>+++ ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java	5 Jan 2005 20:22:19 -0000
>@@ -49,12 +49,14 @@
> 		ISynchronizedMemoryBlockView fView;
> 		String fPropertyId;
> 		Object fValue;
>+		Object fSrc;
> 		
>-		PropertyChangeNotifier(ISynchronizedMemoryBlockView view, String propertyId, Object value)
>+		PropertyChangeNotifier(ISynchronizedMemoryBlockView view, String propertyId, Object value, Object eventSrc)
> 		{
> 			fView = view;
> 			fPropertyId = propertyId;
> 			fValue = value;
>+			fSrc = eventSrc;
> 		}
> 		
> 		/* (non-Javadoc)
>@@ -68,7 +70,7 @@
> 		 * @see org.eclipse.core.runtime.ISafeRunnable#run()
> 		 */
> 		public void run() throws Exception {
>-			fView.propertyChanged(fPropertyId, fValue);
>+			fView.propertyChanged(fSrc, fPropertyId, fValue);
> 		}
> 	}
> 	
>@@ -202,7 +204,7 @@
> 	 * Fire property change events
> 	 * @param propertyId
> 	 */
>-	public void firePropertyChanged(final String propertyId)
>+	public void firePropertyChanged(final Object evtSrc, final String propertyId)
> 	{
> 		if (!DebugUIPlugin.getDefault().getMemoryBlockViewSynchronizer().isEnabled())
> 			return;
>@@ -230,7 +232,7 @@
> 						
> 						// if view is enabled and if it's a valid property
> 						if (view.isEnabled() && listener.isValidProperty(propertyId)){
>-							PropertyChangeNotifier notifier = new PropertyChangeNotifier(view, propertyId, value);
>+							PropertyChangeNotifier notifier = new PropertyChangeNotifier(view, propertyId, value, evtSrc);
> 							Platform.run(notifier);	
> 						}
> 					}
>Index: ui/org/eclipse/debug/internal/ui/views/memory/ViewTabCursorManager.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabCursorManager.java,v
>retrieving revision 1.10
>diff -u -r1.10 ViewTabCursorManager.java
>--- ui/org/eclipse/debug/internal/ui/views/memory/ViewTabCursorManager.java	8 Dec 2004 21:37:24 -0000	1.10
>+++ ui/org/eclipse/debug/internal/ui/views/memory/ViewTabCursorManager.java	5 Jan 2005 20:22:19 -0000
>@@ -100,22 +100,21 @@
> 
> 		private void handleTableMouseEvent(MouseEvent e) {
> 			// figure out new cursor position based on here the mouse is pointing
>-			TableItem[] selections = fTableViewer.getTable().getSelection();
>+			TableItem[] tableItems = fTableViewer.getTable().getItems();
> 			TableItem selectedRow = null;
> 			int colNum = -1;
>+			int numCol = fTableViewer.getColumnProperties().length;
> 			
>-			if (selections.length > 0)
>+			for (int j=0; j<tableItems.length; j++)
> 			{
>-				selectedRow = selections[0];
>-				
>-				int numCol = fTableViewer.getColumnProperties().length;
>-				
>+				TableItem item = tableItems[j];
> 				for (int i=0; i<numCol; i++)
> 				{
>-					Rectangle bound = selectedRow.getBounds(i);
>+					Rectangle bound = item.getBounds(i);
> 					if (bound.contains(e.x, e.y))
> 					{
> 						colNum = i;
>+						selectedRow = item;
> 						break;
> 					}
> 				}
>@@ -739,8 +738,10 @@
> 		this.fRow = row;
> 		this.fCol = col;
> 
>+		MemoryViewUtil.linuxWorkAround(fTable);
> 		fTableCursor.setSelection(row, col);
>-
>+		MemoryViewUtil.linuxWorkAround(fTable);
>+		
> 		if (showCursor)
> 			showCursor();
> 	}

Actions: View | Diff

Attachments on bug 74559: 16951 | 16952 | 20803 | 20804 | 20805