some fixes

INRIA · Mar 16, 2018 · caa2e7e · caa2e7e
1 parent 641cc92
commit caa2e7e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/test/java/spoon/test/metamodel/SpoonMetaModel.java b/src/test/java/spoon/test/metamodel/SpoonMetaModel.java
@@ -144,14 +144,18 @@ public static String getConceptName(CtType<?> type) {
 	 */
 	public static CtClass<?> getImplementationOfInterface(CtInterface<?> iface) {
 		String impl = replaceApiToImplPackage(iface.getQualifiedName()) + CLASS_SUFFIX;
-		Class implClass;
+		return (CtClass<?>) getType(impl, iface);
+	}
+
+	private static CtType<?> getType(String qualifiedName, CtElement anElement) {
+		Class aClass;
 		try {
-			implClass = iface.getClass().getClassLoader().loadClass(impl);
+			aClass = anElement.getClass().getClassLoader().loadClass(qualifiedName);
 		} catch (ClassNotFoundException e) {
 			//OK, that interface has no implementation class
 			return null;
 		}
-		return (CtClass<?>) iface.getFactory().Type().get(implClass);
+		return anElement.getFactory().Type().get(aClass);
 	}
 
 	private static final String modelApiPackage = "spoon.reflect";
@@ -174,7 +178,7 @@ public static CtInterface<?> getInterfaceOfImplementation(CtClass<?> impl) {
 		}
 		iface = iface.substring(0, iface.length() - CLASS_SUFFIX.length());
 		iface = iface.replace("spoon.support.reflect", "spoon.reflect");
-		return (CtInterface<?>) impl.getFactory().Type().get(iface);
+		return (CtInterface<?>) getType(iface, impl);
 	}
 
 	private static Factory createFactory(File spoonJavaSourcesDirectory) {