refactor: Removes all useless conditions with CtReference. (Closes IN…

…RIA#824)
sjd78 · Nov 3, 2016 · 0c54863 · 0c54863
1 parent e4e090c
commit 0c54863
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/src/main/java/spoon/reflect/visitor/CtScanner.java b/src/main/java/spoon/reflect/visitor/CtScanner.java
@@ -86,7 +86,6 @@
 import spoon.reflect.reference.CtLocalVariableReference;
 import spoon.reflect.reference.CtPackageReference;
 import spoon.reflect.reference.CtParameterReference;
-import spoon.reflect.reference.CtReference;
 import spoon.reflect.reference.CtTypeParameterReference;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.reference.CtUnboundVariableReference;
@@ -164,9 +163,6 @@ public void scan(Object o) {
  if (o instanceof CtElement) {
  scan((CtElement) o);
  }
- if (o instanceof CtReference) {
- scan((CtReference) o);
- }
  if (o instanceof Collection<?>) {
  for (Object obj : (Collection<?>) o) {
  scan(obj);

diff --git a/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java b/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java
@@ -1135,8 +1135,6 @@ public <T> void visitCtLiteral(CtLiteral<T> literal) {
  printer.write('\"');
  } else if (literal.getValue() instanceof Class) {
  printer.write(((Class<?>) literal.getValue()).getName());
- } else if (literal.getValue() instanceof CtReference) {
- scan((CtReference) literal.getValue());
  } else {
  printer.write(literal.getValue().toString());
  }

diff --git a/src/main/java/spoon/reflect/visitor/printer/ElementPrinterHelper.java b/src/main/java/spoon/reflect/visitor/printer/ElementPrinterHelper.java
@@ -43,7 +43,6 @@
 import spoon.reflect.factory.Factory;
 import spoon.reflect.reference.CtActualTypeContainer;
 import spoon.reflect.reference.CtFieldReference;
-import spoon.reflect.reference.CtReference;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.DefaultJavaPrettyPrinter;
 import spoon.support.util.SortedList;
@@ -162,8 +161,6 @@ public void writeAnnotationElement(Factory factory, Object value) {
  } else if (value instanceof CtFieldReference) {
  prettyPrinter.scan(((CtFieldReference<?>) value).getDeclaringType());
  printer.write("." + ((CtFieldReference<?>) value).getSimpleName());
- } else if (value instanceof CtReference) {
- prettyPrinter.scan((CtReference) value);
  } else if (value instanceof CtElement) {
  prettyPrinter.scan((CtElement) value);
  } else if (value instanceof String) {

diff --git a/src/main/java/spoon/template/TemplateMatcher.java b/src/main/java/spoon/template/TemplateMatcher.java
@@ -357,7 +357,7 @@ private boolean helperMatch(Object target, Object template) {
  }
  }
 
- if ((target instanceof CtElement) || (target instanceof CtReference)) {
+ if (target instanceof CtElement) {
  for (Field f : RtHelper.getAllFields(target.getClass())) {
  f.setAccessible(true);
  if (Modifier.isStatic(f.getModifiers())) {