propane 2.7.0-java → 2.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28bf3672373ab332b735ada0099fb26d4d9a9eff2d2ce172dc1db2f2bf79f808
-  data.tar.gz: 0bb915d145b7da16d736fabd32b134547b7c49e630d48741a43fe338fb888438
+  metadata.gz: 8e9d6379de6255f40524c6b647113c8c106e8ec2decbfe88f7adb73225a8d74d
+  data.tar.gz: 38454f8850e0e2ab2c4fed609bc8521188a2e98e79451f774b3b4fb17308cc11
 SHA512:
-  metadata.gz: 447183c1fd054f4d3d93aab6ff7d78590f33db6930e2e2df77d0914700b550195349b99e98d69119385d4421ea8f333d6c1d6061b8a8d396077b05badfa8f40e
-  data.tar.gz: 11bbb73e10240c4ec57e82868668f11d7fd303f160f409630b765cfc097e684ccdef21973be5cf34c4d5c249ba2003c61ceb7330ed22493ed4b9d45a78f3f648
+  metadata.gz: ab65430ac2ac3ea8877a8552b71080d878a53c27d068927253d59e93e4078f4fb6eb3661078e0454dabd4f75875ca8230196a7dbeb65be763aa3c766c4de0090
+  data.tar.gz: 27dca256dd36b656b10d07f8a770948441b517cccff56fd44454bf6f2e89dee90427d89086e2d2b4a7e38ab3fab55d0961c1db29defdac46454da5e808a47a7d

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+**v2.7.1** Avoid calling protected method in control_panel (ready for jdk9)
+
 **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.

data/README.md

@@ -10,7 +10,7 @@ adjust above for your OS/distro setup.
 - jdk8+ (jdk9 mostly works, see changelog, but is noisy)
 - jruby-9.1.16.0
 - mvn-3.5.0+
-- processing-core.jar (_build only_) not generally available
+- processing-core.jar (_build only_) see [propane-core](https://github.com/ruby-processing/processing-core)
 
 ## Building and testing
 
@@ -82,4 +82,3 @@ propane --install samples
 [building]:http://ruby-processing.github.io/building/building/
 [gh-pages]:https://ruby-processing.github.io/propane/
 [processing-core]:https://github.com/ruby-processing/processing-core
-

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.7.0'.freeze
+  VERSION = '2.7.1'.freeze
 end

data/library/control_panel/control_panel.rb

@@ -1,18 +1,20 @@
 # Here's a little library for quickly hooking up controls to sketches.
 # For messing with the parameters and such.
 # These controls will set instance variables on the sketches.
-
 # You can make sliders, checkboxes, buttons, and drop-down menus.
-# (optionally) pass the range and default value.
-
+# Optionally pass range and a default value to sliders.
 module ControlPanel
+  def self.app_value(name, val)
+    Propane.app.instance_variable_set("@#{name}", val)
+  end
+
   # 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, initial, proc = nil)
       min = range.begin * 100
-      max = (
-        (range.exclude_end? && range.begin.respond_to?(:succ)) ?
-          range.max : range.end) * 100
+      mx = range.end
+      mx = range.max if range.exclude_end? && range.begin.respond_to?(:succ)
+      max = mx * 100
       super(min, max)
       set_minor_tick_spacing((max - min).abs / 10)
       set_paint_ticks true
@@ -21,11 +23,12 @@ module ControlPanel
       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?
+        ControlPanel.app_value(name, value)
         proc.call(value) if proc
       end
-      set_value(initial_value ? initial_value * 100 : min)
-      fire_state_changed
+      val = initial.nil? ? (range.first + range.last) * 50 : initial * 100
+      set_value(val)
+      ControlPanel.app_value(name, val)
     end
 
     def value
@@ -46,7 +49,7 @@ module ControlPanel
       set_preferred_size(java.awt.Dimension.new(190, 30))
       control_panel.add_element(self, name)
       add_action_listener do
-        Propane.app.instance_variable_set("@#{name}", value) unless value.nil?
+        ControlPanel.app_value(name, value) unless value.nil?
         proc.call(value) if proc
       end
       set_selected_index(initial_value ? elements.index(initial_value) : 0)
@@ -66,10 +69,11 @@ module ControlPanel
       set_horizontal_alignment javax.swing.SwingConstants::CENTER
       control_panel.add_element(self, name, false)
       add_action_listener do
-        Propane.app.instance_variable_set("@#{name}", value)
+        ControlPanel.app_value(name, value)
         proc.call(value) if proc
       end
     end
+
     # define value as checkbox state
     def value
       is_selected
@@ -99,7 +103,7 @@ module ControlPanel
       super()
       @elements = []
       @panel = javax.swing.JPanel.new(java.awt.FlowLayout.new(1, 0, 0))
-      set_feel
+      feel
     end
 
     def display
@@ -107,7 +111,8 @@ module ControlPanel
       set_size 200, 30 + (64 * elements.size)
       set_default_close_operation javax.swing.JFrame::HIDE_ON_CLOSE
       set_resizable false
-      set_location(Propane.app.width + 10, 0) unless Propane.app.width + 10 > Propane.app.displayWidth
+      xoffset = Propane.app.width + 10
+      set_location(xoffset, 0) unless xoffset > Propane.app.displayWidth
       panel.visible = true
     end
 
@@ -130,8 +135,8 @@ module ControlPanel
       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, initial = nil, &block)
+      Slider.new(self, name, range, initial, block || nil)
     end
 
     def menu(name, elements, initial_value = nil, &block)
@@ -148,17 +153,17 @@ module ControlPanel
     end
 
     def look_feel(lf)
-      set_feel(lf)
+      feel(lf)
     end
 
     private
 
-    def set_feel(lf = 'metal')
+    def feel(lf = 'metal')
       lafinfo = javax.swing.UIManager.getInstalledLookAndFeels
-      laf = lafinfo.to_ary.select do |info|
+      laf = lafinfo.to_ary.find do |info|
         info.name =~ Regexp.new(Regexp.escape(lf), Regexp::IGNORECASE)
       end
-      javax.swing.UIManager.setLookAndFeel(laf[0].class_name)
+      javax.swing.UIManager.setLookAndFeel(laf.class_name)
     end
   end
 
@@ -169,6 +174,8 @@ module ControlPanel
       return @control_panel unless block_given?
       yield(@control_panel)
       @control_panel.display
+      @control_panel.set_visible true
+      @control_panel # for legacy compat
     end
   end
 end

data/pom.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane', '2.7.0'
+  id 'propane:propane', '2.7.1'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>2.7.0</version>
+  <version>2.7.1</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -44,15 +44,15 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/ruby-processing/propane/issues</url>
   </issueManagement>
   <properties>
-    <propane.basedir>${project.basedir}</propane.basedir>
+    <jogl.version>2.3.2</jogl.version>
+    <jruby.api>http://jruby.org/apidocs/</jruby.api>
+    <source.directory>src</source.directory>
     <maven.compiler.target>1.8</maven.compiler.target>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
-    <source.directory>src</source.directory>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
+    <propane.basedir>${project.basedir}</propane.basedir>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jogl.version>2.3.2</jogl.version>
-    <jruby.api>http://jruby.org/apidocs/</jruby.api>
+    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
+    <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
   <dependencies>
     <dependency>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake