jrubyfx-fxmlloader 0.4-java → 0.4.1-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Rakefile +1 -1
- data/lib/FXMLLoader-j8.jar +0 -0
- data/lib/fxmlloader/elts.rb +4 -1
- data/lib/jrubyfx-fxmlloader.rb +6 -6
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f0deb7aeb1091b999e9983a95b9fe3d184034068
|
4
|
+
data.tar.gz: 1e4d685cb8e9d8f37ee3215aa85fda49cd961c0d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2224f8aa62ab203070bab2e3944f2ecda4122c3d62521b8bc939bad5bbe4b7e243afa5bb26e0bca84fe28b146ada10b4b7bf413406487ed8f4d9e4dd813442ad
|
7
|
+
data.tar.gz: 07a02729732870ee2d0c85dcf928d6456223cb0cee209cf06149b664621ec781e61df482297d4a2132f459745560a262ec0dcf15214081aba02b047dad617581
|
data/Rakefile
CHANGED
data/lib/FXMLLoader-j8.jar
CHANGED
Binary file
|
data/lib/fxmlloader/elts.rb
CHANGED
@@ -539,7 +539,10 @@ class ScriptEventHandler
|
|
539
539
|
def handle(event)
|
540
540
|
# Don't pollute the page namespace with values defined in the script
|
541
541
|
engineBindings = @scriptEngine.getBindings(ScriptContext::ENGINE_SCOPE);
|
542
|
-
localBindings = @scriptEngine.createBindings();
|
542
|
+
#localBindings = @scriptEngine.createBindings(); # TODO: this causes errors with nashorn in jdk8 by creating a different kind of
|
543
|
+
# script object that doesn't respect the magic nashorn.global object
|
544
|
+
localBindings = Java::JavaxScript::SimpleBindings.new
|
545
|
+
localBindings.put_all(engineBindings)
|
543
546
|
localBindings.put(FXL::EVENT_KEY, event);
|
544
547
|
@scriptEngine.setBindings(localBindings, ScriptContext::ENGINE_SCOPE);
|
545
548
|
|
data/lib/jrubyfx-fxmlloader.rb
CHANGED
@@ -36,7 +36,7 @@ end
|
|
36
36
|
java_import 'javafx.fxml.JavaFXBuilderFactory'
|
37
37
|
java_import 'java.lang.InstantiationException', 'java.lang.IllegalAccessException'
|
38
38
|
|
39
|
-
java_import *%w[
|
39
|
+
java_import *%w[
|
40
40
|
java.io.IOException
|
41
41
|
java.io.InputStream
|
42
42
|
java.io.InputStreamReader
|
@@ -219,7 +219,7 @@ class SecretHashCompararator
|
|
219
219
|
end
|
220
220
|
|
221
221
|
class FxmlBuilderBuilder # the builder builder (builds builders)
|
222
|
-
@@bf = Java::javafx.fxml.JavaFXBuilderFactory.new
|
222
|
+
@@bf = Java::javafx.fxml.JavaFXBuilderFactory.new(JRuby.runtime.jruby_class_loader)
|
223
223
|
def self.new(arg_map, builder_type)
|
224
224
|
builder = @@bf.getBuilder(builder_type)
|
225
225
|
arg_map.each do |k, v|
|
@@ -265,7 +265,7 @@ class FxmlLoader
|
|
265
265
|
@@fxml_jit_info = {}
|
266
266
|
def initialize(url=nil, ctrlr=nil, resourcs=nil, buildFactory=nil, charset=nil, loaders=nil)
|
267
267
|
@location = url
|
268
|
-
@builderFactory = buildFactory || JavaFXBuilderFactory.new
|
268
|
+
@builderFactory = buildFactory || JavaFXBuilderFactory.new(JRuby.runtime.jruby_class_loader)
|
269
269
|
@template = false
|
270
270
|
@namespace = FXCollections.observableHashMap()
|
271
271
|
self.controller = ctrlr
|
@@ -666,13 +666,13 @@ class FxmlLoader
|
|
666
666
|
def loadTypeForPackage(packageName, className=nil)
|
667
667
|
packageName = (packageName + "." + className.gsub('.', '$')) if className
|
668
668
|
begin
|
669
|
-
return
|
670
|
-
rescue
|
669
|
+
return JavaUtilities.get_proxy_class(packageName).java_class.to_java
|
670
|
+
rescue NameError => ex
|
671
671
|
# probably ruby class
|
672
672
|
begin
|
673
673
|
return packageName.constantize_by(".")
|
674
674
|
rescue
|
675
|
-
raise
|
675
|
+
raise ClassNotFoundException.new(packageName) # nope, not our issue anymore
|
676
676
|
end
|
677
677
|
end
|
678
678
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jrubyfx-fxmlloader
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 0.4.1
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Patrick Plenefisch & JRubyFX team & Oracle
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2016-01-07 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: JRubyFX FxmlLoader gem bits
|
14
14
|
email: simonpatp@gmail.com
|
@@ -25,11 +25,11 @@ files:
|
|
25
25
|
- lib/jrubyfx-fxmlloader.rb
|
26
26
|
- lib/fxmlloader/elts.rb
|
27
27
|
- lib/fxmlloader/fxml_jit_info.rb
|
28
|
+
- lib/fxmlloader/rrba.rb
|
28
29
|
- lib/fxmlloader/j8_expression_value.rb
|
30
|
+
- lib/fxmlloader/value_elts.rb
|
29
31
|
- lib/fxmlloader/real_elts.rb
|
30
32
|
- lib/fxmlloader/rorba.rb
|
31
|
-
- lib/fxmlloader/rrba.rb
|
32
|
-
- lib/fxmlloader/value_elts.rb
|
33
33
|
homepage: https://github.com/byteit101/JRubyFX-FXMLLoader
|
34
34
|
licenses:
|
35
35
|
- GPL-2.0-with-classpath-exception
|