Author: scabanovich Date: 2007-08-02 07:19:47 -0400 (Thu, 02 Aug 2007) New Revision: 2845 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java Log: Adding null to selection prevented if *.java file cannot be adapted to java element Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java 2007-08-02 11:18:26 UTC (rev 2844) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/XModelObjectSelectionProvider.java 2007-08-02 11:19:47 UTC (rev 2845) @@ -123,10 +123,12 @@ Object object = iterator.next(); if (object instanceof XModelObject) { XModelObject xmo = (XModelObject)object; - if ("FileJAVA".equals(xmo.getModelEntity().getName())) - adaptedObjects.add(xmo.getAdapter(ICompilationUnit.class)); - else + if ("FileJAVA".equals(xmo.getModelEntity().getName())) { + Object adapter = xmo.getAdapter(ICompilationUnit.class); + if(adapter != null) adaptedObjects.add(adapter); + } else { adaptedObjects.add(xmo); + } } else if(object instanceof IAdaptable) { adaptedObjects.add(object); }