JrmyDev · JrmyDev · Feb 2, 2016 · Dec 9, 2015 · Dec 9, 2015 · Dec 9, 2015
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,8 @@ Ports/iOSPort/nbproject/private/private.xml
 /vm/ByteCodeTranslator/build/
 /vm/ByteCodeTranslator/dist/
 /vm/JavaAPI/build/
-/vm/JavaAPI/dist/
+/vm/JavaAPI/dist/
+Ports/iOSPort/nbproject/private/private.properties
+CodenameOne/build.xml
+CodenameOne/build.xml
+Ports/iOSPort/nbproject/private/private.properties
diff --git a/CodenameOne/.DS_Store b/CodenameOne/.DS_Store
diff --git a/CodenameOne/JavaDocOverview.html b/CodenameOne/JavaDocOverview.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+    <head>
+        <title>Codename One API</title>
+    </head>
+    <body>
+        <h2>Codename One - Write Once Run Anywhere Native Mobile Apps Using Java</h2>
+        <p><a href="https://www.codenameone.com/">Codename One</a> allows Java developers to write 
+            their app once and have it work on all mobile devices (iOS, Android etc.). It features a simulator, 
+            designer (visual theme/builder) and ports to multiple OS's.</p>
+
+        <p>Codename One is a mature open source project and its roots go back to Sun Microsystems (2006) 
+            where one of its core underlying components was developed and open sourced.</p>
+
+
+        <p>
+            <a href="https://github.com/codenameone/CodenameOne/">Codename One is open source</a>. 
+            This includes the libraries, native OS ports, resource editor &amp; native 
+            VM code. It also includes themes and  separate related projects containing demos, skins etc. 
+        </p>
+
+        <p>
+            You can understand more about how Codename One works and how the API fits into everything in 
+            <a href="http://stackoverflow.com/a/10646336/756809" target="_blank">this stackoverflow answer</a>.
+        </p>
+        <h4>Other Resources</h4>
+        <ul>
+            <li><a href="https://www.codenameone.com/manual/">Developer Guide</a></li>
+            <li><a href="https://www.codenameone.com/how-do-i.html">How Do I? - Get quick video answers and short tutorials for common questions</a></li>
+            <li><a href="https://www.codenameone.com/blog.html">The Codename One Blog</a></li>
+            <li><a href="https://www.codenameone.com/cn1libs.html">cn1libs are extensions to Codename One that allow using device native functionality</a></li>
+            <li><a href="http://stackoverflow.com/tags/codenameone">Stack Overflow's Codename One Tag</a></li>
+            <li><a href="https://www.codenameone.com/discussion-forum.html">Community Discussion Forum</a></li>
+            <li><a href="https://github.com/codenameone/CodenameOne/issues/">The Open Source project on github</a></li>
+            <li><a href="https://www.codenameone.com/blog/how-to-use-the-codename-one-sources.html">Build Codename One from source code</a></li>
+        </ul>
+    </body>
+</html>
diff --git a/CodenameOne/build.xml b/CodenameOne/build.xml
@@ -104,20 +104,24 @@
         <copydir src="dist/javadoc" dest="javadoc" />
     </target>
 
+    <available file="../../CodenameOne/GUIBuilder/src" property="cn1env" />
     <target name="-pre-compile" depends="stamp">
     </target>
 
-
     <!-- This target is used to build releases, you will need to comment out this target and to remove
      the depends from the pre-compile target above-->
-    <target name="stamp">
+    <target name="stamp" if="cn1env">
         <tstamp>
             <format property="tstamp" pattern="yyyyMMdd" />
         </tstamp>
         <propertyfile file="../CodenameOneDesigner/src/version.properties"
             comment="This file is automatically generated - DO NOT EDIT">        
             <entry key="build" value="${tstamp}"/>
         </propertyfile>
+        <propertyfile file="../../CodenameOne/GUIBuilder/src/version.properties"
+            comment="This file is automatically generated - DO NOT EDIT">        
+            <entry key="build" value="${tstamp}"/>
+        </propertyfile>
         <propertyfile file="../../CodenameOne/NBPlugin/CodenameOnePlugin/src/version.properties"
             comment="This file is automatically generated - DO NOT EDIT">        
             <entry key="build" value="${tstamp}"/>
@@ -351,6 +355,7 @@
 
         <zip basedir="build/CodenameOneDist" file="../nightly_builds/CodenameOne_Docs_Demos_${tstamp}.zip" />
 
