Attachment 202536 Details for Bug 355467 – patch to check for null

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

[patch] patch to check for null

patch.txt (text/plain), 1.92 KB, created by David McKnight

on 2011-08-31 11:11:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2011-08-31 11:11:44 EDT

Size: 1.92 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.ui
>Index: UI/org/eclipse/rse/internal/ui/view/SystemTableViewSorter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewSorter.java,v
>retrieving revision 1.3
>diff -u -r1.3 SystemTableViewSorter.java
>--- UI/org/eclipse/rse/internal/ui/view/SystemTableViewSorter.java	16 Dec 2010 17:06:15 -0000	1.3
>+++ UI/org/eclipse/rse/internal/ui/view/SystemTableViewSorter.java	31 Aug 2011 15:11:09 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002, 2010 IBM Corporation and others.
>+ * Copyright (c) 2002, 2011 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
>@@ -13,6 +13,7 @@
>  * 
>  * Contributors:
>  * David McKnight   (IBM)        - [331986] Sort in Remote System Details view shows wrong results
>+ * David McKnight   (IBM)        - [355467] The result of sorting resources that contains null blank cells is not correct in Remote System Details view.
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.ui.view;
>@@ -82,6 +83,11 @@
> 		Object name1 = getValueFor(e1, _columnNumber);
> 		Object name2 = getValueFor(e2, _columnNumber);
> 
>+		// deal with equal objects
>+		if (name1 == name2){
>+			return 0;
>+		}
>+		
> 		try
> 		{
> 			Object n1 = name1;
>@@ -93,6 +99,15 @@
> 				n2 = name1;
> 			}
> 
>+			// deal with nulls
>+			if (n1 == null){
>+				return -1;
>+			}
>+			else  if (n2 == null){
>+				return 1;
>+			}
>+			
>+			
> 			if (n1 instanceof String)
> 			{
> 				return ((String) n1).compareTo((String) n2);

Actions: View | Diff

Attachments on bug 355467: 202536