mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 20:45:22 +02:00
Code Issues Wiki Activity

[278848] NPE in Remote System Details view

Browse source
This commit is contained in:
David McKnight 2009-07-08 15:03:07 +00:00
parent d003355974
commit 7a9dfa90e8
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2002, 2008 IBM Corporation and others. * Copyright (c) 2002, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -15,6 +15,7 @@
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* David McKnight (IBM) - [216161] table view needs to handle context when filter reference is input * David McKnight (IBM) - [216161] table view needs to handle context when filter reference is input
* David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types * David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types
* David McKnight (IBM) - [278848] NPE in Remote System Details view
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.ui.view; package org.eclipse.rse.ui.view;
@ -37,6 +38,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterReference;
import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.rse.core.model.ISystemViewInputProvider;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.ui.view.SystemViewPromptableAdapter; import org.eclipse.rse.internal.ui.view.SystemViewPromptableAdapter;
import org.eclipse.rse.internal.ui.view.SystemViewRootInputAdapter; import org.eclipse.rse.internal.ui.view.SystemViewRootInputAdapter;
@ -146,6 +148,14 @@ public class SystemTableViewProvider implements ILabelProvider, ITableLabelProvi
} }
if (result != null) if (result != null)
result.setPropertySourceInput(object); result.setPropertySourceInput(object);
// for bug 278848
if (_viewer.getInput() instanceof ISystemViewInputProvider)
{
ISystemViewInputProvider inputProvider = (ISystemViewInputProvider)_viewer.getInput();
result.setInput(inputProvider);
}
return result; return result;
} }