added namespaceTouches(..)

4 files changed, 28 insertions, 8 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/NullXmlTypeAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/NullXmlTypeAnnotation.java
index d0cf4863e9..ee985a4627 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/NullXmlTypeAnnotation.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/NullXmlTypeAnnotation.java
@@ -107,8 +107,12 @@ public final class NullXmlTypeAnnotation
 	public TextRange getNamespaceTextRange(CompilationUnit astRoot) {
 		return null;
 	}
-
-
+	
+	public boolean namespaceTouches(int pos, CompilationUnit astRoot) {
+		return false;
+	}
+	
+	
 	public ListIterable<String> getPropOrder() {
 		return EmptyListIterable.instance();
 	}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlTypeAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlTypeAnnotation.java
index 891a1a1586..758e30fb06 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlTypeAnnotation.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/binary/BinaryXmlTypeAnnotation.java
@@ -13,8 +13,8 @@ import java.util.Vector;
 import org.eclipse.jdt.core.IAnnotation;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
 import org.eclipse.jpt.jaxb.core.resource.java.AbstractJavaResourceType;
+import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
 import org.eclipse.jpt.jaxb.core.resource.java.XmlTypeAnnotation;
 import org.eclipse.jpt.utility.internal.iterables.ListIterable;
 import org.eclipse.jpt.utility.internal.iterables.LiveCloneListIterable;
@@ -165,7 +165,12 @@ public final class BinaryXmlTypeAnnotation
 	public TextRange getNamespaceTextRange(CompilationUnit astRoot) {
 		throw new UnsupportedOperationException();
 	}
-
+	
+	public boolean namespaceTouches(int pos, CompilationUnit astRoot) {
+		throw new UnsupportedOperationException();
+	}
+	
+	
 	// ***** prop order
 	public ListIterable<String> getPropOrder() {
 		return new LiveCloneListIterable<String>(this.propOrder);
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlTypeAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlTypeAnnotation.java
index 2f62ee8a13..883534da5f 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlTypeAnnotation.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/java/source/SourceXmlTypeAnnotation.java
@@ -241,7 +241,12 @@ public final class SourceXmlTypeAnnotation
 	public TextRange getNamespaceTextRange(CompilationUnit astRoot) {
 		return this.getElementTextRange(NAMESPACE_ADAPTER, astRoot);
 	}
-
+	
+	public boolean namespaceTouches(int pos, CompilationUnit astRoot) {
+		return elementTouches(NAMESPACE_ADAPTER, pos, astRoot);
+	}
+	
+	
 	// ***** prop order
 	public ListIterable<String> getPropOrder() {
 		return new LiveCloneListIterable<String>(this.propOrder);
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/resource/java/XmlTypeAnnotation.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/resource/java/XmlTypeAnnotation.java
index eae2eb31d0..04402056d2 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/resource/java/XmlTypeAnnotation.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/resource/java/XmlTypeAnnotation.java
@@ -27,8 +27,8 @@ import org.eclipse.jpt.utility.internal.iterables.ListIterable;
  * @since 3.0
  */
 public interface XmlTypeAnnotation
-	extends Annotation
-{
+		extends Annotation {
+	
 	String ANNOTATION_NAME = JAXB.XML_TYPE;
 
 	/**
@@ -128,7 +128,13 @@ public interface XmlTypeAnnotation
 	 * does not exist return the {@link TextRange} for the XmlType annotation.
 	 */
 	TextRange getNamespaceTextRange(CompilationUnit astRoot);
-
+	
+	/**
+	 * Return whether the specified position touches the 'namespace' element.
+	 * Return false if the element does not exist.
+	 */
+	boolean namespaceTouches(int pos, CompilationUnit astRoot);
+	
 	/**
 	 * Corresponds to the 'propOrder' element of the XmlType annotation.
 	 * Return an empty iterator if the element does not exist in Java.