jrubyfx 1.0.0-java → 1.1.0-java

data/README.md

@@ -101,6 +101,10 @@ Issues
 * Jarify command needs the `jar` executable in your path.
 * Any other difficulties are bugs. Please report them
 
+Contact
+-------
+Find us in #jruby on freenode.
+
 License
 -------
 Main code is Apache 2.0. See LICENSE.
@@ -108,8 +112,10 @@ Some samples in contrib may have other licenses.
 
 Authors
 -------
-- Patrick Plenefisch
-- Thomas E Enebo
-- Hiroshi Nakamura
-- Hiro Asari
+- Patrick Plenefisch (byteit101)
+- Thomas E Enebo (enebo)
+- Hiro Asari (BanzaiMan or asarih)
+- Jeremy Ebler (whitehat101)
+- Hiroshi Nakamura (nahi)
+- Eric West (e_dub or edubkendo)
 

data/bin/jrubyfx-compile

@@ -0,0 +1,32 @@
+#!/usr/bin/env jruby
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+
+def usage
+  puts "#{$0} fxml-file [fxml-file ...] [-- require [require ...]]"
+  puts <<THEOPTIONS
+
+THEOPTIONS
+  exit -1
+end
+
+if ARGV.length < 1
+  usage
+end
+
+require 'jrubyfx_tasks'
+JRubyFX::Tasks.compile(ARGV)

data/bin/jrubyfx-jarify

@@ -108,7 +108,7 @@ if main.length > 1
 end
 
 # Jarify!
-JRubyFX::Tasks::jarify_jrubyfx(project_folder + "/**/*", main_script, nil, output_jar, :file_filter => ->(filename){!filename.end_with?(".jar") or include_jars})
+JRubyFX::Tasks::jarify_jrubyfx(project_folder + "/*", main_script, nil, output_jar, :file_filter => ->(filename){!filename.end_with?(".jar") or include_jars})
 
 if native_bundle
   JRubyFX::Tasks::native_bundles(Dir.pwd, output_jar, verbose, app_name[0])

data/lib/jrubyfx.rb

@@ -14,6 +14,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 =end
+
+if RUBY_VERSION.include? "1.8" or !JRUBY_VERSION
+  puts "JRubyFX requires JRuby to be in 1.9 mode"
+  exit -2
+end
+if Gem::Version.new(JRUBY_VERSION) < Gem::Version.new("1.7.4")
+  puts "Warning: JRuby 1.7.3 and prior have bugs that can cause strange errors. Do not submit any bug reports. Please use JRuby 1.7.4 or later."
+end
+
 require 'java' # for java_import
 require 'jruby/core_ext' # for the become_java!
 

data/lib/jrubyfx/application.rb

@@ -33,7 +33,7 @@ class JRubyFX::Application < Java.javafx.application.Application
   ##
   # call-seq:
   #   launch()
-  # 
+  #
   # When called on a subclass, this is effectively our main method.
   def self.launch(*args)
     #call our custom launcher to avoid a java shim

data/lib/jrubyfx/compiler_app.rb

@@ -0,0 +1,49 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx'
+
+# This class is used by the rake task to compile fxml files
+class CompilerApp < JRubyFX::Application
+  def start(stage)
+    begin
+      args = parameters.raw.to_a
+      if args.include? "--"
+        ar, requires = split(args, "--")
+        requires.each {|x| require x}
+        ar
+      else
+        args
+      end.each do |arg|
+        loader = FxmlLoader.new
+        loader.location = URL.new "file:#{arg}"
+        loader.controller = Object.new
+        puts "Compiling #{arg}..."
+        loader.load(jruby_ext: {jit: 0, dont_load: true, jit_opts: {force: true}})
+      end
+      puts "done"
+    ensure
+      Platform.exit
+    end
+  end
+
+  def split(arr, delim)
+    index = arr.index(delim)
+    first = arr[0...index]
+    second = arr[(index+1)..-1]
+    return first, second
+  end
+end

