Author: Grid.Qian Date: 2009-12-01 22:08:21 -0500 (Tue, 01 Dec 2009) New Revision: 18963 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java Log: JBIDE-5347: Accessing Variables w/o Namespace in Variablepicker Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2009-12-02 02:13:10 UTC (rev 18962) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2009-12-02 03:08:21 UTC (rev 18963) @@ -165,7 +165,7 @@ computeResult(); Object obj[] = getResult(); - if (obj != null && obj.length > 0) { + if (obj != null || obj.length > 0) { if (ensureXSDTypeNamespaceMappings ( obj[0] ) == false) { return ; } @@ -285,9 +285,13 @@ // Do not import schema for schemas if (obj instanceof XSDSimpleTypeDefinition) { - if (((XSDSimpleTypeDefinition) obj).getTargetNamespace().equals( - XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001)) { - return false; + + String targetNamespace = ((XSDSimpleTypeDefinition) obj).getTargetNamespace(); + if (targetNamespace != null) { + if (((XSDSimpleTypeDefinition) obj).getTargetNamespace().equals( + XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001)) { + return false; + } } } @@ -576,13 +580,11 @@ fFilteredList.setEnabled(true); fFilteredList.setAllowDuplicates(showDuplicates); - fFilteredList.setElements( contentProvider.getElements( fProjectObjects ) ); - // add by Grid.Qian - // update the fTreeViewer because for now the fTreeViewer's input is null - if (contentProvider.getElements( fProjectObjects ) != null && - contentProvider.getElements( fProjectObjects ).length > 0) { + fFilteredList.setElements( contentProvider.getElements( fProjectObjects ) ); + + if (contentProvider.getElements( fProjectObjects ) != null && contentProvider.getElements( fProjectObjects ).length > 0) { updateLowerViewWidget(fFilteredList.getSelection()); - } + } } } @@ -644,7 +646,7 @@ protected void handleEmptyList() { fTreeViewer.setInput ( null ); - // added by Grid.Qian + // Buzilla 290348 - added by Grid.Qian // the tree view's input is null, but the selection maybe not 0 // for example the input is a list and we select a element, then // set the input = null, this time, the selection is not 0