[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs SystemRemoteResourceDialog.java

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs
In directory dev2:/tmp/cvs-serv13874/UI/org/eclipse/rse/ui/dialogs

Modified Files:
	SystemRemoteResourceDialog.java 
Log Message:
[370007] potential NPEs in table-tree provider and remote resource dialog


Index: SystemRemoteResourceDialog.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** SystemRemoteResourceDialog.java	26 May 2009 11:44:57 -0000	1.19
--- SystemRemoteResourceDialog.java	27 Jan 2012 20:53:00 -0000	1.20
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2006, 2009 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
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2006, 2012 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
***************
*** 19,22 ****
--- 19,23 ----
   * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
   * David McKnight   (IBM)        - [267061] resource dialog/form to allow custom host combo label
+  * David McKnight   (IBM)        - [370007] potential NPEs in table-tree provider and remote resource dialog
   *******************************************************************************/
  
***************
*** 65,69 ****
  		_form = new SystemResourceSelectionForm(getShell(), parent, this, _inputProvider, getVerbiage(), _multipleSelectionMode, getMessageLine());
  		initForm();
! 		_form.setPreSelection(_preSelection);
  		createMessageLine(parent);
  		return _form.getInitialFocusControl();
--- 66,72 ----
  		_form = new SystemResourceSelectionForm(getShell(), parent, this, _inputProvider, getVerbiage(), _multipleSelectionMode, getMessageLine());
  		initForm();
! 		if (_preSelection != null){
! 			_form.setPreSelection(_preSelection);
! 		}
  		createMessageLine(parent);
  		return _form.getInitialFocusControl();
***************
*** 92,96 ****
  		}
  		_form.setSelectionValidator(_selectionValidator);
! 		_form.setPreSelection(_preSelection);
  	 	_form.setShowPropertySheet(_showPropertySheet);
  	 	_form.setSelectionTreeToolTipText(getTreeTip());
--- 95,101 ----
  		}
  		_form.setSelectionValidator(_selectionValidator);
! 		if (_preSelection != null){
! 			_form.setPreSelection(_preSelection);
! 		}
  	 	_form.setShowPropertySheet(_showPropertySheet);
  	 	_form.setSelectionTreeToolTipText(getTreeTip());