Author: dazarov Date: 2011-11-08 20:06:56 -0500 (Tue, 08 Nov 2011) New Revision: 36233 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactoringProcessor.java Log: Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java 2011-11-08 22:49:58 UTC (rev 36232) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java 2011-11-09 01:06:56 UTC (rev 36233) @@ -31,6 +31,7 @@ public static String CDI_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE; public static String CDI_RENAME_PROCESSOR_ERROR_BEAN_NOT_FOUND; public static String CDI_RENAME_PROCESSOR_ERROR_INJECTION_POINT_NOT_FOUND; + public static String CDI_RENAME_PROCESSOR_ERROR_FILE_NOT_FOUND; public static String CDI_RENAME_PROCESSOR_QUESTION_DIALOG_TITLE; public static String CDI_RENAME_PROCESSOR_QUESTION_DIALOG_MESSAGE; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties 2011-11-08 22:49:58 UTC (rev 36232) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties 2011-11-09 01:06:56 UTC (rev 36233) @@ -6,6 +6,7 @@ CDI_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE=Cannot change read-only file: ''{0}''. CDI_RENAME_PROCESSOR_ERROR_BEAN_NOT_FOUND=CDI Bean Class not found CDI_RENAME_PROCESSOR_ERROR_INJECTION_POINT_NOT_FOUND=CDI Injection Point not found +CDI_RENAME_PROCESSOR_ERROR_FILE_NOT_FOUND=File not found CDI_RENAME_PROCESSOR_QUESTION_DIALOG_TITLE=Read-only File Encountered CDI_RENAME_PROCESSOR_QUESTION_DIALOG_MESSAGE=File ''{0}'' is read-only. Do you wish to make it writable? RENAME_NAMED_BEAN_PROCESSOR_TITLE=Rename @Named Bean Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-11-08 22:49:58 UTC (rev 36232) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-11-09 01:06:56 UTC (rev 36233) @@ -687,7 +687,7 @@ else beanPackage = beanTypeName.substring(0,dotLastIndex); - if(isPublic || injectionPointPackage.equals(beanPackage)) + if((isPublic || injectionPointPackage.equals(beanPackage)) && bean.getBeanClass().getResource() != null) beans.add(bean); } } @@ -719,7 +719,13 @@ private List<IBean> findBeans(IInjectionPoint injectionPoint){ ICDIProject cdiProject = injectionPoint.getCDIProject(); - return CDIUtil.getSortedBeans(cdiProject, false, injectionPoint); + List<IBean> beans = CDIUtil.getSortedBeans(cdiProject, false, injectionPoint); + for(int i = beans.size()-1;i>= 0;i--){ + if(beans.get(i).getBeanClass().getResource() == null) + beans.remove(i); + } + + return beans; } private IMethod findMethod(IFile file, int start){ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactoringProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactoringProcessor.java 2011-11-08 22:49:58 UTC (rev 36232) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactoringProcessor.java 2011-11-09 01:06:56 UTC (rev 36233) @@ -106,7 +106,10 @@ } protected boolean isFileCorrect(IFile file){ - if(!file.isSynchronized(IResource.DEPTH_ZERO)){ + if(file == null){ + status.addFatalError(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_FILE_NOT_FOUND); + return false; + }else if(!file.isSynchronized(IResource.DEPTH_ZERO)){ status.addFatalError(NLS.bind(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_OUT_OF_SYNC_PROJECT, file.getProject().getFullPath().toString())); return false; }else if(file.isPhantom()){