mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-22 15:53:58 +02:00
Code Issues Wiki Activity

Apply patch for bug 150930 - Fix NPE in ServicesViewer

Browse source
This commit is contained in:
Martin Oberhuber 2006-07-18 12:16:42 +00:00
parent f355260209
commit 9353e792c0
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java
View file

@ -157,16 +157,19 @@ public class ConnectorServicesForm extends SystemBaseForm
protected String getCurrentVerbage() protected String getCurrentVerbage()
{ {
if (_serviceViewer == null) if (_serviceViewer == null)
return ""; return ""; //$NON-NLS-1$
else else
{ {
IStructuredSelection serviceSelection = (IStructuredSelection)_serviceViewer.getSelection(); IStructuredSelection serviceSelection = (IStructuredSelection)_serviceViewer.getSelection();
if (serviceSelection == null || serviceSelection.isEmpty()) if (serviceSelection == null || serviceSelection.isEmpty())
{ {
return ""; return ""; //$NON-NLS-1$
} }
else else
return ((ServiceElement)serviceSelection.getFirstElement()).getDescription(); {
String description = ((ServiceElement)serviceSelection.getFirstElement()).getDescription();
return description!=null ? description : ""; //$NON-NLS-1$
}
} }
} }
} }

23
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java
View file

@ -288,26 +288,23 @@ public class ServicesForm extends SystemBaseForm implements ICheckStateListener
protected String getCurrentVerbage() protected String getCurrentVerbage()
{ {
if (_serviceViewer == null) String description = null;
return ""; if (_serviceViewer != null)
else
{ {
IStructuredSelection serviceSelection = (IStructuredSelection)_serviceViewer.getSelection(); IStructuredSelection serviceSelection = (IStructuredSelection)_serviceViewer.getSelection();
if (serviceSelection == null || serviceSelection.isEmpty()) if (serviceSelection != null && !serviceSelection.isEmpty())
{ {
if (_factoryViewer == null) description = ((ServiceElement)serviceSelection.getFirstElement()).getDescription();
return ""; }
else else if (_factoryViewer != null)
{ {
IStructuredSelection factorySelection = (IStructuredSelection) _factoryViewer.getSelection(); IStructuredSelection factorySelection = (IStructuredSelection) _factoryViewer.getSelection();
if (factorySelection == null || factorySelection.isEmpty()) if (factorySelection != null && !factorySelection.isEmpty())
return ""; {
else description = ((ServiceElement)factorySelection.getFirstElement()).getDescription();
return ((ServiceElement)factorySelection.getFirstElement()).getDescription();
} }
} }
else
return ((ServiceElement)serviceSelection.getFirstElement()).getDescription();
} }
return description != null ? description : ""; //$NON-NLS-1$
} }
} }