[jbosstools-commits] JBoss Tools SVN: r41790 - in branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core: jdt and 1 other directory.

Author: xcoulon Date: 2012-06-07 17:13:09 -0400 (Thu, 07 Jun 2012) New Revision: 41790 Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedProcessor.java branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java Log: Fixed - JBIDE-12128 NPE when moving JAX-RS resource into another package Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedProcessor.java =================================================================== --- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedProcessor.java 2012-06-07 21:12:26 UTC (rev 41789) +++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedProcessor.java 2012-06-07 21:13:09 UTC (rev 41790) @@ -694,12 +694,14 @@ int flags = existingMethod.mergeAnnotations(matchingMethod.getAnnotations()); final CompilationUnit matchingResourceAST = CompilationUnitsRepository.getInstance().getAST(matchingResource.getResource()); final JavaMethodSignature matchingResourceMethodSignature = JdtUtils.resolveMethodSignature(matchingMethod.getJavaElement(), matchingResourceAST); - flags += existingMethod.update(matchingResourceMethodSignature); - if ((flags & F_ELEMENT_KIND) > 0 && existingMethod.getKind() == EnumKind.UNDEFINED) { - metamodel.remove(existingMethod); - changes.add(new JaxrsElementDelta(existingMethod, REMOVED)); - } else if (flags > 0) { - changes.add(new JaxrsElementDelta(existingMethod, CHANGED, flags)); + if(matchingResourceMethodSignature != null) { + flags += existingMethod.update(matchingResourceMethodSignature); + if ((flags & F_ELEMENT_KIND) > 0 && existingMethod.getKind() == EnumKind.UNDEFINED) { + metamodel.remove(existingMethod); + changes.add(new JaxrsElementDelta(existingMethod, REMOVED)); + } else if (flags > 0) { + changes.add(new JaxrsElementDelta(existingMethod, CHANGED, flags)); + } } } for (Entry<String, JaxrsResourceMethod> entry : removedMethods.entrySet()) { Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java =================================================================== --- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java 2012-06-07 21:12:26 UTC (rev 41789) +++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java 2012-06-07 21:13:09 UTC (rev 41790) @@ -582,7 +582,16 @@ return methodsVisitor.getMethodSignatures(); } + /** + * Returns the method signature for the given method with the given AST. + * @param method the java method + * @param ast the associated Compilation Unit AST + * @return the JavaMethodSignature or null if the given AST is null. + */ public static JavaMethodSignature resolveMethodSignature(IMethod method, CompilationUnit ast) { + if(ast == null) { + return null; + } JavaMethodSignaturesVisitor methodsVisitor = new JavaMethodSignaturesVisitor(method); ast.accept(methodsVisitor); return methodsVisitor.getMethodSignature();