[jbosstools-commits] JBoss Tools SVN: r42675 - in trunk/ws: plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Jul 23 08:36:17 EDT 2012
Author: xcoulon
Date: 2012-07-23 08:36:16 -0400 (Mon, 23 Jul 2012)
New Revision: 42675
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsHttpMethod.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/MethodParametersCompletionProposalComputer.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java
Log:
Fixed - JBIDE-11076
Replace TypedRegion with SourceRange in JavaMethodParameter
https://issues.jboss.org/browse/JBIDE-11076
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsHttpMethod.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsHttpMethod.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsHttpMethod.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -117,9 +117,9 @@
.create("HTTP Verb should not be empty", getResource());
message.setAttribute(IMarker.MARKER, JaxrsMetamodelBuilder.JAXRS_PROBLEM);
message.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- message.setAttribute(IMarker.CHAR_START, annotation.getRegion().getOffset());
- message.setAttribute(IMarker.CHAR_END, annotation.getRegion().getOffset()
- + annotation.getRegion().getLength());
+ message.setAttribute(IMarker.CHAR_START, annotation.getSourceRange().getOffset());
+ message.setAttribute(IMarker.CHAR_END, annotation.getSourceRange().getOffset()
+ + annotation.getSourceRange().getLength());
messages.add(message);
}
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -37,7 +37,6 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jface.text.TypedRegion;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.validation.ValidatorMessage;
import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsMetamodelBuilder;
@@ -314,7 +313,7 @@
final String msg = NLS
.bind(ValidationMessages.INVALID_PATHPARAM_VALUE,
pathParamValueProposals);
- final TypedRegion region = annotation.getRegion();
+ final ISourceRange region = annotation.getSourceRange();
ValidatorMessage validationMsg = createValidationMessage(msg, IMarker.SEVERITY_ERROR, region.getOffset(), region.getLength());
hasErrors(true);
messages.add(validationMsg);
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -16,7 +16,7 @@
import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.text.TypedRegion;
+import org.eclipse.jdt.core.ISourceRange;
public class Annotation {
@@ -26,7 +26,7 @@
private final Map<String, List<String>> javaAnnotationElements;
- private TypedRegion region;
+ private ISourceRange sourceRange;
/**
* Full constructor
@@ -36,11 +36,11 @@
* @param annotationElements
*/
public Annotation(IAnnotation annotation, String name, Map<String, List<String>> annotationElements,
- final TypedRegion region) {
+ final ISourceRange sourceRange) {
this.javaAnnotation = annotation;
this.javaAnnotationName = name;
this.javaAnnotationElements = new HashMap<String, List<String>>(annotationElements);
- this.region = region;
+ this.sourceRange = sourceRange;
}
public boolean update(Annotation annotation) {
@@ -51,8 +51,8 @@
}
this.javaAnnotationElements.clear();
this.javaAnnotationElements.putAll(annotation.getJavaAnnotationElements());
- if (annotation.getRegion() != null) {
- this.region = annotation.getRegion();
+ if (annotation.getSourceRange() != null) {
+ this.sourceRange = annotation.getSourceRange();
}
return true;
}
@@ -73,8 +73,8 @@
return javaAnnotationElements;
}
- public TypedRegion getRegion() {
- return region;
+ public ISourceRange getSourceRange() {
+ return sourceRange;
}
/** @return the value */
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -19,7 +19,9 @@
import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.SourceRange;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.ASTVisitor;
import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
@@ -29,8 +31,6 @@
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TypedRegion;
/**
* A visitor for a single annotation on a java member (can be a method or a type).
@@ -188,11 +188,11 @@
if (annotationNames.contains(qualifiedName) || annotationNames.contains(name)) {
final String annotationName = annotationBinding.getAnnotationType().getQualifiedName();
final Map<String, List<String>> annotationElements = resolveAnnotationElements(annotationBinding);
- final TypedRegion typedRegion = new TypedRegion(annotation.getStartPosition(),
- annotation.getLength(), IDocument.DEFAULT_CONTENT_TYPE);
+ final ISourceRange sourceRange = new SourceRange(annotation.getStartPosition(),
+ annotation.getLength());
final IAnnotation javaAnnotation = (IAnnotation) annotationBinding.getJavaElement();
annotations
- .add(new Annotation(javaAnnotation, annotationName, annotationElements, typedRegion));
+ .add(new Annotation(javaAnnotation, annotationName, annotationElements, sourceRange));
}
}
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -18,8 +18,10 @@
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.SourceRange;
import org.eclipse.jdt.core.dom.ASTVisitor;
import org.eclipse.jdt.core.dom.Annotation;
import org.eclipse.jdt.core.dom.IAnnotationBinding;
@@ -102,10 +104,10 @@
IAnnotationBinding annotationBinding = annotation.resolveAnnotationBinding();
final String annotationName = annotationBinding.getAnnotationType().getQualifiedName();
final Map<String, List<String>> annotationElements = resolveAnnotationElements(annotationBinding);
- final TypedRegion typedRegion = new TypedRegion(annotation.getStartPosition(),
- annotation.getLength(), IDocument.DEFAULT_CONTENT_TYPE);
+ final ISourceRange sourceRange = new SourceRange(annotation.getStartPosition(),
+ annotation.getLength());
paramAnnotations.add(new org.jboss.tools.ws.jaxrs.core.jdt.Annotation(null, annotationName,
- annotationElements, typedRegion));
+ annotationElements, sourceRange));
}
}
final TypedRegion typedRegion = new TypedRegion(parameter.getStartPosition(),
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/MethodParametersCompletionProposalComputer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/MethodParametersCompletionProposalComputer.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/MethodParametersCompletionProposalComputer.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -81,6 +81,7 @@
* the java content assist invocation context
* @return the typed region
*/
+ @SuppressWarnings("unused")
private ITypedRegion getRegion(final JavaContentAssistInvocationContext javaContext) {
IDocument document = javaContext.getDocument();
IDocumentPartitioner documentPartitioner = ((IDocumentExtension3) document)
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -22,6 +22,7 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.ui.text.IJavaPartitions;
import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;
@@ -31,7 +32,6 @@
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TypedRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.viewers.StyledString;
@@ -86,10 +86,10 @@
if (resourceMethod != null) {
for (JavaMethodParameter methodParameter : resourceMethod.getJavaMethodParameters()) {
for (Annotation annotation : methodParameter.getAnnotations()) {
- final TypedRegion region = annotation.getRegion();
- if (annotation.getName().equals(PathParam.class.getName()) && region != null
- && context.getInvocationOffset() >= region.getOffset()
- && context.getInvocationOffset() < (region.getOffset() + region.getLength())) {
+ final ISourceRange range = annotation.getSourceRange();
+ if (annotation.getName().equals(PathParam.class.getName()) && range != null
+ && context.getInvocationOffset() >= range.getOffset()
+ && context.getInvocationOffset() < (range.getOffset() + range.getLength())) {
// completion proposal on @PathParam method
// annotation
return internalComputePathParamProposals(javaContext, annotation, resourceMethod);
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -330,7 +330,7 @@
assertThat(javaAnnotation.getName(), equalTo(Path.class.getName()));
assertThat(javaAnnotation.getJavaAnnotationElements().size(), equalTo(1));
assertThat(javaAnnotation.getJavaAnnotationElements().get("value").get(0), equalTo("/customers"));
- assertThat(javaAnnotation.getRegion(), notNullValue());
+ assertThat(javaAnnotation.getSourceRange(), notNullValue());
}
@Test
@@ -348,7 +348,7 @@
for (Entry<String, Annotation> entry : javaAnnotations.entrySet()) {
assertThat(entry.getKey(), equalTo(entry.getValue().getName()));
assertThat(entry.getValue().getJavaAnnotation(), notNullValue());
- assertThat(entry.getValue().getRegion(), notNullValue());
+ assertThat(entry.getValue().getSourceRange(), notNullValue());
}
}
@@ -495,8 +495,8 @@
for (JavaMethodParameter parameter : methodSignature.getMethodParameters()) {
assertThat(parameter.getAnnotations().size(), isOneOf(1, 2));
for (Annotation annotation : parameter.getAnnotations()) {
- assertThat(annotation.getRegion().getOffset(), greaterThan(sourceRange.getOffset()));
- assertThat(annotation.getRegion().getOffset(),
+ assertThat(annotation.getSourceRange().getOffset(), greaterThan(sourceRange.getOffset()));
+ assertThat(annotation.getSourceRange().getOffset(),
lessThan(sourceRange.getOffset() + sourceRange.getLength()));
}
}
More information about the jbosstools-commits
mailing list