+        <ant inheritall="false" antfile="../../CodenameOne/GUIBuilder/GUIBuilderSE/build.xml" target="pack" />
         <ant inheritall="false" antfile="../CodenameOneDesigner/build.xml" target="release" />
         <!-- zip basedir="../CodenameOneDesigner/dist" includes="designer.jar" file="../nightly_builds/CodenameOneDesigner_${tstamp}.zip" / -->
         <copy file="../CodenameOneDesigner/dist/designer.jar" todir="../../CodenameOne/IdeaPlugin/depedencies" />

diff --git a/CodenameOne/build_javadoc.sh b/CodenameOne/build_javadoc.sh
@@ -1,3 +1,7 @@
 #/bin/sh
 
-/usr/bin/find src ../../CodenameOne/CLDC11/src -name "*.java" | /usr/bin/grep -v /impl/ | /usr/bin/xargs /Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home/bin/javadoc -protected -d dist/javadoc -windowtitle "Codename One API"
+rm -Rf dist/javadoc
+rm -Rf build/tempJavaSources
+/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/bin/java -jar ~/dev/java/JavaDocSourceEmbed/target/JavaDocSourceEmbed-1.0-SNAPSHOT.jar src build/tempJavaSources
+
+/usr/bin/find build/tempJavaSources ../../CodenameOne/CLDC11/src -name "*.java" | /usr/bin/grep -v /impl/ | /usr/bin/xargs /Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/bin/javadoc -protected -d dist/javadoc -windowtitle "Codename One API"
diff --git a/CodenameOne/nbproject/build-impl.xml b/CodenameOne/nbproject/build-impl.xml
@@ -191,7 +191,12 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <property name="javac.fork" value="${jdkBug6558476}"/>
+        <condition else="false" property="javac.fork">
+            <or>
+                <istrue value="${jdkBug6558476}"/>
+                <istrue value="${javac.external.vm}"/>
+            </or>
+        </condition>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
         <property name="copylibs.rebase" value="true"/>
@@ -217,6 +222,7 @@ is divided into following sections:
         <condition else="" property="testng.debug.mode" value="-mixed">
             <istrue value="${junit+testng.available}"/>
         </condition>
+        <property name="java.failonerror" value="true"/>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -693,7 +699,7 @@ is divided into following sections:
             <sequential>
                 <property environment="env"/>
                 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="${profiler.info.jvmargs.agent}"/>
                     <jvmarg line="${profiler.info.jvmargs}"/>
@@ -768,7 +774,7 @@ is divided into following sections:
             <attribute default="${debug.classpath}" name="classpath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
@@ -795,7 +801,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>

