integrate core fix slider for jdk9+

Author: monkstone

CHANGELOG.md

@@ -1,3 +1,5 @@
+**v2.8.0** Integrated processing core, fix for control panel, drop set initial value for slider (default to mid range)
+
 **v2.7.0** Now using custom icons, nice blue ruby image
 
 **v2.6.6** Using a modified processing-core to support jdk9 (NB FX2D and sketches with control_panel using sliders are still expected to fail with jdk9). Jdk8 users should not notice any change.

library/control_panel/control_panel.rb

@@ -8,7 +8,7 @@
 module ControlPanel
   # class used to create slider elements for control_panel
   class Slider < javax.swing.JSlider
-    def initialize(control_panel, name, range, initial_value, proc = nil)
+    def initialize(control_panel, name, range, proc = nil)
       min = range.begin * 100
       max = (
         (range.exclude_end? && range.begin.respond_to?(:succ)) ?
@@ -21,11 +21,15 @@ def initialize(control_panel, name, range, initial_value, proc = nil)
       label = control_panel.add_element(self, name)
       add_change_listener do
         update_label(label, name, value)
-        Propane.app.instance_variable_set("@#{name}", value) unless value.nil?
+        app_value(name, value)
         proc.call(value) if proc
       end
-      set_value(initial_value ? initial_value * 100 : min)
-      fire_state_changed
+      val = (range.first + range.last) / 2
+      app_value(name, val * 100)
+    end
+
+    def app_value(name, val)
+      Propane.app.instance_variable_set("@#{name}", val)
     end
 
     def value
@@ -130,8 +134,8 @@ def title(name)
       set_title(name)
     end
 
-    def slider(name, range = 0..100, initial_value = nil, &block)
-      Slider.new(self, name, range, initial_value, block || nil)
+    def slider(name, range = 0..100, &block)
+      Slider.new(self, name, range, block || nil)
     end
 
     def menu(name, elements, initial_value = nil, &block)

src/main/java/processing/core/PApplet.java

@@ -73,34 +73,34 @@
 
 /**
  * Base class for all sketches that use processing.core.
- * <p/>
+ * <p>
  * The <A HREF="https://github.com/processing/processing/wiki/Window-Size-and-Full-Screen">
  * Window Size and Full Screen</A> page on the Wiki has useful information
  * about sizing, multiple displays, full screen, etc.
- * <p/>
+ * <p>
  * Processing uses active mode rendering. All animation tasks happen on the
  * "Processing Animation Thread". The setup() and draw() methods are handled
  * by that thread, and events (like mouse movement and key presses, which are
  * fired by the event dispatch thread or EDT) are queued to be safely handled
  * at the end of draw().
- * <p/>
+ * <p>
  * Starting with 3.0a6, blit operations are on the EDT, so as not to cause
  * GUI problems with Swing and AWT. In the case of the default renderer, the
  * sketch renders to an offscreen image, then the EDT is asked to bring that
  * image to the screen.
- * <p/>
+ * <p>
  * For code that needs to run on the EDT, use EventQueue.invokeLater(). When
  * doing so, be careful to synchronize between that code and the Processing
  * animation thread. That is, you can't call Processing methods from the EDT
  * or at any random time from another thread. Use of a callback function or
  * the registerXxx() methods in PApplet can help ensure that your code doesn't
  * do something naughty.
- * <p/>
+ * <p>
  * As of Processing 3.0, we have removed Applet as the base class for PApplet.
  * This means that we can remove lots of legacy code, however one downside is
  * that it's no longer possible (without extra code) to embed a PApplet into
  * another Java application.
- * <p/>
+ * <p>
  * As of Processing 3.0, we have discontinued support for versions of Java
  * prior to 1.8. We don't have enough people to support it, and for a
  * project of our (tiny) size, we should be focusing on the future, rather
@@ -1289,7 +1289,7 @@ public void orientation(int which) {
    * Called by the browser or applet viewer to inform this applet that it
    * should start its execution. It is called after the init method and
    * each time the applet is revisited in a Web page.
-   * <p/>
+   * <p>
    * Called explicitly via the first call to PApplet.paint(), because
    * PAppletGL needs to have a usable screen before getting things rolling.
    */
@@ -1305,7 +1305,7 @@ public void start() {
   /**
    * Called by the browser or applet viewer to inform
    * this applet that it should stop its execution.
-   * <p/>
+   * <p>
    * Unfortunately, there are no guarantees from the Java spec
    * when or if stop() will be called (i.e. on browser quit,
    * or when moving between web pages), and it's not always called.
@@ -1364,7 +1364,7 @@ public void resume() { }
 //   * Called by the browser or applet viewer to inform this applet
 //   * that it is being reclaimed and that it should destroy
 //   * any resources that it has allocated.
-//   * <p/>
+//   * <p>
 //   * destroy() supposedly gets called as the applet viewer
 //   * is shutting down the applet. stop() is called
 //   * first, and then destroy() to really get rid of things.
@@ -3719,7 +3719,7 @@ public void dispose() {
 
   /**
    * Call a method in the current class based on its name.
-   * <p/>
+   * <p>
    * Note that the function being called must be public. Inside the PDE,
    * 'public' is automatically added, but when used without the preprocessor,
    * (like from Eclipse) you'll have to do it yourself.
@@ -3748,7 +3748,7 @@ public void method(String name) {
    * Launch a new thread and call the specified function from that new thread.
    * This is a very simple way to do a thread without needing to get into
    * classes, runnables, etc.
-   * <p/>
+   * <p>
    * Note that the function being called must be public. Inside the PDE,
    * 'public' is automatically added, but when used without the preprocessor,
    * (like from Eclipse) you'll have to do it yourself.
@@ -7598,7 +7598,7 @@ public boolean saveStream(String target, String source) {
   /**
    * Identical to the other saveStream(), but writes to a File
    * object, for greater control over the file location.
-   * <p/>
+   * <p>
    * Note that unlike other api methods, this will not automatically
    * compress or uncompress gzip files.
    */
@@ -7881,11 +7881,11 @@ public String sketchPath() {
    * Prepend the sketch folder path to the filename (or path) that is
    * passed in. External libraries should use this function to save to
    * the sketch folder.
-   * <p/>
+   * <p>
    * Note that when running as an applet inside a web browser,
    * the sketchPath will be set to null, because security restrictions
    * prevent applets from accessing that information.
-   * <p/>
+   * <p>
    * This will also cause an error if the sketch is not inited properly,
    * meaning that init() was never called on the PApplet when hosted
    * my some other main() or by other code. For proper use of init(),
@@ -7914,7 +7914,7 @@ public File sketchFile(String where) {
   /**
    * Returns a path inside the applet folder to save to. Like sketchPath(),
    * but creates any in-between folders so that things save properly.
-   * <p/>
+   * <p>
    * All saveXxxx() functions use the path to the sketch folder, rather than
    * its data folder. Once exported, the data folder will be found inside the
    * jar file of the exported application or applet. In this case, it's not