data/lib/jrubyfx/controller.rb

@@ -19,18 +19,35 @@ require 'jrubyfx-fxmlloader'
 
 # Special methods for fxml loading
 module Kernel
-  def fxml_root(value=nil)
-    if value
-      @@jrubyfx_fxml_dir = File.expand_path(value)
+  @@jrubyfx_res_dir = {}
+  def fxml_root(value=nil, jar_value=nil)
+    if value or jar_value
+      @@jrubyfx_fxml_dir = JRubyFX::Application.in_jar? ? jar_value : File.expand_path(value)
     else
       @@jrubyfx_fxml_dir
     end
   end
+  def resource_root(res_name, value=nil, jar_value=nil)
+    if value or jar_value
+      @@jrubyfx_res_dir[res_name.to_sym] = JRubyFX::Application.in_jar? ? jar_value : File.expand_path(value)
+    else
+      @@jrubyfx_res_dir[res_name.to_sym]
+    end
+  end
+  def resource_url(type, relative_path)
+    if JRubyFX::Application.in_jar?
+      JRuby.runtime.jruby_class_loader.get_resource("#{resource_root(type)}/#{relative_path}");
+    else
+      java.net.URL.new("file:" + File.join(resource_root(type), relative_path))
+    end
+  end
 end
 
 # Inherit from this class for FXML controllers
 module JRubyFX::Controller
   include JRubyFX::DSL