diff --git a/CodenameOne/nbproject/genfiles.properties b/CodenameOne/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.44.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=cf85704b
-nbproject/build-impl.xml.script.CRC32=f3ff6722
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.1.48
+nbproject/build-impl.xml.script.CRC32=0a9d24d0
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff --git a/CodenameOne/src/CN1Resource.res b/CodenameOne/src/CN1Resource.res
diff --git a/CodenameOne/src/com/codename1/ads/AdsService.java b/CodenameOne/src/com/codename1/ads/AdsService.java
@@ -104,7 +104,7 @@ public void requestAd() {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     protected void readResponse(InputStream input) throws IOException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -118,7 +118,7 @@ protected void readResponse(InputStream input) throws IOException {
         if (size > 0) {
             String s = new String(out.toByteArray(), 0, size, "UTF-8");
             currentAd = s;
-            fireResponseListener(new ActionEvent(currentAd));
+            fireResponseListener(new ActionEvent(currentAd,ActionEvent.Type.Response));
         }
     }
 
@@ -130,23 +130,23 @@ public void onAdDisplay(HTMLComponent cmp) {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     protected void handleErrorResponseCode(int code, String message) {
         //do nothing, ads failure should not interfere with application flow
         System.err.println("error=" + code + " " + message);
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     protected void handleRuntimeException(RuntimeException err) {
         //do nothing, ads failure should not interfere with application flow
         err.printStackTrace();
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     protected void handleException(Exception err) {
         //do nothing, ads failure should not interfere with application flow

diff --git a/CodenameOne/src/com/codename1/ads/InnerActive.java b/CodenameOne/src/com/codename1/ads/InnerActive.java
@@ -152,8 +152,9 @@ public void initService(Ads ads){
         addParam(this, "mn", Display.getInstance().getProperty("MSISDN", null));
         String [] keywords = ads.getKeywords();
         if(keywords != null && keywords.length > 0){
+            int klen = keywords.length;
             String k = "";
-            for (int i = 0; i < keywords.length; i++) {
+            for (int i = 0; i < klen; i++) {
                 k += "," + keywords[i];
             }
             addParam(this, "k", k.substring(1));
@@ -164,7 +165,7 @@ public void initService(Ads ads){
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     protected void readResponse(InputStream input) throws IOException {
         StringBuffer buf = new StringBuffer();
@@ -188,7 +189,7 @@ protected void readResponse(InputStream input) throws IOException {
 //            Storage.getInstance().flushStorageCache();            
 //            addParam(this, "cid", cid);
 //        }
-        fireResponseListener(new ActionEvent(s));        
+        fireResponseListener(new ActionEvent(s,ActionEvent.Type.Response));        
     }
 
 }
diff --git a/CodenameOne/src/com/codename1/ads/package.html b/CodenameOne/src/com/codename1/ads/package.html
@@ -5,7 +5,7 @@
   </head>
     <body>
         <p>
-            The Ads API allows developers to add Ads to their apps
+            A legacy banner Ads API. This has been replaced by more modern approaches mainly thru <a href="https://www.codenameone.com/cn1libs.html">cn1libs</a>.
         </p>
         <p>
             Currently inner-active ads Network is supported

diff --git a/CodenameOne/src/com/codename1/capture/Capture.java b/CodenameOne/src/com/codename1/capture/Capture.java
@@ -45,6 +45,7 @@ public class Capture {
 
     /**
      * Returns true if the device has camera false otherwise.
+     * @return true if the device has a camera
      */ 
     public static boolean hasCamera(){
         return Display.getInstance().hasCamera();

diff --git a/CodenameOne/src/com/codename1/charts/ChartComponent.java b/CodenameOne/src/com/codename1/charts/ChartComponent.java
@@ -184,8 +184,8 @@ public void paint(Graphics g) {
 
     /**
      * Converts screen coordinates to chart coordinates.
-     * @param x 
-     * @param y
+     * @param x screen x position
+     * @param y screen y position
      * @return The chart coordinate corresponding to the given screen coordinate.
      */
     public Point screenToChartCoord(int x, int y){
@@ -199,8 +199,13 @@ public Point screenToChartCoord(int x, int y){
         return new Point(x-getAbsoluteX(), y-getAbsoluteY());
     }
 
-
-
+    /**
+     * Returns the screen position from a chart coordinate
+     *
+     * @param x the x position within the chart
+     * @param y the y position within the chart
+     * @return a position within the screen
+     */
     public Point chartToScreenCoord(int x, int y){
         x += getAbsoluteX();
         y += getAbsoluteY();
@@ -213,6 +218,11 @@ public Point chartToScreenCoord(int x, int y){
         return new Point(x, y);
     }
 
+    /**
+     * Converts a chart coordinate spaced shape to the same shape in the screen coordinate space
+     * @param s shape in screen coordinates
+     * @return same shape using chart space coordinates
+     */
     public Shape screenToChartShape(Shape s){
         GeneralPath p = new GeneralPath();
         Transform t = Transform.makeIdentity();
@@ -223,7 +233,12 @@ public Shape screenToChartShape(Shape s){
         p.append(s.getPathIterator(t), false);
         return p;
     }
-
+
+    /**
+     * Converts a screen coordinate spaced shape to the same shape in the chart  coordinate space
+     * @param s shape in chart  coordinates
+     * @return same shape using screen coordinate space
+     */
     public Shape chartToScreenShape(Shape s){
         GeneralPath p = new GeneralPath();
         Transform inverse = Transform.makeTranslation(getAbsoluteX(), getAbsoluteY());

diff --git a/CodenameOne/src/com/codename1/charts/ChartUtil.java b/CodenameOne/src/com/codename1/charts/ChartUtil.java
@@ -35,6 +35,16 @@
  */
 public class ChartUtil {
     private Canvas c = new Canvas();
+
+    /**
+     * Draws the given chart onto the given graphics
+     * 
+     * @param g the graphics object
+     * @param chart the chart object
+     * @param bounds the bounds in which the chart should be drawn within the graphics
+     * @param absX
+     * @param absY 
+     */
     public void paintChart(Graphics g, AbstractChart chart, Rectangle bounds, int absX, int absY){
         c.g = g;
         c.bounds = bounds;

diff --git a/CodenameOne/src/com/codename1/charts/compat/Canvas.java b/CodenameOne/src/com/codename1/charts/compat/Canvas.java
@@ -259,21 +259,22 @@ void drawGradient(GradientDrawable gradient){
         Orientation o = gradient.orientation;
         Rectangle r = gradient.bounds;
         int[] colors = gradient.colors;
-
+        int clen = colors.length;
+
         if ( Orientation.TOP_BOTTOM.equals(o) || Orientation.BOTTOM_TOP.equals(o)){
 
            if ( Orientation.BOTTOM_TOP.equals(o) ){
-               colors = new int[colors.length];
+               colors = new int[clen];
 
-               for ( int i=0; i<colors.length; i++){
+               for ( int i=0; i<clen; i++){
 
-                   colors[i] = gradient.colors[colors.length-i-1];
+                   colors[i] = gradient.colors[clen-i-1];
                }
            }
-           g.fillLinearGradient(colors[0], colors[colors.length-1], r.getX(), r.getY(), r.getWidth(), r.getHeight(), false);
+           g.fillLinearGradient(colors[0], colors[clen-1], r.getX(), r.getY(), r.getWidth(), r.getHeight(), false);
 
         } else if ( Orientation.LEFT_RIGHT.equals(o)){
-           g.fillLinearGradient(gradient.colors[0], gradient.colors[gradient.colors.length-1], r.getX(), r.getY(), r.getWidth(), r.getHeight(), true);
+           g.fillLinearGradient(gradient.colors[0], gradient.colors[clen-1], r.getX(), r.getY(), r.getWidth(), r.getHeight(), true);
         } else {
            Log.p("Gradient with type "+o+" not implemented yet.  Just filling solid rect");
            g.setColor(gradient.colors[0]);

diff --git a/CodenameOne/src/com/codename1/charts/compat/Paint.java b/CodenameOne/src/com/codename1/charts/compat/Paint.java
@@ -55,7 +55,9 @@ public void getTextWidths(String text, float[] widths) {
         Font f = getTypeface();
         if ( f != null ){
             char[] chars = text.toCharArray();
-            for ( int i=0; i<chars.length && i<widths.length; i++){
+            int clen = chars.length;
+            int wlen = widths.length;
+            for ( int i=0; i<clen && i<wlen; i++){
                 widths[i] = f.charWidth(chars[i]);
             }
         } else {
@@ -73,12 +75,14 @@ public int breakText(String text, boolean measureForwards, float maxWidth, float
             int inc = measureForwards ? 1 : -1;
 
             float currWidth = 0f;
-            for ( int i=start; (measureForwards && i<chars.length) || (!measureForwards && i>=0) ; i+=inc){
+            int clen = chars.length;
+            int wlen = measuredWidth != null ? measuredWidth.length : -1;
+            for ( int i=start; (measureForwards && i<clen) || (!measureForwards && i>=0) ; i+=inc){
                 tmp = f.charWidth(chars[i]);
                 if ( currWidth + tmp > maxWidth ){
                     return i;
                 }
-                if ( measuredWidth != null && i < measuredWidth.length ){
+                if (i < wlen ){
                     measuredWidth[i] = tmp;
                 }
                 currWidth += tmp;
@@ -116,7 +120,8 @@ float measureTextHeight(char[] chars, int start, int count){
         Font f = getTypeface();
         float h = 0f;
         if ( f != null ){
-            for ( int i=start; i<chars.length && i<start+count; i++){
+            int clen = chars.length;
+            for ( int i=start; i<clen && i<start+count; i++){
                 float nh = f.getHeight();
                 h = nh > h ? nh : h;
             }
@@ -136,7 +141,8 @@ public float measureText(char[] chars, int start, int count){
         float out = 0f;
         Font f = getTypeface();
         if ( f != null ){
-            for ( int i=start; i< chars.length && i < start+count; i++){
+            int clen = chars.length;
+            for ( int i=start; i< clen && i < start+count; i++){
                 out += f.charWidth(chars[i]);
             }
         } else {

diff --git a/CodenameOne/src/com/codename1/charts/compat/package.html b/CodenameOne/src/com/codename1/charts/compat/package.html
@@ -0,0 +1,6 @@
+<html>
+<title>Compat</title>
+<body>
+This package contains compatibility classes for internal use
+</body>
+</html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
       </head>
         <body>
             <p>
-                The Ads API allows developers to add Ads to their apps
+                A legacy banner Ads API. This has been replaced by more modern approaches mainly thru <a href="https://www.codenameone.com/cn1libs.html">cn1libs</a>.
             </p>
             <p>
                 Currently inner-active ads Network is supported
@@ Expand Down @@