From 73fdf04bc27da975b8a08e19ac51e6747ada47ee Mon Sep 17 00:00:00 2001
From: walterhiggins <walter.higgins@gmail.com>
Date: Sun, 5 Jan 2014 12:23:09 +0000
Subject: [PATCH] Target java 1.6 and fix exception on Mac OS due to alias
 plugin

---
 build.xml                                        | 12 ++++++------
 docs/release-notes.md                            |  8 ++++++++
 src/main/javascript/modules/utils/string-exts.js |  6 ++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 749010c..d82e4bb 100644
--- a/build.xml
+++ b/build.xml
@@ -58,15 +58,17 @@
   </target>
   
   <target name="compile" depends="init, server-setup" description="compile bukkit plugin source">
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpath="${minecraft.dir}/craftbukkit.jar" />
+    <javac includeantruntime="false" srcdir="${src}" source="1.6" target="1.6" destdir="${build}" classpath="${minecraft.dir}/craftbukkit.jar" />
   </target>
     
   <target name="gendocs" depends="construct-ypgpm, construct-api-ref" description="Generate API documentation">
   </target>
 
-  <target name="generate-api-ref-entries" depends="init">
+  <target name="compile-docs" depends="init">
     <javac includeantruntime="false" srcdir="src/docs/java"/>
+  </target>
 
+  <target name="generate-api-ref-entries" depends="compile-docs,init">
     <java classname="jscript" failonerror="true" fork="true" output="${dist}/apiref.md">
       <classpath>
         <pathelement path="src/docs/java"/>      
@@ -94,8 +96,7 @@ Walter Higgins
    </concat>      
   </target>
 
-  <target name="gen-toc-apiref" depends="generate-api-ref-entries, init" description="Generate Table of Contents for API Reference">
-    <javac includeantruntime="false" srcdir="src/docs/java"/>
+  <target name="gen-toc-apiref" depends="compile-docs,generate-api-ref-entries, init" description="Generate Table of Contents for API Reference">
     <java classname="jscript" failonerror="true" fork="true" output="${dist}/toc-apiref.md">
       <classpath>
         <pathelement path="src/docs/java"/>      
@@ -105,8 +106,7 @@ Walter Higgins
     </java>
   </target>
 
-  <target name="gen-toc-ypgpm" depends="init" description="Generate Table of Contents for Young Programmers Guide">
-    <javac includeantruntime="false" srcdir="src/docs/java"/>
+  <target name="gen-toc-ypgpm" depends="compile-docs,init" description="Generate Table of Contents for Young Programmers Guide">
     <java classname="jscript" failonerror="true" fork="true" output="${dist}/toc-ypgpm.md">
       <classpath>
         <pathelement path="src/docs/java"/>      
diff --git a/docs/release-notes.md b/docs/release-notes.md
index e081839..87a6af8 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,3 +1,11 @@
+# 2014 01 05
+
+Bug Fix: On Mac OS, alias plugin caused Exceptions due to missing
+.trim() function on String.
+
+Changed target for compilation to 1.6 so that ScriptCraft will work
+with both java 1.6 and 1.7.
+
 # 2014 01 02
 
 Added a warning in console at start-up if legacy directories are detected.
diff --git a/src/main/javascript/modules/utils/string-exts.js b/src/main/javascript/modules/utils/string-exts.js
index bb33e23..1e7159b 100644
--- a/src/main/javascript/modules/utils/string-exts.js
+++ b/src/main/javascript/modules/utils/string-exts.js
@@ -77,3 +77,9 @@ for (var method in formattingCodes){
         return function(){return c+this;};
     }(formattingCodes[method]);
 }
+// wph 20140105 trim not availabe in String on Mac OS.
+if (!String.prototype.trim){
+    String.prototype.trim = function(){
+        return this.replace(/^\s+|\s+$/g,'');
+    }
+}