Finished exposing object inheritance. Site-deploy works with localhost.

EngineHub · Oct 8, 2016 · 34be218 · 34be218
1 parent fdcf556
commit 34be218
Show file tree

Hide file tree

Showing 185 changed files with 17,020 additions and 13,459 deletions.
diff --git a/hs_err_pid18246.log b/hs_err_pid18246.log
diff --git a/persistence.db b/persistence.db
diff --git a/src/main/java/com/laytonsmith/PureUtilities/ClassLoading/Annotations/CacheAnnotations.java b/src/main/java/com/laytonsmith/PureUtilities/ClassLoading/Annotations/CacheAnnotations.java
@@ -12,8 +12,6 @@
 import com.laytonsmith.annotations.typeof;
 import com.laytonsmith.core.SimpleDocumentation;
 import com.laytonsmith.core.functions.DummyFunction;
-import com.laytonsmith.core.natives.interfaces.TypeofRunnerFor;
-import com.laytonsmith.core.natives.interfaces.TypeofRunnerIface;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.lang.reflect.Method;
@@ -23,6 +21,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import com.laytonsmith.PureUtilities.Common.Annotations.InterfaceRunnerFor;
+import com.laytonsmith.core.natives.interfaces.MixedInterfaceRunner;
 
 /**
  *
@@ -63,8 +63,8 @@ public static void main(String[] args) throws Exception {
 		for(Class c : apiClasses){
 			boolean isGetNameExempt = false;
 			if(c.isInterface()){
-				for(Class r : ClassDiscovery.getDefaultInstance().loadClassesWithAnnotation(TypeofRunnerFor.class)){
-					TypeofRunnerFor f = (TypeofRunnerFor) r.getAnnotation(TypeofRunnerFor.class);
+				for(Class r : ClassDiscovery.getDefaultInstance().loadClassesWithAnnotation(InterfaceRunnerFor.class)){
+					InterfaceRunnerFor f = (InterfaceRunnerFor) r.getAnnotation(InterfaceRunnerFor.class);
 					if(f.value() == c){
 						isGetNameExempt = c.getAnnotation(typeof.class) != null;
 						c = r;
@@ -78,7 +78,7 @@ public static void main(String[] args) throws Exception {
 				// Skip this one. These are excused from the normal reporting requirements.
 				continue;
 			}
-			if(!SimpleDocumentation.class.isAssignableFrom(c) && !TypeofRunnerIface.class.isAssignableFrom(c)){
+			if(!SimpleDocumentation.class.isAssignableFrom(c) && !MixedInterfaceRunner.class.isAssignableFrom(c)){
 				uhohs.add(c.getName() + " must implement SimpleDocumentation");
 				continue;
 			}