Attachment 86536 Details for Bug 212799 – Patch for bug 212799

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Patch for bug 212799

Bugzilla212799.txt (text/plain), 3.65 KB, created by Alex Nan

on 2008-01-09 22:52:09 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Nan

Created: 2008-01-09 22:52:09 EST

Size: 3.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.log.views
>Index: src/org/eclipse/tptp/platform/log/views/internal/util/Sorter.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.log.views/src/org/eclipse/tptp/platform/log/views/internal/util/Sorter.java,v
>retrieving revision 1.13
>diff -u -r1.13 Sorter.java
>--- src/org/eclipse/tptp/platform/log/views/internal/util/Sorter.java	2 Sep 2007 10:57:44 -0000	1.13
>+++ src/org/eclipse/tptp/platform/log/views/internal/util/Sorter.java	10 Jan 2008 03:49:12 -0000
>@@ -55,7 +55,10 @@
> 		for (int i = 0; i < _sortColumns.length && _comp==0; i++) {
> 			
> 			ColumnData data = _sortColumns[i];
>-	        int pos = data.getInitialPos();	
>+	        if(data == null){
>+	        	continue;
>+	        }
>+			int pos = data.getInitialPos();	
> 	        int order = data.getSortingOrder()==1?1:-1;
> 	        
> 	        String str1="";
>Index: src/org/eclipse/tptp/platform/log/views/internal/views/LogViewerUI.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.log.views/src/org/eclipse/tptp/platform/log/views/internal/views/LogViewerUI.java,v
>retrieving revision 1.37
>diff -u -r1.37 LogViewerUI.java
>--- src/org/eclipse/tptp/platform/log/views/internal/views/LogViewerUI.java	27 Nov 2007 04:33:39 -0000	1.37
>+++ src/org/eclipse/tptp/platform/log/views/internal/views/LogViewerUI.java	10 Jan 2008 03:49:12 -0000
>@@ -1,10 +1,10 @@
> /**********************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
>  * All rights reserved.   This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>- * $Id: LogViewerUI.java,v 1.37 2007/11/27 04:33:39 apnan Exp $
>+ * $Id: LogViewerUI.java,v 1.35 2007/08/08 14:54:16 ewchan Exp $
>  * 
>  * Contributors: 
>  * IBM - Initial API and implementation
>@@ -74,6 +74,7 @@
> 	
> 	private boolean _handleSelectionEvent = true;
> 	private boolean _controlDown=false;
>+	private boolean tableColumSelected=false;
> 	
> 	//return true when the first column header is selected while pressing the ctrl button
> 	private boolean _firstCol=true;
>@@ -322,12 +323,21 @@
> 				updateColumnsTitle();
> 				
> 				if(!_controlDown)
>+				{
> 					updateSort();
>+					tableColumSelected=false;
>+				}
>+				else
>+					tableColumSelected=true;
> 			}
> 		}
> 		else if(e.item instanceof TableItem && e.item.getData()!=null && _handleSelectionEvent){	
>-			LogUtil.notifyViewSelectionChanged(this, fTableViewer.getInput() instanceof EObject ? (EObject)fTableViewer.getInput() : HyadesUtil.getMofObject(),e.item.getData());	
>+			LogUtil.notifyViewSelectionChanged(this, fTableViewer.getInput() instanceof EObject ? (EObject)fTableViewer.getInput() : HyadesUtil.getMofObject(),e.item.getData());
>+			tableColumSelected=false;
> 		}
>+		else {
>+			tableColumSelected=false;
>+		}			
> 	}
> 	
> 	
>@@ -518,10 +528,15 @@
> 	
> 	public void keyReleased (KeyEvent e)  {
> 		if (e.keyCode == SWT.CONTROL) {
>-			ISelection selection = fTableViewer.getSelection(true);
> 			_controlDown = false;
>-			updateSort();			
>-			fTableViewer.setSelection(selection);
>+			if(tableColumSelected)
>+			{
>+				tableColumSelected=false;
>+				ISelection selection = fTableViewer.getSelection();
>+				updateSort();
>+				if(selection!=null)
>+					fTableViewer.setSelection(selection);
>+			}
> 		}
> 	}
>

Actions: View

Attachments on bug 212799: 86430 | 86536 | 86537