+  include JRubyFX::FXImports
+
   java_import 'java.net.URL'
 
   DEFAULT_SETTINGS = {
@@ -48,10 +65,11 @@ module JRubyFX::Controller
   def self.included(base)
     base.extend(ClassMethods)
     base.extend(JRubyFX::FXMLClassUtils)
+    base.extend(JRubyFX::FXImports)
     # register ourselves as a control. overridable with custom_fxml_control
     register_type base if base.is_a? Class
   end
-  
+
   # class methods for FXML controllers
   module ClassMethods
     include JRubyFX::DSL
@@ -115,6 +133,9 @@ module JRubyFX::Controller
     # This is the default override for custom controls
     # Normal FXML controllers will use Control#new
     def new(*args, &block)
+      if @preparsed && @preparsed.length > 0
+        return @preparsed.pop.finish_initialization(*args, &block)
+      end
       # Custom controls don't always need to be pure java, but oh well...
       become_java! if @filename
 
@@ -129,6 +150,17 @@ module JRubyFX::Controller
       ctrl
     end
 
+    def preparse_new(num=3)
+      become_java! if @filename
+      @preparsed ||= []
+      num.times do
+        ctrl = allocate
+        ctrl.pre_initialize_controller(DEFAULT_SETTINGS.merge({root_dir: @fxml_root_dir || fxml_root,
+              filename: @filename})) if @filename
+        @preparsed << ctrl
+      end
+    end
+
     #decorator to force becoming java class
     def become_java
       @force_java = true
@@ -206,8 +238,18 @@ module JRubyFX::Controller
     finish_initialization *args, &block
   end
 
+  # Initialize all controllers
+  def pre_initialize_controller(options={})
+
+    # JRuby complains loudly (probably broken behavior) if we don't call the ctor
+    java_ctor self.class.superclass.instance_method(:initialize).bind(self), [] #TODO: do we need to call this now with []?
+
+    # load the FXML file with the current control as the root
+    load_fxml options[:filename], options[:root_dir]
+  end
+
   def load_fxml(filename, root_dir=nil)
-    fx = Controller.get_fxml_loader(filename, self, root_dir)
+    fx = Controller.get_fxml_loader(filename, self, root_dir || @fxml_root_dir || fxml_root)
     fx.root = self
     fx.load
   end
@@ -247,7 +289,7 @@ module JRubyFX::Controller
   def css(css_selector)
     @scene.get_root.lookup_all(css_selector).to_a
   end
-  
+
   # Loads a controller-less file
   def self.load_fxml_only(filename, stage, settings={})
     # Inherit from default settings
@@ -256,7 +298,7 @@ module JRubyFX::Controller
 
     # load the FXML file
     root = Controller.get_fxml_loader(settings[:filename], nil, settings[:root_dir]).load
-      
+
     # TODO: de-duplicate this code
 
     # Unless the FXML root node is a scene, wrap that node in a scene
@@ -294,7 +336,7 @@ module JRubyFX::Controller
       if JRubyFX::Application.in_jar?
       # If we are in a jar file, use the class loader to get the file from the jar (like java)
       # TODO: should just be able to use URLs
-      JRuby.runtime.jruby_class_loader.get_resource filename
+      JRuby.runtime.jruby_class_loader.get_resource File.join(root_dir, filename)
     else
       root_dir ||= fxml_root
       # If we are in the normal filesystem, create a file url path relative to relative_to or this file

data/lib/jrubyfx/core_ext/exts.yml

@@ -31,6 +31,9 @@
 "Java::JavafxSceneControl::ContextMenu":
    method_missing: "Java::JavafxSceneControl::MenuItem"
    add: get_items
+"Java::JavafxSceneControl::MenuButton":
+   method_missing: "Java::JavafxSceneControl::MenuItem"
+   add: get_items
 "Java::JavafxSceneControl::MenuItem":
    dsl: Need to insert manually
 "Java::JavafxAnimation::Timeline":
@@ -44,6 +47,7 @@
 "Java::JavafxSceneControl::ScrollPane":
    logical_child: content
 "Java::JavafxSceneControl::Accordion":
+   add: panes
    logical_children: panes
 "Java::JavafxSceneShape::Circle":
    new_converter: [[], [none], [none, color], [none, none, none], [none, none, none, color]]

data/lib/jrubyfx/core_ext/file_chooser.rb

@@ -24,9 +24,9 @@ class Java::javafx::stage::FileChooser
   #   add_extension_filter(description)
   #   add_extension_filter(description, filter)
   #   add_extension_filter(description, [filter, ...])
-  # 
+  #
   # Takes ether a straight descriptions with embedded (*.whatnot) filter, or
-  # separately, where filter can be an array or a string. Note that without a 
+  # separately, where filter can be an array or a string. Note that without a
   # filter, the description MUST contain a list of extensions in parens.
   # === Examples
   #   add_extension_filter("Ruby Files (*.rb)")
@@ -42,17 +42,17 @@ class Java::javafx::stage::FileChooser
     filter = [filter] unless filter.is_a? Array
     extension_filters.add(ExtensionFilter.new(desc.to_s, filter))
   end
-  
+
   # call-seq:
   #   add_extension_filters([description, ...])
   #   add_extension_filters({description => filter, ...})
   #   add_extension_filters({description => [filter, ...], ...})
-  # 
+  #
   # Takes a straight list of descriptions with embedded (*.whatnot) filters, or
   # a hash of "description" => "*.whatnot" or a hash of "description => ["*.whatnot", "*.etc"]
   # === Examples
   #   add_extension_filters(["Ruby Files (*.rb)", "Python Files (*.py)"])
-  #   add_extension_filters({"Ruby Files (*.rb)" => "*.rb", "Python Files (*.py)" => ["*.py", "*.pyc"]})
+  #   add_extension_filters("Ruby Files (*.rb)" => "*.rb", "Python Files (*.py)" => ["*.py", "*.pyc"])
   #
   def add_extension_filters(filters)
     #works with both arrays and hashes

data/lib/jrubyfx/core_ext/geometry.rb

@@ -0,0 +1,27 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX Paths
+class Java::javafx::geometry::Point2D
+  def to_a
+    [x,y]
+  end
+  def to_ary
+    [x,y]
+  end
+end

data/lib/jrubyfx/core_ext/grid_pane.rb

@@ -0,0 +1,30 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX Grid panes
+class Java::javafx::scene::layout::GridPane
+  include JRubyFX::DSL
+  # don't kill the add(node, int, int..) methods
+  def add(node, *moar)
+    if moar.length > 1
+      self.java_send :add, [Node, *([Java::int]*moar.length)], node, *moar
+    else
+      children << node
+    end
+  end
+end

data/lib/jrubyfx/core_ext/observable_value.rb

@@ -19,10 +19,12 @@ require 'jrubyfx'
 # JRubyFX DSL extensions for JavaFX ObservableValues
 module Java::javafx::beans::value::ObservableValue
   java_import Java::javafx.beans.value.ChangeListener
+  java_import Java::javafx.beans.InvalidationListener
 
   ##
   # call-seq:
   #   add_change_listener { |observable, old_value, new_value| block }
+  #   add_change_listener { |new_value| block }
   #
   # Add a ruby block to call when the property changes changes
   def add_change_listener(type=nil, &block)
@@ -33,10 +35,40 @@ module Java::javafx::beans::value::ObservableValue
     if type == :list || type == :map
       super(&block)
     else
-      java_send :addListener, [ChangeListener.java_class], block
+      old_verbose = $VERBOSE
+      begin
+        $VERBOSE = nil
+        addListener(ChangeListener.impl {|name, x, y, z|
+            if block.arity == 1
+              block.call(z) # just call with new
+            else
+              block.call(x, y, z)
+            end
+          })
+      ensure
+        # always re-set to old value, even if block raises an exception
+        $VERBOSE = old_verbose
+      end
     end
   end
 
+
+  ##
+  # call-seq:
+  #   add_invalidation_listener { |observable| block }
+  #
+  # Add a ruby block to call when the property invalidates itself (bad property!)
+  def add_invalidation_listener(&block)
+      old_verbose = $VERBOSE
+      begin
+        $VERBOSE = nil
+        addListener(InvalidationListener.impl {|name, change| block.call(change) })
+      ensure
+        # always re-set to old value, even if block raises an exception
+        $VERBOSE = old_verbose
+      end
+  end
+
   # FIXME: Not sure how to remove with this API.  We are passing in a proc
   # and we would need to examine each proc to determine which listener to
   # remove.  Probably a way to do it in each derived real class which actually
@@ -53,7 +85,18 @@ module Java::javafx::collections::ObservableList
   #
   # Add a ruby block to call when the property changes changes
   def add_change_listener(&block)
-    java_send :addListener, [ListChangeListener.java_class], block
+    old_verbose = $VERBOSE
+    begin
+      $VERBOSE = nil
+      addListener(ListChangeListener.impl {|name, x|block.call(x)})
+    ensure
+      # always re-set to old value, even if block raises an exception
+      $VERBOSE = old_verbose
+    end
+  end
+
+  def index(x)
+    indexOf(x)
   end
 
   # FIXME: Not sure how to remove with this API.  We are passing in a proc
@@ -72,7 +115,14 @@ module Java::javafx::collections::ObservableMap
   #
   # Add a ruby block to call when the property changes changes
   def add_change_listener(&block)
-    java_send :addListener, [MapChangeListener.java_class], block
+    old_verbose = $VERBOSE
+    begin
+      $VERBOSE = nil
+      addListener(MapChangeListener.impl {|name, x|block.call(x)})
+    ensure
+      # always re-set to old value, even if block raises an exception
+      $VERBOSE = old_verbose
+    end
   end
 
   # FIXME: Not sure how to remove with this API.  We are passing in a proc
@@ -99,5 +149,10 @@ class Class
   def property_accessor(*symbol_names)
     property_reader *symbol_names
     property_writer *symbol_names
+    symbol_names.each do |symbol_name|
+      send(:define_method, symbol_name.id2name + "_property") do
+        instance_variable_get("@#{symbol_name}")
+      end
+    end
   end
 end