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

[190613] Fix NPE in Remotecdt when RSEUIPlugin has not been loaded

Browse source
This commit is contained in:
Martin Oberhuber 2007-09-03 17:07:48 +00:00
parent 4517021a75
commit 8c67a49a89
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java
View file

@ -9,6 +9,7 @@
* Ewa Matejska (PalmSource) - initial API and implementation * Ewa Matejska (PalmSource) - initial API and implementation
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Martin Oberhuber (Wind River) - [196934] hide disabled system types in remotecdt combo * Martin Oberhuber (Wind River) - [196934] hide disabled system types in remotecdt combo
* Yu-Fen Kuo (MontaVista) - [190613] Fix NPE in Remotecdt when RSEUIPlugin has not been loaded
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.remotecdt; package org.eclipse.rse.internal.remotecdt;
@ -27,6 +28,7 @@ import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.ui.RSESystemTypeAdapter; import org.eclipse.rse.ui.RSESystemTypeAdapter;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.actions.SystemNewConnectionAction;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyEvent;
@ -328,18 +330,22 @@ public class RemoteCMainTab extends CMainTab {
} }
protected void updateConnectionPulldown() { protected void updateConnectionPulldown() {
connectionCombo.removeAll(); connectionCombo.removeAll();
IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationCategory("shells"); //$NON-NLS-1$ // start RSEUIPlugin to make sure the SystemRegistry is initialized.
for(int i = 0; i < connections.length; i++) { boolean isRegistryActive = RSEUIPlugin.isTheSystemRegistryActive();
IRSESystemType sysType = connections[i].getSystemType(); if (isRegistryActive) {
RSESystemTypeAdapter a = (RSESystemTypeAdapter)sysType.getAdapter(RSESystemTypeAdapter.class); IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationCategory("shells"); //$NON-NLS-1$
if (a!=null && a.isEnabled(sysType)) { for(int i = 0; i < connections.length; i++) {
connectionCombo.add(connections[i].getAliasName()); IRSESystemType sysType = connections[i].getSystemType();
RSESystemTypeAdapter a = (RSESystemTypeAdapter)sysType.getAdapter(RSESystemTypeAdapter.class);
if (a!=null && a.isEnabled(sysType)) {
connectionCombo.add(connections[i].getAliasName());
}
} }
}
if(connections.length > 0)
if(connections.length > 0) connectionCombo.select(connections.length - 1);
connectionCombo.select(connections.length - 1); }
} }
protected void updateTargetProgFromConfig(ILaunchConfiguration config) { protected void updateTargetProgFromConfig(ILaunchConfiguration config) {