mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 09:55:29 +02:00
Code Issues Wiki Activity

[202866] Fix exceptions in RSE browse dialog when SystemRegistry is not yet fully initialized

Browse source
This commit is contained in:
Martin Oberhuber 2007-09-11 16:30:31 +00:00
parent 5eaa0ffcc6
commit bfb2e7d049
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java
View file

@ -15,6 +15,7 @@
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Martin Oberhuber (Wind River) - [190442] made SystemActionViewerFilter API
* Martin Oberhuber (Wind River) - [202866] Fix exceptions in RSE browse dialog when SystemRegistry is not yet fully initialized
********************************************************************************/
package org.eclipse.rse.internal.ui.view;
@ -128,7 +129,6 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
}
/**
* Return all selected objects.
* @see #setMultipleSelectionMode(boolean)
*/
public Object[] getSelectedObjects()
{
@ -199,6 +199,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
connectionChanged(connection);
}}
);
_connectionCombo.listenToConnectionEvents(true);
}
_pathText = SystemWidgetHelpers.createReadonlyTextField(composite_prompts);

24
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java
View file

@ -13,6 +13,7 @@
* Contributors:
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Martin Oberhuber (Wind River) - [202866] Fix exceptions in RSE browse dialog when SystemRegistry is not yet fully initialized
********************************************************************************/
package org.eclipse.rse.internal.ui.view;
@ -25,7 +26,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
public abstract class SystemResourceSelectionInputProvider extends SystemAbstractAPIProvider
{
private IHost _connection;
private IHost _connection = null;
private boolean _onlyConnection = false;
private boolean _allowNew = true;
private IRSESystemType[] _systemTypes;
@ -41,8 +42,9 @@ public abstract class SystemResourceSelectionInputProvider extends SystemAbstrac
// choose random host
ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
IHost[] hosts = registry.getHosts();
if (hosts != null)
if (hosts != null && hosts.length>0) {
_connection = hosts[0];
}
}
public IHost getSystemConnection()
@ -86,8 +88,10 @@ public abstract class SystemResourceSelectionInputProvider extends SystemAbstrac
if (_connection == null)
{
ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
_connection = registry.getHosts()[0];
IHost[] hosts = registry.getHosts();
if (hosts!=null && hosts.length!=0) {
_connection = registry.getHosts()[0];
}
}
return getConnectionChildren(_connection);
}
@ -101,16 +105,22 @@ public abstract class SystemResourceSelectionInputProvider extends SystemAbstrac
{
if (selectedConnection != null)
{
return getSubSystem(selectedConnection).getChildren();
ISubSystem ss = getSubSystem(selectedConnection);
if (ss!=null) {
return ss.getChildren();
}
}
return null;
return new Object[0];
}
public boolean hasConnectionChildren(IHost selectedConnection)
{
if (selectedConnection != null)
{
return getSubSystem(selectedConnection).hasChildren();
ISubSystem ss = getSubSystem(selectedConnection);
if (ss!=null) {
return ss.hasChildren();
}
}
return false;
}