[jbosstools-commits] JBoss Tools SVN: r9067 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2008-07-04 05:11:51 -0400 (Fri, 04 Jul 2008)
New Revision: 9067

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java
Log:
JBIDE-2349

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java	2008-07-04 08:35:56 UTC (rev 9066)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java	2008-07-04 09:11:51 UTC (rev 9067)
@@ -152,7 +152,7 @@
 	
 	private void readSelection() {
 		int i = tableViewer.getTable().getSelectionIndex();
-		selected = (i < 0) ? null : (XModelObject)provider.items.get(i);
+		selected = (i < 0 || provider == null) ? null : (XModelObject)provider.items.get(i);
 	}
 	
 	private void makeSelection() {
@@ -188,17 +188,21 @@
 
 	class TContentProvider implements IListContentProvider, ITableLabelProvider {
 		XModelObject[] l = new XModelObject[0];
-		ArrayList items = new ArrayList();
+		ArrayList<XModelObject> items = new ArrayList<XModelObject>();
 		
 		public void setObjects(XModelObject[] l) {
 			this.l = l;
 		}
 		
 		public void setPattern(String s) {
-			s = s.toLowerCase();
+			s = s == null ? "" : s.toLowerCase();
 			items.clear();
 			for (int i = 0; i < l.length; i++) {
-				if(s.length() == 0 || getKey(l[i]).toLowerCase().indexOf(s) >= 0) items.add(l[i]);
+				String key = getKey(l[i]);
+				if(key == null) {
+					continue;
+				}
+				if(s.length() == 0 || key.toLowerCase().indexOf(s) >= 0) items.add(l[i]);
 			}
 			makeSelection();
 		}