jrubyfx-fxmlloader 0.4-java → 0.4.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dba6126b3ed56424fa13ae880b4f8dda4aed7a5
-  data.tar.gz: 21a8be844a4f3d22b1c22462542d01330a856431
+  metadata.gz: f0deb7aeb1091b999e9983a95b9fe3d184034068
+  data.tar.gz: 1e4d685cb8e9d8f37ee3215aa85fda49cd961c0d
 SHA512:
-  metadata.gz: c1d0ed616f268fb7727a8bc29d21113d4dd003d86e321f10bda791506baee80d0f0568714418ccc876525866674fc08bfa8562ce96ff215356f1133cd0c10ea1
-  data.tar.gz: fa25ff79a1f5311cfa094d900ba057ca3607f7aaa62f03d4c68cadb29662e3e6a261b3ce96a3fbaa1efd627b5147c4a57b9071e26b3478afe14985ddc7091266
+  metadata.gz: 2224f8aa62ab203070bab2e3944f2ecda4122c3d62521b8bc939bad5bbe4b7e243afa5bb26e0bca84fe28b146ada10b4b7bf413406487ed8f4d9e4dd813442ad
+  data.tar.gz: 07a02729732870ee2d0c85dcf928d6456223cb0cee209cf06149b664621ec781e61df482297d4a2132f459745560a262ec0dcf15214081aba02b047dad617581

data/Rakefile

@@ -45,7 +45,7 @@ task :gem => :jar
 
 spec = Gem::Specification.new do |s|
   s.name = 'jrubyfx-fxmlloader'
-  s.version = '0.4'
+  s.version = '0.4.1'
   s.platform    = 'java'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']

data/lib/fxmlloader/elts.rb

@@ -539,7 +539,10 @@ class ScriptEventHandler
   def handle(event)
     # Don't pollute the page namespace with values defined in the script
     engineBindings = @scriptEngine.getBindings(ScriptContext::ENGINE_SCOPE);
-    localBindings = @scriptEngine.createBindings();
+    #localBindings = @scriptEngine.createBindings(); # TODO: this causes errors with nashorn in jdk8 by creating a different kind of 
+    # script object that doesn't respect the magic nashorn.global object
+    localBindings = Java::JavaxScript::SimpleBindings.new
+    localBindings.put_all(engineBindings)
     localBindings.put(FXL::EVENT_KEY, event);
     @scriptEngine.setBindings(localBindings, ScriptContext::ENGINE_SCOPE);
 

data/lib/jrubyfx-fxmlloader.rb

@@ -36,7 +36,7 @@ end
 java_import 'javafx.fxml.JavaFXBuilderFactory'
 java_import 'java.lang.InstantiationException', 'java.lang.IllegalAccessException'
 
-java_import *%w[com.sun.javafx.Logging
+java_import *%w[
 java.io.IOException
 java.io.InputStream
 java.io.InputStreamReader
@@ -219,7 +219,7 @@ class SecretHashCompararator
 end
 
 class FxmlBuilderBuilder # the builder builder (builds builders)
-  @@bf = Java::javafx.fxml.JavaFXBuilderFactory.new
+  @@bf = Java::javafx.fxml.JavaFXBuilderFactory.new(JRuby.runtime.jruby_class_loader)
   def self.new(arg_map, builder_type)
     builder = @@bf.getBuilder(builder_type)
     arg_map.each do |k, v|
@@ -265,7 +265,7 @@ class FxmlLoader
   @@fxml_jit_info = {}
   def initialize(url=nil, ctrlr=nil, resourcs=nil, buildFactory=nil, charset=nil, loaders=nil)
     @location = url
-    @builderFactory = buildFactory || JavaFXBuilderFactory.new
+    @builderFactory = buildFactory || JavaFXBuilderFactory.new(JRuby.runtime.jruby_class_loader)
     @template = false
     @namespace = FXCollections.observableHashMap()
     self.controller = ctrlr
@@ -666,13 +666,13 @@ class FxmlLoader
 	def loadTypeForPackage(packageName, className=nil)
 		packageName = (packageName + "." + className.gsub('.', '$')) if className
     begin
-      return Java.java.lang.Class::forName(packageName, true, FXL::default_class_loader);
-    rescue ClassNotFoundException => ex
+      return JavaUtilities.get_proxy_class(packageName).java_class.to_java
+    rescue NameError => ex
       # probably ruby class
       begin
         return packageName.constantize_by(".")
       rescue
-        raise ex # nope, not our issue anymore
+        raise ClassNotFoundException.new(packageName) # nope, not our issue anymore
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrubyfx-fxmlloader
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
 platform: java
 authors:
 - Patrick Plenefisch & JRubyFX team & Oracle
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies: []
 description: JRubyFX FxmlLoader gem bits
 email: simonpatp@gmail.com
@@ -25,11 +25,11 @@ files:
 - lib/jrubyfx-fxmlloader.rb
 - lib/fxmlloader/elts.rb
 - lib/fxmlloader/fxml_jit_info.rb
+- lib/fxmlloader/rrba.rb
 - lib/fxmlloader/j8_expression_value.rb
+- lib/fxmlloader/value_elts.rb
 - lib/fxmlloader/real_elts.rb
 - lib/fxmlloader/rorba.rb
-- lib/fxmlloader/rrba.rb
-- lib/fxmlloader/value_elts.rb
 homepage: https://github.com/byteit101/JRubyFX-FXMLLoader
 licenses:
 - GPL-2.0-with-classpath-exception