Finish importing Learning Trail articles

Author: LadyCailin

src/main/java/com/laytonsmith/annotations/api.java

@@ -1,5 +1,3 @@
-
-
 package com.laytonsmith.annotations;
 
 import com.laytonsmith.core.PlatformResolver;
@@ -15,94 +13,104 @@
 
 /**
  * Marks a function as an API function, which includes it in the list of functions.
- * 
+ *
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface api {
-    
-    public enum Platforms{
-        INTERPRETER_JAVA(null, "Java Interpreter"),
-        COMPILER_BASH(new BashPlatformResolver(), "Bash Compiler");
-        private PlatformResolver resolver;
-        private String platformName;
-        /**
-         * Returns the platform specific resolver, which is able to override base functionality,
-         * which will be adjusted as needed. If the resolver is null, one does not exist, implying
-         * that the default is fine.
-         * @return 
-         */
-        public PlatformResolver getResolver(){
-            return this.resolver;
-        }
-        public String platformName(){
-            return this.platformName;
-        }
-        private Platforms(PlatformResolver resolver, String platformName){
-            this.resolver = resolver;
-            this.platformName = platformName;
-        }
-    }
-    
+
+    public enum Platforms {
+	INTERPRETER_JAVA(null, "Java Interpreter"),
+	COMPILER_BASH(new BashPlatformResolver(), "Bash Compiler");
+	private PlatformResolver resolver;
+	private String platformName;
+
 	/**
-	 * Returns the platform this is implemented for. The default is {@see api.Platforms#INTERPRETER_JAVA}.
-	 * @return 
+	 * Returns the platform specific resolver, which is able to override base functionality, which will be adjusted
+	 * as needed. If the resolver is null, one does not exist, implying that the default is fine.
+	 *
+	 * @return
 	 */
-    Platforms [] platform() default {api.Platforms.INTERPRETER_JAVA};
+	public PlatformResolver getResolver() {
+	    return this.resolver;
+	}
+
+	public String platformName() {
+	    return this.platformName;
+	}
+
+	private Platforms(PlatformResolver resolver, String platformName) {
+	    this.resolver = resolver;
+	    this.platformName = platformName;
+	}
+    }
+
+    /**
+     * Returns the platform this is implemented for. The default is {
+     *
+     * @see api.Platforms#INTERPRETER_JAVA}.
+     * @return
+     */
+    Platforms[] platform() default {api.Platforms.INTERPRETER_JAVA};
+
+    /**
+     * Returns the environments this api element uses. The default is an empty array, but note that GlobalEnv.class is
+     * implied for all elements, and it is not required to add that to this list.
+     *
+     * @return
+     */
+    Class<? extends Environment.EnvironmentImpl>[] environments() default {};
+
+    /**
+     * If this api element is enabled. The default is {@code true}, but you can temporarily disable an element by
+     * setting this to false.
+     *
+     * @return
+     */
+    boolean enabled() default true;
+
+    /**
+     * This is a list of valid classes that are valid to be tagged with this annotation.
+     */
+    public static enum ValidClasses {
+	FUNCTION(com.laytonsmith.core.functions.FunctionBase.class),
+	EVENT(com.laytonsmith.core.events.Event.class);
+	private static List<Class> classes = null;
+	Class classType;
+
+	private ValidClasses(Class c) {
+	    classType = c;
+	}
+
 	/**
-	 * Returns the environments this api element uses. The default is an empty array, but note
-	 * that GlobalEnv.class is implied for all elements, and it is not required to add that to this
-	 * list.
-	 * @return 
+	 * Returns a copy of the list of valid classes that may be tagged with the api annotation.
+	 *
+	 * @return
 	 */
-    Class<? extends Environment.EnvironmentImpl> [] environments() default {};
+	public static List<Class> Classes() {
+	    if (classes == null) {
+		Class[] cc = new Class[ValidClasses.values().length];
+		for (int i = 0; i < ValidClasses.values().length; i++) {
+		    cc[i] = ValidClasses.values()[i].classType;
+		}
+		classes = Arrays.asList(cc);
+	    }
+	    return new ArrayList<Class>(classes);
+	}
+
 	/**
-	 * If this api element is enabled. The default is {@code true}, but you can temporarily
-	 * disable an element by setting this to false.
-	 * @return 
+	 * Returns true if the specified class extends a valid class.
+	 *
+	 * @param c
+	 * @return
 	 */
-	boolean enabled() default true;
-    
-    /**
-     * This is a list of valid classes that are valid to be tagged with this annotation.
-     */
-    public static enum ValidClasses{
-        FUNCTION(com.laytonsmith.core.functions.FunctionBase.class),
-        EVENT(com.laytonsmith.core.events.Event.class);
-        private static List<Class> classes = null;
-        Class classType;
-        private ValidClasses(Class c){
-            classType = c;
-        }
-        
-        /**
-         * Returns a copy of the list of valid classes that may be tagged with
-         * the api annotation.
-         * @return 
-         */
-        public static List<Class> Classes(){
-            if(classes == null){
-                Class[] cc = new Class[ValidClasses.values().length];
-                for(int i = 0; i < ValidClasses.values().length; i++){
-                    cc[i] = ValidClasses.values()[i].classType;
-                }
-                classes = Arrays.asList(cc);
-            }
-            return new ArrayList<Class>(classes);
-        }
-        
-        /**
-         * Returns true if the specified class extends a valid class.
-         * @param c
-         * @return 
-         */
-        public static boolean IsValid(Class c){
-            for(Class cc : Classes()){
-                if(cc.isAssignableFrom(c)){
-                    return true;
-                }
-            }
-            return false;
-        }
+	public static boolean IsValid(Class c) {
+	    for (Class cc : Classes()) {
+		if (cc.isAssignableFrom(c)) {
+		    return true;
+		}
+	    }
+	    return false;
+	}
     }
 }

