deprecate: Removes getSignature() and create getShortRepresentation().

src/main/java/spoon/processing/XMLAnnotationProcessor.java

@@ -16,22 +16,12 @@
  */
 package spoon.processing;
 
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.apache.log4j.Level;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
-
 import spoon.Launcher;
 import spoon.reflect.declaration.CtClass;
 import spoon.reflect.declaration.CtElement;
@@ -41,6 +31,14 @@
 import spoon.reflect.reference.CtTypeReference;
 import spoon.support.processing.XmlProcessorProperties;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * A processor to add/replace/override/remove annotations described in an XML
  * file. This version is based on java.util.regexp, but it can be subclassed to
@@ -149,8 +147,7 @@ protected boolean isExecutableMatching(CtExecutable<?> executable, String execut
 	 * @see CtElement#getSignature()
 	 */
 	protected boolean isFieldMatching(CtField<?> field, String fieldExpression) {
-		String signature = field.getSignature();
-		return java.util.regex.Pattern.matches(fieldExpression, signature);
+		return java.util.regex.Pattern.matches(fieldExpression, field.getShortRepresentation());
 	}
 
 	public final void process() {

src/main/java/spoon/reflect/declaration/CtElement.java

@@ -80,16 +80,10 @@ <A extends Annotation> CtAnnotation<A> getAnnotation(
 	 */
 	String getDocComment();
 
-
 	/**
-	 * Gets the signature of the element.
-	 * Has been introduced for CtMethod, see chapter "8.4.2 Method Signature" of the Java specification.
-	 * Overtime, has been badly exploited.
-	 *
- 	 * Deprecated, will be moved in {@link CtExecutable}, in order to follow the Java specification
+	 * Build a short representation of any element.
 	 */
-	@Deprecated
-	String getSignature();
+	String getShortRepresentation();
 
 	/**
 	 * Gets the position of this element in input source files

src/main/java/spoon/reflect/reference/CtExecutableReference.java

@@ -139,6 +139,11 @@ public interface CtExecutableReference<T> extends CtReference, CtActualTypeConta
 	 */
 	boolean isFinal();
 
+	/**
+	 * Gets the signature of this method or constructor as specified by chapter "8.4.2 Method Signature" of the Java specification
+	 */
+	String getSignature();
+
 	/**
 	 * Replaces an executable reference by another one.
 	 */

src/main/java/spoon/reflect/visitor/AstParentConsistencyChecker.java

@@ -38,6 +38,6 @@ public void scan(CtElement element) {
 	}
 
 	private static String toDebugString(CtElement e) {
-		return "Element: " + e + "\nSignature: " + e.getSignature() + "\nClass: " + e.getClass() + "\n";
+		return "Element: " + e + "\nSignature: " + e.getShortRepresentation() + "\nClass: " + e.getClass() + "\n";
 	}
 }

src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java

@@ -517,7 +517,7 @@ private void adjustPosition(CtElement e) {
 				if (!removeLine()) {
 					if (line > e.getPosition().getEndLine()) {
 						env.report(null, Level.WARN, e,
-								"cannot adjust position of " + e.getClass().getSimpleName() + " '" + e.getSignature() + "' " + " to match lines: " + line + " > [" + e.getPosition().getLine() + ", "
+								"cannot adjust position of " + e.getClass().getSimpleName() + " '" + e.getShortRepresentation() + "' " + " to match lines: " + line + " > [" + e.getPosition().getLine() + ", "
 										+ e.getPosition().getEndLine() + "]");
 					}
 					break;

src/main/java/spoon/support/reflect/code/CtLambdaImpl.java

@@ -155,6 +155,11 @@ public boolean removeThrownType(CtTypeReference<? extends Throwable> throwType)
 		return thrownTypes.remove(throwType);
 	}
 
+	@Override
+	public String getSignature() {
+		throw new UnsupportedOperationException();
+	}
+
 	@Override
 	public CtExecutableReference<T> getReference() {
 		return getFactory().Executable().createReference(this);

src/main/java/spoon/support/reflect/declaration/CtElementImpl.java

@@ -37,7 +37,7 @@
 import spoon.support.util.EmptyClearableSet;
 import spoon.support.visitor.EqualVisitor;
 import spoon.support.visitor.HashcodeVisitor;
-import spoon.support.visitor.SignaturePrinter;
+import spoon.support.visitor.ShortRepresentationPrinter;
 import spoon.support.visitor.TypeReferenceScanner;
 import spoon.support.visitor.equals.CloneHelper;
 import spoon.support.visitor.equals.EqualsVisitor;
@@ -77,20 +77,6 @@ public static <T> List<T> unmodifiableList(List<T> list) {
 		return list.isEmpty() ? Collections.<T>emptyList() : Collections.unmodifiableList(list);
 	}
 
-	public String getSignature() {
-		SignaturePrinter pr = new SignaturePrinter();
-		pr.scan(this);
-		String sig = pr.getSignature();
-
-		// we have a signature return it
-		if (sig.length() > 0) {
-			return sig;
-		}
-
-		// else fallback to backward compatibility
-		return getDeepRepresentation(this);
-	}
-
 	transient Factory factory;
 
 	protected CtElement parent;
@@ -111,6 +97,7 @@ public CtElementImpl() {
 	 * based on the deep representation
 	 * which is also used in {@link #equals(Object)}.
 	 */
+	@Override
 	public int compareTo(CtElement o) {
 		String current = getDeepRepresentation(this);
 		String other = getDeepRepresentation(o);
@@ -120,6 +107,13 @@ public int compareTo(CtElement o) {
 		return current.compareTo(other);
 	}
 
+	@Override
+	public String getShortRepresentation() {
+		final ShortRepresentationPrinter printer = new ShortRepresentationPrinter();
+		printer.scan(this);
+		return printer.getShortRepresentation();
+	}
+
 	private String getDeepRepresentation(CtElement elem) {
 		EqualVisitor prThis = new EqualVisitor();
 		prThis.scan(elem);

src/main/java/spoon/support/reflect/declaration/CtExecutableImpl.java

@@ -21,6 +21,7 @@
 import spoon.reflect.declaration.CtParameter;
 import spoon.reflect.reference.CtExecutableReference;
 import spoon.reflect.reference.CtTypeReference;
+import spoon.support.visitor.SignaturePrinter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -140,6 +141,13 @@ public boolean removeThrownType(CtTypeReference<? extends Throwable> throwType)
 		return thrownTypes.remove(throwType);
 	}
 
+	@Override
+	public String getSignature() {
+		final SignaturePrinter pr = new SignaturePrinter();
+		pr.scan(this);
+		return pr.getSignature();
+	}
+
 	@Override
 	public CtExecutableReference<R> getReference() {
 		return getFactory().Executable().createReference(this);

src/main/java/spoon/support/reflect/reference/CtExecutableReferenceImpl.java

@@ -31,6 +31,7 @@
 import spoon.reflect.visitor.filter.NameFilter;
 import spoon.support.reflect.declaration.CtElementImpl;
 import spoon.support.util.RtHelper;
+import spoon.support.visitor.SignaturePrinter;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
@@ -430,6 +431,13 @@ public boolean removeActualTypeArgument(
 				&& actualTypeArguments.remove(actualTypeArgument);
 	}
 
+	@Override
+	public String getSignature() {
+		final SignaturePrinter pr = new SignaturePrinter();
+		pr.scan(this);
+		return pr.getSignature();
+	}
+
 	@Override
 	public CtExecutableReference<T> clone() {
 		return (CtExecutableReference<T>) super.clone();