[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/util ...

[Robert Stryker]

  User: rawb    
  Date: 06/08/09 19:15:50

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/util 
                        PackageTypeSearcher.java
  Log:
  Added missing null checks
  
  Revision  Changes    Path
  1.2       +7 -12     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageTypeSearcher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- PackageTypeSearcher.java	31 Jul 2006 19:43:41 -0000	1.1
  +++ PackageTypeSearcher.java	9 Aug 2006 23:15:50 -0000	1.2
  @@ -160,35 +160,30 @@
   	   
   	   public ArrayList getTypeMatches()  {
   		  IPackageFragment packageElement = getPackage();
  -	      if (packageElement != null && remainder != null)
  -	      {
  -	         try
  -	         {
  +	      if (packageElement != null && remainder != null) {
  +	         try  {
   	            IClassFile[] classFiles = packageElement.getClassFiles();
   	            ICompilationUnit[] compUnits = packageElement.getCompilationUnits();
   	            ArrayList returnList = new ArrayList();
   
  -	            for (int i = 0; i < classFiles.length; i++)
  -	            {
  +	            for (int i = 0; i < classFiles.length; i++) {
   	               String typeName = classFiles[i].getType().getElementName();
   	               if (typeName.equals(""))
   	                  continue;
  -	               if (typeName.toLowerCase().startsWith(remainder.toLowerCase()) && filter.accept(classFiles[i].getType()))
  +	               if (typeName.toLowerCase().startsWith(remainder.toLowerCase()) && (filter == null || filter.accept(classFiles[i].getType())))
   	                  returnList.add(classFiles[i].getType());
   	            }
   
  -	            for (int i = 0; i < compUnits.length; i++)
  -	            {
  +	            for (int i = 0; i < compUnits.length; i++) {
   	               IType type = compUnits[i].findPrimaryType();
   	               String typeName = type.getElementName();
  -	               if (typeName.toLowerCase().startsWith(remainder.toLowerCase()) && filter.accept(type)) 
  +	               if (typeName.toLowerCase().startsWith(remainder.toLowerCase()) && (filter == null || filter.accept(type))) 
   	                  returnList.add(type);
   	            }
   
   	            return returnList;
   	         }
  -	         catch (JavaModelException jme)
  -	         {
  +	         catch (JavaModelException jme)  {
   	         }
   	      }