Author: dgolovin Date: 2012-02-02 16:54:37 -0500 (Thu, 02 Feb 2012) New Revision: 38402 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICorePlugin.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java Log: code cleanup Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-02-02 20:04:49 UTC (rev 38401) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-02-02 21:54:37 UTC (rev 38402) @@ -431,8 +431,8 @@ } } } - srcs = ps.toArray(new IPath[0]); - outs = os.toArray(new IPath[0]); + srcs = ps.toArray(new IPath[ps.size()]); + outs = os.toArray(new IPath[os.size()]); } catch(CoreException ce) { CDICorePlugin.getDefault().logError("Error while locating java source roots for " + project, ce); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2012-02-02 20:04:49 UTC (rev 38401) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2012-02-02 21:54:37 UTC (rev 38402) @@ -618,11 +618,11 @@ } public void dispose() { - CDICoreNature[] ds = dependsOn.toArray(new CDICoreNature[0]); + CDICoreNature[] ds = dependsOn.toArray(new CDICoreNature[dependsOn.size()]); for (CDICoreNature d: ds) { removeCDIProject(d); } - CDICoreNature[] us = usedBy.toArray(new CDICoreNature[0]); + CDICoreNature[] us = usedBy.toArray(new CDICoreNature[usedBy.size()]); for (CDICoreNature u: us) { u.removeCDIProject(this); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICorePlugin.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICorePlugin.java 2012-02-02 20:04:49 UTC (rev 38401) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICorePlugin.java 2012-02-02 21:54:37 UTC (rev 38402) @@ -182,7 +182,7 @@ public static void fire(CDIProjectChangeEvent event) { ICDIProjectChangeListener[] ls = null; synchronized(listeners) { - ls = listeners.toArray(new ICDIProjectChangeListener[0]); + ls = listeners.toArray(new ICDIProjectChangeListener[listeners.size()]); } for (ICDIProjectChangeListener l : ls) { l.projectChanged(event); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-02-02 20:04:49 UTC (rev 38401) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-02-02 21:54:37 UTC (rev 38402) @@ -551,7 +551,7 @@ Set<IFolder> sourceFolders = getSourceFoldersForProjectsSet(); for (IFolder source : sourceFolders) { IResource beansXml = source.findMember(new Path("/META-INF/beans.xml")); //$NON-NLS-1$ - if(beansXml!=null && beansXml instanceof IFile) { + if(beansXml instanceof IFile) { allBeansXmls.add((IFile)beansXml); } } @@ -1629,7 +1629,7 @@ try { getValidationContext().addLinkedCoreResource(SHORT_ID, injection.getSourcePath().toOSString(), bean.getResource().getFullPath(), false); } catch (NullPointerException e) { - throw new NullPointerException("bean exists=" + bean.getBeanClass().exists() + " resource= " + bean.getResource() + " injection= " + injection.getSourcePath()); + throw new RuntimeException("bean exists=" + bean.getBeanClass().exists() + " resource= " + bean.getResource() + " injection= " + injection.getSourcePath(),e); } } } 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-02-02 20:04:49 UTC (rev 38401) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-02-02 21:54:37 UTC (rev 38402) @@ -790,7 +790,7 @@ private IMethod findMethod(IFile file, int start){ IJavaElement javaElement = findJavaElement(file, start); - if(javaElement != null && javaElement instanceof IMethod){ + if(javaElement instanceof IMethod){ IMethod method = (IMethod)javaElement; if(!method.isBinary()) return method; @@ -800,7 +800,7 @@ private IType findTypeWithNoSerializable(IFile file, int start) throws JavaModelException{ IJavaElement javaElement = findJavaElement(file, start); - if(javaElement != null && javaElement instanceof IType){ + if(javaElement instanceof IType){ IType type = (IType)javaElement; if(!type.isBinary()){ String shortName = CDIMarkerResolutionUtils.getShortName(AddSerializableInterfaceMarkerResolution.SERIALIZABLE); @@ -831,7 +831,7 @@ private TypeAndAnnotation findTypeAndAnnotation(IFile file, int start, String annotationQualifiedName) throws JavaModelException{ IJavaElement javaElement = findJavaElement(file, start); - if(javaElement != null && javaElement instanceof IType){ + if(javaElement instanceof IType){ IType type = (IType)javaElement; if(!type.isBinary()){ IAnnotation annotation = getAnnotation(type, annotationQualifiedName); @@ -908,7 +908,7 @@ try{ IJavaElement javaElement = findJavaElement(file, start); - if(javaElement != null && javaElement instanceof IField){ + if(null && javaElement instanceof IField){ IField field = (IField)javaElement; if(!Flags.isStatic(field.getFlags()) && !field.isBinary()) return field; @@ -923,7 +923,7 @@ try{ IJavaElement javaElement = findJavaElement(file, start); - if(javaElement != null && javaElement instanceof IField){ + if(javaElement instanceof IField){ IField field = (IField)javaElement; if(Flags.isPublic(field.getFlags()) && !field.isBinary()) return field;