src/main/java/com/laytonsmith/core/Main.java

@@ -674,13 +674,14 @@ public static void main(String[] args) throws Exception {
 		    f.createNewFile();
 		    f.setExecutable(true);
 		    FileUtil.write("#!/usr/bin/env /usr/local/bin/mscript"
-			    + li + li
-			    + "/**" + li
-			    + " * Name: " + f.getName() + li
-			    + " * Author: " + StaticLayer.GetConvertor().GetUser(null) + li
-			    + " * Creation Date: " + new Scheduling.simple_date().exec(Target.UNKNOWN, null, new CString("yyyy-MM-dd", Target.UNKNOWN)).val() + li
-			    + " * Description: " + li
-			    + " */" + li + li, f, true);
+			    + li
+			    + "<!" + li
+			    + "\tstrict;" + li
+			    + "\tname: " + f.getName() + ";" + li
+			    + "\tauthor: " + StaticLayer.GetConvertor().GetUser(null) + ";" + li
+			    + "\tcreated: " + new Scheduling.simple_date().exec(Target.UNKNOWN, null, new CString("yyyy-MM-dd", Target.UNKNOWN)).val() + ";" + li
+			    + "\tdescription: " + ";" + li
+			    + ">" + li + li, f, true);
 		}
 	    } else {
 		throw new Error("Should not have gotten here");

src/main/java/com/laytonsmith/core/compiler/FileOptions.java

@@ -6,36 +6,42 @@
 
 /**
  *
- * 
+ *
  */
 public class FileOptions {
 
 	private boolean strict;
 	private List<String> supressWarnings;
+	private String name;
+	private String author;
+	private String created;
 	private String description;
 	//TODO: Make this non-public once this is all finished.
 	public FileOptions(Map<String, String> parsedOptions) {
 		strict = parseBoolean(getDefault(parsedOptions, "strict", "false"));
 		supressWarnings = parseList(getDefault(parsedOptions, "supresswarnings", ""));
+		name = getDefault(parsedOptions, "name", "");
+		author = getDefault(parsedOptions, "author", "");
+		created = getDefault(parsedOptions, "created", "");
 		description = getDefault(parsedOptions, "description", null);
 	}
-	
+
 	private String getDefault(Map<String, String> map, String key, String defaultIfNone){
 		if(map.containsKey(key)){
 			return map.get(key);
 		} else {
 			return defaultIfNone;
 		}
 	}
-	
+
 	private boolean parseBoolean(String bool){
 		if(bool.equalsIgnoreCase("false") || bool.equalsIgnoreCase("off")){
 			return false;
 		} else {
 			return true;
 		}
 	}
-	
+
 	private List<String> parseList(String list){
 		List<String> l = new ArrayList<String>();
 		for(String part : list.split(",")){
@@ -45,15 +51,27 @@ private List<String> parseList(String list){
 		}
 		return l;
 	}
-	
+
 	public boolean isStrict(){
 		return strict;
 	}
-	
+
 	public boolean isWarningSupressed(String warning){
 		return warning.trim().contains(warning.toLowerCase());
 	}
-	
+
+	public String getName() {
+	    return name;
+	}
+
+	public String getAuthor() {
+	    return author;
+	}
+
+	public String getCreated() {
+	    return created;
+	}
+
 	public String getDescription(){
 		return description;
 	}
@@ -62,8 +80,11 @@ public String getDescription(){
 	public String toString() {
 		return (strict ? "Strict Mode on" : "") + "\n" +
 			   (supressWarnings.isEmpty() ? "" : "Suppressed Warnings: " + supressWarnings.toString() + "\n") +
+			   (name.isEmpty() ? "" : "File name: " + name + "\n") +
+			   (author.isEmpty() ? "" : "Author: " + author + "\n") +
+			   (created.isEmpty() ? "" : "Creation Date: " + created + "\n") +
 			   (description == null ? "" : "File description: " + description + "\n");
-				
-	}		
-	
+
+	}
+
 }

src/main/java/com/laytonsmith/core/functions/EntityManagement.java

@@ -601,66 +601,6 @@ public CHVersion since() {
 		}
 	}
 
-	@api
-	public static class get_entity_breedable extends EntityGetterFunction {
-
-		@Override
-		public Construct exec(Target t, Environment environment, Construct... args) throws ConfigRuntimeException {
-			MCEntity ent = Static.getEntity(args[0], t);
-			if(ent instanceof MCAgeable) {
-				return CBoolean.get(((MCAgeable) ent).getCanBreed());
-			} else {
-				throw new CREBadEntityException("Entity ID must be from an ageable entity!", t);
-			}
-		}
-
-		@Override
-		public String getName() {
-			return "get_entity_breedable";
-		}
-
-		@Override
-		public String docs() {
-			return "boolean {entityID} Returns if an entity is set to be breedable.";
-		}
-
-		@Override
-		public CHVersion since() {
-			return CHVersion.V3_3_1;
-		}
-	}
-
-	@api
-	public static class set_entity_breedable extends EntitySetterFunction {
-
-		@Override
-		public Construct exec(Target t, Environment environment, Construct... args) throws ConfigRuntimeException {
-			boolean breed = Static.getBoolean(args[1]);
-			MCEntity ent = Static.getEntity(args[0], t);
-			if(ent instanceof MCAgeable) {
-				((MCAgeable) ent).setCanBreed(breed);
-			} else {
-				throw new CREBadEntityException("Entity ID must be from an ageable entity!", t);
-			}
-			return CVoid.VOID;
-		}
-
-		@Override
-		public String getName() {
-			return "set_entity_breedable";
-		}
-
-		@Override
-		public String docs() {
-			return "void {entityID, boolean} Set an entity to be breedable.";
-		}
-
-		@Override
-		public CHVersion since() {
-			return CHVersion.V3_3_1;
-		}
-	}
-
 	@api
 	public static class get_entity_age extends EntityGetterFunction {