merging and merging

core/todo.txt

@@ -2,20 +2,6 @@
 X detect CMYK JPEG images and return null
 X   https://community.oracle.com/thread/1272045?start=0&tstart=0
 
-_ remove sketch path hack from PApplet
-
-python has to use launch() instead of open()
-map() is bad for Python (and JavaScript?)
-
-_ args[] should be null if none passed (otherwise args == null checks are weird)
-_ size(640,360 , P3D) doesn't work properly
-_   https://github.com/processing/processing/issues/2924
-_ why doesn't p5 punt when loadFont() is used on an otf?
-_   is this a GL problem? 
-
-_ show warning when display spanning is turned off
-_   defaults read com.apple.spaces spans-displays
-
 data
 X fix XML.getString() with a default when no attrs are present at all
 X   was causing a NullPointerException
@@ -25,15 +11,12 @@ X   add optional second param
 X   fixed for FloatDict and IntDict
 X   StringDict won't throw an exception, but optional second param added
 X add insert() with a single item to StringList, IntList, FloatList
-_ add fromOrder() and others? otherwise need temp object:
-_   categoryIndexLookup = new StringList(flavors).getOrder();
 
 table
 X fix how nulls are handled with Table.replace()
 X add (simple) ODS writer to Table
 X add addRows(Table) method (more efficient, one resize)
 X support "header" option with ODS files
-_ handling of 'missing' values in Table needs serious work
 
 pulls
 X Fix check in loadShader()
@@ -75,6 +58,8 @@ A Exceptions in P3D / P2D not showing up properly
 A   https://github.com/processing/processing/issues/2930
 
 
+0233 (3.0a6)
+
 graphics
 X roll back full screen changes
 X   https://github.com/processing/processing/issues/2641
@@ -83,6 +68,20 @@ X   these were auto-imported from PGraphics
 X remove pause variable from PApplet (was not documented)
 X added copy() to PImage (to work like get(), ala PVector)
 
+_ remove sketch path hack from PApplet
+
+python has to use launch() instead of open()
+map() is bad for Python (and JavaScript?)
+
+_ args[] should be null if none passed (otherwise args == null checks are weird)
+_ size(640,360 , P3D) doesn't work properly
+_   https://github.com/processing/processing/issues/2924
+_ why doesn't p5 punt when loadFont() is used on an otf?
+_   is this a GL problem? 
+
+_ show warning when display spanning is turned off
+_   defaults read com.apple.spaces spans-displays
+
 applet/component
 _ remove Applet as base class
 _ performance issues on OS X (might be threading due to Applet)
@@ -97,8 +96,9 @@ _   make sure it works with retina/canvas/strategy as well
 
 
 processing.data
-_ lots of 'data' changes down below
-_ need a better method for "missing" data in Table
+_ add fromOrder() and others? otherwise need temp object:
+_   categoryIndexLookup = new StringList(flavors).getOrder();
+_ handling of 'missing' values in Table needs serious work
 _   if missing int is zero, can't just remove those values from saving a table
 _   but for NaN values, it's a necessity
 _ get() methods in List/Dict shouldn't allow you to get bad values

todo.txt

@@ -15,12 +15,6 @@ X   figure out copyDir() problems before pull
 o moving window to a new location is broken due to the pull
 X update to use new 7u72 version of JRE (and JDK) stuff
 
-_ any problems with new code signing crap? 
-_   issues raised around the symlink (just replace with a copy of the binary?)
-_   https://developer.apple.com/library/prerelease/mac/technotes/tn2206/_index.html#//apple_ref/doc/uid/DTS40007919-CH1-TNTAG205
-
-_ add script to download JRE and JDK from Oracle
-
 manindra
 X ToolTipManager error
 X   https://github.com/processing/processing/issues/2926
@@ -70,6 +64,14 @@ X   https://github.com/processing/processing/issues/2364
 X   https://github.com/processing/processing/pull/2588
 
 
+0233 (3.0a6)
+
+_ any problems with new code signing crap? 
+_   issues raised around the symlink (just replace with a copy of the binary?)
+_   https://developer.apple.com/library/prerelease/mac/technotes/tn2206/_index.html#//apple_ref/doc/uid/DTS40007919-CH1-TNTAG205
+
+_ add script to download JRE and JDK from Oracle
+
 _ post a note about the "help" stuff
 _   https://github.com/processing/processing/labels/help