Merge remote-tracking branch 'origin/master' into fragment

Conflicts:
	src/processing/mode/android/AndroidBuild.java

Author: omerjerk

build.xml

@@ -36,8 +36,8 @@
 <!--
 	   classpath="../core/library/core.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/jdt-core.jar; lib/jna.jar; lib/org-netbeans-swing-outline.jar;lib/com.ibm.icu_4.4.2.v20110823.jar;lib/jdi.jar;lib/jdimodel.jar;lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"
 -->
-    <javac source="1.6" 
-	   target="1.6" 
+    <javac source="1.7" 
+	   target="1.7" 
 	   destdir="bin" 
 	   encoding="UTF-8" 
 	   includeAntRuntime="false"

core/src/processing/data/Table.java

@@ -1855,35 +1855,35 @@ public void insertRow(int insert, Object[] columnData) {
         case INT: {
           int[] intTemp = new int[rowCount+1];
           System.arraycopy(columns[col], 0, intTemp, 0, insert);
-          System.arraycopy(columns[col], insert, intTemp, insert+1, (rowCount - insert) + 1);
+          System.arraycopy(columns[col], insert, intTemp, insert+1, rowCount - insert);
           columns[col] = intTemp;
           break;
         }
         case LONG: {
           long[] longTemp = new long[rowCount+1];
           System.arraycopy(columns[col], 0, longTemp, 0, insert);
-          System.arraycopy(columns[col], insert, longTemp, insert+1, (rowCount - insert) + 1);
+          System.arraycopy(columns[col], insert, longTemp, insert+1, rowCount - insert);
           columns[col] = longTemp;
           break;
         }
         case FLOAT: {
           float[] floatTemp = new float[rowCount+1];
           System.arraycopy(columns[col], 0, floatTemp, 0, insert);
-          System.arraycopy(columns[col], insert, floatTemp, insert+1, (rowCount - insert) + 1);
+          System.arraycopy(columns[col], insert, floatTemp, insert+1, rowCount - insert);
           columns[col] = floatTemp;
           break;
         }
         case DOUBLE: {
           double[] doubleTemp = new double[rowCount+1];
           System.arraycopy(columns[col], 0, doubleTemp, 0, insert);
-          System.arraycopy(columns[col], insert, doubleTemp, insert+1, (rowCount - insert) + 1);
+          System.arraycopy(columns[col], insert, doubleTemp, insert+1, rowCount - insert);
           columns[col] = doubleTemp;
           break;
         }
         case STRING: {
           String[] stringTemp = new String[rowCount+1];
           System.arraycopy(columns[col], 0, stringTemp, 0, insert);
-          System.arraycopy(columns[col], insert, stringTemp, insert+1, (rowCount - insert) + 1);
+          System.arraycopy(columns[col], insert, stringTemp, insert+1, rowCount - insert);
           columns[col] = stringTemp;
           break;
         }

core/src/processing/opengl/PGLES.java

@@ -136,6 +136,7 @@ protected void registerListeners() { }
   protected void getGL(PGL pgl) {
     PGLES pgles = (PGLES)pgl;
     this.gl = pgles.gl;
+    setThread(pgles.glThread);
   }
 
 
@@ -213,6 +214,7 @@ public void onSurfaceCreated(GL10 igl, EGLConfig config) {
       gl = igl;
       context = ((EGL10)EGLContext.getEGL()).eglGetCurrentContext();
       glContext = context.hashCode();
+      glThread = Thread.currentThread();
 
       if (!hasFBOs()) {
         throw new RuntimeException(MISSING_FBO_ERROR);

mode.properties

@@ -3,7 +3,8 @@ authorList = [The Processing Foundation](http://android.processing.org/)
 url = https://github.com/processing/processing-android
 sentence = Create projects with Processing for Android devices
 paragraph = This version of the Android Mode is for Processing 3.0a11+
-version = 238
-prettyVersion = 3.1
-minRevision = 238
+imports=processing.mode.java.JavaMode
+version = 239
+prettyVersion = 3alpha
+minRevision = 237
 maxRevision = 0

src/processing/mode/android/AVD.java

@@ -17,7 +17,7 @@ public class AVD {
   static private final String AVD_CREATE_SECONDARY =
     "The default Android emulator could not be set up. Make sure<br>" +
     "that the Android SDK is installed properly, and that the<br>" +
-    "Android and Google APIs are installed for level " + AndroidBuild.sdkVersion + ".<br>" +
+    "Android and Google APIs are installed for level %s.<br>" +
     "(Between you and me, occasionally, this error is a red herring,<br>" +
     "and your sketch may be launching shortly.)";
 
@@ -45,56 +45,99 @@ public class AVD {
   /** "android-7" or "Google Inc.:Google APIs:7" */
   protected String target;
 
-  /** x86, x86_64 or armeabi-v7a **/
+  /** x86, x86_64 or armeabi **/
   protected String abi;
 
+  protected VirtualDevice virtualDevice;
+  
   public static final String PREF_KEY_ABI = "android.sdk.abi";
-  public static final String[] ABI = {"armeabi-v7a", "x86", "x86_64"};
+  public static final String[] ABI = {"armeabi", "x86", "x86_64"};
 
   /** Default virtual device used by Processing. */
   static public AVD defaultAVD;
 //            "Google Inc.:Google APIs:" + AndroidBuild.sdkVersion);
 
-  static ArrayList<String> avdList;
-  static ArrayList<String> badList;
-//  static ArrayList<String> skinList;
+  static ArrayList<VirtualDevice> avdList;
+  static ArrayList<VirtualDevice> badList;
+  
+  
+  private static class VirtualDevice {
+      public String name;
+      public String target;
+      public String abi;
+      public VirtualDevice(String name, String target, String abi) {
+          this.name = name;
+          this.target = target;
+          this.abi = abi;
+      }
 
+      @Override
+      public boolean equals(Object o) {
+          VirtualDevice device = (VirtualDevice) o;
+          if (device.name.equals(name) && device.target.equals(target)
+                  && device.abi.equals(abi)) {
+              return true;
+          }
+          return false;
+      }
+  }
+  
 
   public AVD(String name, String target, String abi) {
     this.name = name;
     this.target = target;
     this.abi = abi;
+    virtualDevice = new VirtualDevice(name, target, abi);
   }
 
 
   static protected void list(final AndroidSDK sdk) throws IOException {
     try {
-      avdList = new ArrayList<String>();
-      badList = new ArrayList<String>();
+      avdList = new ArrayList<VirtualDevice>();
+      badList = new ArrayList<VirtualDevice>();
       ProcessResult listResult =
         new ProcessHelper(sdk.getAndroidToolPath(), "list", "avds").execute();
       if (listResult.succeeded()) {
         boolean badness = false;
+        String mTarget = null;
+        String mAbi = null;
+        String mName = null;
         for (String line : listResult) {
           String[] m = PApplet.match(line, "\\s+Name\\:\\s+(\\S+)");
           if (m != null) {
+            mName = m[1];
+            continue;
+          }
+              
+          m = PApplet.match(line, "API\\slevel\\s([0-9]+)");
+          if (m != null) {
+            mTarget = m[1];
+            continue;
+          }
+          
+          m = PApplet.match(line, "\\s+Tag\\/ABI\\:\\s\\S+\\/(\\S+)");
+          if (m != null) {
+              mAbi = m[1];
+          }
+          
+          if (mName != null && mTarget != null && mAbi != null) {
+            VirtualDevice mVirtualDevice = new VirtualDevice(mName, mTarget, mAbi);
+            mTarget = null;
+            mAbi = null;
             if (!badness) {
-//              System.out.println("good: " + m[1]);
-              avdList.add(m[1]);
+              avdList.add(mVirtualDevice);
             } else {
-//              System.out.println("bad: " + m[1]);
-              badList.add(m[1]);
+              badList.add(mVirtualDevice);
             }
-//          } else {
-//            System.out.println("nope: " + line);
           }
+          
           // "The following Android Virtual Devices could not be loaded:"
           if (line.contains("could not be loaded:")) {
 //            System.out.println("starting the bad list");
 //            System.err.println("Could not list AVDs:");
 //            System.err.println(listResult);
             badness = true;
-//            break;
+            break;
           }
         }
       } else {
@@ -109,15 +152,9 @@ protected boolean exists(final AndroidSDK sdk) throws IOException {
     if (avdList == null) {
       list(sdk);
     }
-    for (String avd : avdList) {
-      if (Base.DEBUG) {
-        System.out.println("AVD.exists() checking for " + name + " against " + avd);
-      }
-      if (avd.equals(name)) {
-        return true;
-      }
-    }
-    return false;
+    virtualDevice.target = AndroidBuild.sdkVersion;
+    virtualDevice.abi = abi;
+    return avdList.contains(virtualDevice);
   }
 
 
@@ -127,12 +164,7 @@ protected boolean exists(final AndroidSDK sdk) throws IOException {
    * (Prestigious may also not be the right word.)
    */
   protected boolean badness() {
-    for (String avd : badList) {
-      if (avd.equals(name)) {
-        return true;
-      }
-    }
-    return false;
+    return badList.contains(virtualDevice);
   }
 
 
@@ -165,7 +197,8 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       } else {
         // Just generally not working
 //        Base.showWarning("Android Error", AVD_CREATE_ERROR, null);
-        Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY, AVD_CREATE_SECONDARY, null);
+        Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
+                String.format(AVD_CREATE_SECONDARY, AndroidBuild.sdkVersion), null);
         System.out.println(createAvdResult);
 //        throw new IOException("Error creating the AVD");
       }
@@ -178,7 +211,8 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 
   static public boolean ensureProperAVD(final AndroidSDK sdk, final String abi) {
     try {
-      defaultAVD = new AVD("Processing-0" + Base.getRevision(),
+      defaultAVD = new AVD("Processing-0" + Base.getRevision() + "-" + AndroidBuild.sdkVersion +
+              "-" + abi,
           "android-" + AndroidBuild.sdkVersion, abi);
       if (defaultAVD.exists(sdk)) {
 //        System.out.println("the avd exists");
@@ -195,8 +229,10 @@ static public boolean ensureProperAVD(final AndroidSDK sdk, final String abi) {
         return true;
       }
     } catch (final Exception e) {
+        e.printStackTrace();
 //      Base.showWarning("Android Error", AVD_CREATE_ERROR, e);
-      Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY, AVD_CREATE_SECONDARY, null);
+      Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
+              String.format(AVD_CREATE_SECONDARY, AndroidBuild.sdkVersion), null);
     }
     System.out.println("at bottom of ensure proper");
     return false;