Author: scabanovich Date: 2012-01-06 14:20:33 -0500 (Fri, 06 Jan 2012) New Revision: 37689 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 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/MakeBeanScopedDependentMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java Log: JBIDE-10601 https://issues.joss.org/browse/JBIDE-10601 Method EclipseUtil.getCompilationUnit(IFile) should return existing Java element or null. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2012-01-06 19:19:29 UTC (rev 37688) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2012-01-06 19:20:33 UTC (rev 37689) @@ -62,6 +62,9 @@ public void run(IMarker marker) { try{ ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + if(original == null) { + return; + } ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); IBuffer buffer = compilationUnit.getBuffer(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2012-01-06 19:19:29 UTC (rev 37688) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2012-01-06 19:20:33 UTC (rev 37689) @@ -54,6 +54,9 @@ public void run(IMarker marker) { try{ ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + if(original == null) { + return; + } ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); CompilationUnitChange change = new CompilationUnitChange("", compilationUnit); 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 2012-01-06 19:19:29 UTC (rev 37688) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-01-06 19:20:33 UTC (rev 37689) @@ -790,7 +790,7 @@ try{ ICompilationUnit compilationUnit = EclipseUtil.getCompilationUnit(file); - return compilationUnit.getElementAt(start); + return compilationUnit == null ? null : compilationUnit.getElementAt(start); }catch(CoreException ex){ CDIUIPlugin.getDefault().logError(ex); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2012-01-06 19:19:29 UTC (rev 37688) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2012-01-06 19:20:33 UTC (rev 37689) @@ -68,6 +68,9 @@ return; try{ ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + if(original == null) { + return; + } ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); CompilationUnitChange change = new CompilationUnitChange("", compilationUnit); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2012-01-06 19:19:29 UTC (rev 37688) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2012-01-06 19:20:33 UTC (rev 37689) @@ -75,6 +75,9 @@ } try{ ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + if(original == null) { + return; + } ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); CompilationUnitChange change = new CompilationUnitChange("", compilationUnit); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2012-01-06 19:19:29 UTC (rev 37688) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2012-01-06 19:20:33 UTC (rev 37689) @@ -60,6 +60,9 @@ public void run(IMarker marker) { try{ ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + if(original == null) { + return; + } ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); CompilationUnitChange change = new CompilationUnitChange("", compilationUnit); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2012-01-06 19:19:29 UTC (rev 37688) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2012-01-06 19:20:33 UTC (rev 37689) @@ -63,6 +63,9 @@ public void run(IMarker marker) { try{ ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + if(original == null) { + return; + } ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); IBuffer buffer = compilationUnit.getBuffer(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2012-01-06 19:19:29 UTC (rev 37688) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2012-01-06 19:20:33 UTC (rev 37689) @@ -61,6 +61,9 @@ public void run(IMarker marker) { try{ ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + if(original == null) { + return; + } ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); CompilationUnitChange change = new CompilationUnitChange("", compilationUnit);