jrubyfx 1.1.0-java → 1.1.1-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e779816cf2c32f18185c48d093e9578ccfdc40c8
+  data.tar.gz: 5a86e7f2556ff10b25164fc7fe8153a28d186f23
+SHA512:
+  metadata.gz: 0568951c9f29eabead092a89898801f404bad06b438726af98562ee30e9702960fc2997aee1ae20c94efdc85850e98ded68545f2d0064b8b1b6db647926d3147
+  data.tar.gz: 0a90fe37ecc726d9d158a61a3990e509110b85df46c7412ae26c30bfc1815e4034cd4622afc783185abaf34d67f002f9e44f70e2c5d53faef26c119015b4b53b

data/lib/jrubyfx.rb

@@ -34,6 +34,7 @@ end
 require_relative 'jrubyfx/imports'
 require_relative 'jrubyfx/module'
 require_relative 'jrubyfx/dsl'
+require_relative 'jrubyfx/dsl_control'
 JRubyFX::DSL.load_dsl # load it after we require the dsl package to not loop around
 require_relative 'jrubyfx/application'
 require_relative 'jrubyfx/controller'

data/lib/jrubyfx/controller.rb

@@ -15,7 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 =end
 
-require 'jrubyfx-fxmlloader'
+require 'jrubyfx/utils/string_utils'
+# If fxmlloader is installed, require it here
+begin
+  require 'jrubyfx-fxmlloader'
+rescue LoadError
+  # no fxmlloader, ignore it
+end
 
 # Special methods for fxml loading
 module Kernel
@@ -64,7 +70,7 @@ module JRubyFX::Controller
 
   def self.included(base)
     base.extend(ClassMethods)
-    base.extend(JRubyFX::FXMLClassUtils)
+    base.extend(JRubyFX::FXMLClassUtils) if defined? JRubyFX::FXMLClassUtils
     base.extend(JRubyFX::FXImports)
     # register ourselves as a control. overridable with custom_fxml_control
     register_type base if base.is_a? Class
@@ -333,10 +339,21 @@ module JRubyFX::Controller
   def self.get_fxml_loader(filename, controller = nil, root_dir = nil)
     fx = FxmlLoader.new
     fx.location =
-      if JRubyFX::Application.in_jar?
+    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 File.join(root_dir, filename)
+      
+      # According to how class loader works, the correct path for a file inside a jar is NOT "/folder/file.fxml" 
+      # but "folder/file.fxml" (without starting "/" or ".", which would both make the path to be seen as a filesystem 
+      # reference) so we assume that if root_dir is set to "" or to any other path not starting with "." or "/" then 
+      # we want to point to a folder inside the jar, otherwise to a filesystem's one. According to this we format and 
+      # feed the right path to the class loader.
+      
+      if root_dir == "" or not ["/", "."].include? (root_dir[0])
+        JRuby.runtime.jruby_class_loader.get_resource filename
+      else
+        JRuby.runtime.jruby_class_loader.get_resource File.join(root_dir, filename)
+      end
     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/precompiled.rb

@@ -1,20 +1,20 @@
 class Java::JavafxAnimation::PathTransition
   include JRubyFX::DSL
   def orientation=(rbenum)
-    java_send "setOrientation", [Java::JavafxAnimation::OrientationType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxAnimation::OrientationType)
+    java_send "setOrientation", [Java::JavafxAnimation::PathTransition::OrientationType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxAnimation::PathTransition::OrientationType)
   end
 end
 class Java::JavafxScene::Node
   include JRubyFX::DSL
-  def blend_mode=(rbenum)
-    java_send "setBlendMode", [Java::JavafxSceneEffect::BlendMode], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlendMode)
-  end
   def cache_hint=(rbenum)
     java_send "setCacheHint", [Java::JavafxScene::CacheHint], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::CacheHint)
   end
   def depth_test=(rbenum)
     java_send "setDepthTest", [Java::JavafxScene::DepthTest], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::DepthTest)
   end
+  def blend_mode=(rbenum)
+    java_send "setBlendMode", [Java::JavafxSceneEffect::BlendMode], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlendMode)
+  end
   def on_context_menu_requested(&block)
     if block_given?
       setOnContextMenuRequested block
@@ -367,23 +367,23 @@ end
 class Java::JavafxSceneControl::ScrollPane
   include JRubyFX::DSL
   def hbar_policy=(rbenum)
-    java_send "setHbarPolicy", [Java::JavafxSceneControl::ScrollBarPolicy], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::ScrollBarPolicy)
+    java_send "setHbarPolicy", [Java::JavafxSceneControl::ScrollPane::ScrollBarPolicy], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::ScrollPane::ScrollBarPolicy)
   end
   def vbar_policy=(rbenum)
-    java_send "setVbarPolicy", [Java::JavafxSceneControl::ScrollBarPolicy], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::ScrollBarPolicy)
+    java_send "setVbarPolicy", [Java::JavafxSceneControl::ScrollPane::ScrollBarPolicy], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::ScrollPane::ScrollBarPolicy)
   end
   #TODO: logical_child(content)
 end
 class Java::JavafxSceneControl::Separator
   include JRubyFX::DSL
-  def halignment=(rbenum)
-    java_send "setHalignment", [Java::JavafxGeometry::HPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::HPos)
+  def orientation=(rbenum)
+    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
   end
   def valignment=(rbenum)
     java_send "setValignment", [Java::JavafxGeometry::VPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::VPos)
   end
-  def orientation=(rbenum)
-    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
+  def halignment=(rbenum)
+    java_send "setHalignment", [Java::JavafxGeometry::HPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::HPos)
   end
 end
 class Java::JavafxSceneControl::Slider
@@ -401,7 +401,7 @@ end
 class Java::JavafxSceneControl::TableColumn
   include JRubyFX::DSL
   def sort_type=(rbenum)
-    java_send "setSortType", [Java::JavafxSceneControl::SortType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::SortType)
+    java_send "setSortType", [Java::JavafxSceneControl::TableColumn::SortType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::TableColumn::SortType)
   end
   def on_edit_cancel(&block)
     if block_given?
@@ -427,12 +427,12 @@ class Java::JavafxSceneControl::TableColumn
 end
 class Java::JavafxSceneControl::TabPane
   include JRubyFX::DSL
-  def tab_closing_policy=(rbenum)
-    java_send "setTabClosingPolicy", [Java::JavafxSceneControl::TabClosingPolicy], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::TabClosingPolicy)
-  end
   def side=(rbenum)
     java_send "setSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
   end
+  def tab_closing_policy=(rbenum)
+    java_send "setTabClosingPolicy", [Java::JavafxSceneControl::TabPane::TabClosingPolicy], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::TabPane::TabClosingPolicy)
+  end
   #TODO: logical_children(tabs)
 end
 class Java::JavafxSceneControl::TextField
@@ -462,15 +462,15 @@ class Java::JavafxSceneControl::ToggleButton
   def alignment=(rbenum)
     java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
   end
-  def blend_mode=(rbenum)
-    java_send "setBlendMode", [Java::JavafxSceneEffect::BlendMode], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlendMode)
-  end
   def cache_hint=(rbenum)
     java_send "setCacheHint", [Java::JavafxScene::CacheHint], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::CacheHint)
   end
   def depth_test=(rbenum)
     java_send "setDepthTest", [Java::JavafxScene::DepthTest], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::DepthTest)
   end
+  def blend_mode=(rbenum)
+    java_send "setBlendMode", [Java::JavafxSceneEffect::BlendMode], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlendMode)
+  end
   def text_fill=(value)
     setTextFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
   end
@@ -808,27 +808,27 @@ class Java::JavafxSceneEffect::Shadow
 end
 class Java::JavafxSceneLayout::ColumnConstraints
   include JRubyFX::DSL
-  def hgrow=(rbenum)
-    java_send "setHgrow", [Java::JavafxSceneLayout::Priority], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneLayout::Priority)
-  end
   def halignment=(rbenum)
     java_send "setHalignment", [Java::JavafxGeometry::HPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::HPos)
   end
+  def hgrow=(rbenum)
+    java_send "setHgrow", [Java::JavafxSceneLayout::Priority], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneLayout::Priority)
+  end
 end
 class Java::JavafxSceneLayout::FlowPane
   include JRubyFX::DSL
+  def orientation=(rbenum)
+    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
+  end
+  def alignment=(rbenum)
+    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  end
   def column_halignment=(rbenum)
     java_send "setColumnHalignment", [Java::JavafxGeometry::HPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::HPos)
   end
   def row_valignment=(rbenum)
     java_send "setRowValignment", [Java::JavafxGeometry::VPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::VPos)
   end
-  def alignment=(rbenum)
-    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
-  end
-  def orientation=(rbenum)
-    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
-  end
 end
 class Java::JavafxSceneLayout::GridPane
   include JRubyFX::DSL
@@ -844,12 +844,12 @@ class Java::JavafxSceneLayout::HBox
 end
 class Java::JavafxSceneLayout::RowConstraints
   include JRubyFX::DSL
-  def vgrow=(rbenum)
-    java_send "setVgrow", [Java::JavafxSceneLayout::Priority], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneLayout::Priority)
-  end
   def valignment=(rbenum)
     java_send "setValignment", [Java::JavafxGeometry::VPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::VPos)
   end
+  def vgrow=(rbenum)
+    java_send "setVgrow", [Java::JavafxSceneLayout::Priority], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneLayout::Priority)
+  end
 end
 class Java::JavafxSceneLayout::StackPane
   include JRubyFX::DSL
@@ -859,14 +859,14 @@ class Java::JavafxSceneLayout::StackPane
 end
 class Java::JavafxSceneLayout::TilePane
   include JRubyFX::DSL
-  def tile_alignment=(rbenum)
-    java_send "setTileAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  def orientation=(rbenum)
+    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
   end
   def alignment=(rbenum)
     java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
   end
-  def orientation=(rbenum)
-    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
+  def tile_alignment=(rbenum)
+    java_send "setTileAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
   end
 end
 class Java::JavafxSceneLayout::VBox
@@ -904,12 +904,12 @@ class Java::JavafxSceneShape::Shape
   def stroke_type=(rbenum)
     java_send "setStrokeType", [Java::JavafxSceneShape::StrokeType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::StrokeType)
   end
-  def fill=(value)
-    setFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
-  end
   def stroke=(value)
     setStroke(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
   end
+  def fill=(value)
+    setFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  end
   def fill(*r)
     if r.length > 0
       self.fill = r[0]
@@ -926,6 +926,9 @@ class Java::JavafxSceneShape::SVGPath
 end
 class Java::JavafxSceneText::Text
   include JRubyFX::DSL
+  def text_alignment=(rbenum)
+    java_send "setTextAlignment", [Java::JavafxSceneText::TextAlignment], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::TextAlignment)
+  end
   def bounds_type=(rbenum)
     java_send "setBoundsType", [Java::JavafxSceneText::TextBoundsType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::TextBoundsType)
   end
@@ -935,9 +938,6 @@ class Java::JavafxSceneText::Text
   def text_origin=(rbenum)
     java_send "setTextOrigin", [Java::JavafxGeometry::VPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::VPos)
   end
-  def text_alignment=(rbenum)
-    java_send "setTextAlignment", [Java::JavafxSceneText::TextAlignment], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::TextAlignment)
-  end
 end
 class Java::JavafxSceneWeb::WebView
   include JRubyFX::DSL
@@ -1317,6 +1317,13 @@ class Java::JavafxConcurrent::Task
 end
 class Java::JavafxConcurrent::Service
   include JRubyFX::DSL
+  def on_ready(&block)
+    if block_given?
+      setOnReady block
+    else
+      getOnReady
+    end
+  end
   def on_cancelled(&block)
     if block_given?
       setOnCancelled block
@@ -1352,13 +1359,6 @@ class Java::JavafxConcurrent::Service
       getOnSucceeded
     end
   end
-  def on_ready(&block)
-    if block_given?
-      setOnReady block
-    else
-      getOnReady
-    end
-  end
 end
 class Java::JavafxSceneControl::ContextMenu
   include JRubyFX::DSL
@@ -1550,6 +1550,20 @@ class Java::JavafxSceneMedia::Media
 end
 class Java::JavafxSceneMedia::MediaPlayer
   include JRubyFX::DSL
+  def on_ready(&block)
+    if block_given?
+      setOnReady block
+    else
+      getOnReady
+    end
+  end
+  def on_error(&block)
+    if block_given?
+      setOnError block
+    else
+      getOnError
+    end
+  end
   def on_end_of_media(&block)
     if block_given?
       setOnEndOfMedia block
@@ -1606,20 +1620,6 @@ class Java::JavafxSceneMedia::MediaPlayer
       getOnStopped
     end
   end
-  def on_error(&block)
-    if block_given?
-      setOnError block
-    else
-      getOnError
-    end
-  end
-  def on_ready(&block)
-    if block_given?
-      setOnReady block
-    else
-      getOnReady
-    end
-  end
 end
 class Java::JavafxSceneMedia::MediaView
   include JRubyFX::DSL

data/lib/jrubyfx/dsl.rb

@@ -28,6 +28,8 @@ module JRubyFX
       include JRubyFX::FXImports
 
       ##
+      # DEPRECATED: Please include JRubyFX::DSLControl instead of this method.
+      #
       # Register your own type for use in the DSL.
       #
       #   class MyFooWidget < Region
@@ -37,10 +39,15 @@ module JRubyFX
       #   register_type(MyFooWidget)
       #   register_type(MyFooWidget, "aliased_name")
       #
+      #   class MyOtherWidget < Region
+      #     register_type
+      #   end
+      #
+      #
       # Note, this also makes it possible to override existing definitions
       # of built-in components.
       #
-      def register_type(type, name=nil)
+      def register_type(type=self, name=nil)
         name = type.name.snake_case unless name
         JRubyFX::DSL::NAME_TO_CLASSES[name.to_s] = type
       end
@@ -83,7 +90,7 @@ module JRubyFX
       clazz = NAME_TO_CLASSES[fixed_name]
       unless clazz
         clazz = NAME_TO_CLASS_NAME[fixed_name]
-        clazz = (NAME_TO_CLASSES[fixed_name] = clazz.constantize_by) if clazz
+        clazz = (NAME_TO_CLASSES[fixed_name] = clazz.constantize_by("::")) if clazz
       end
 
       unless clazz

data/lib/jrubyfx/dsl_control.rb

@@ -0,0 +1,28 @@
+=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 'java'
+require 'jrubyfx/dsl'
+
+module JRubyFX
+  # If you want a control to be registered with the dsl calling syntax
+  # you should indicate it by including this module.
+  module DSLControl
+    def self.included(mod)
+      JRubyFX::DSL::ClassUtils.register_type mod
+    end
+  end
+end

data/lib/jrubyfx/dsl_map.rb

@@ -178,6 +178,7 @@ module JRubyFX
       'key_code' => "Java::JavafxSceneInput::KeyCode",
       'key_event' => "Java::JavafxSceneInput::KeyEvent",
       'mnemonic' => "Java::JavafxSceneInput::Mnemonic",
+      'mouse_button' => "Java::JavafxSceneInput::MouseButton",
       'mouse_drag_event' => "Java::JavafxSceneInput::MouseDragEvent",
       'mouse_event' => "Java::JavafxSceneInput::MouseEvent",
       'rotate_event' => "Java::JavafxSceneInput::RotateEvent",

data/lib/jrubyfx/imports.rb

@@ -38,6 +38,10 @@ begin
     jre[:version].to_f < 1.8 or
     (jre[:version].to_f == 1.8 and jre[:release] == 'ea' and jre[:build].to_i < 75)
 
+  # Java 8 at some point requires explicit toolkit/platform initialization
+  # before any controls can be loaded.
+  JRubyFX.load_fx
+  
   # Attempt to load a javafx class
   Java.javafx.application.Application
 rescue  LoadError, NameError
@@ -215,6 +219,7 @@ LOCAL_NAME_MAP = {
   :KeyCode => "javafx.scene.input.KeyCode",
   :KeyEvent => "javafx.scene.input.KeyEvent",
   :Mnemonic => "javafx.scene.input.Mnemonic",
+  :MouseButton => "javafx.scene.input.MouseButton",
   :MouseDragEvent => "javafx.scene.input.MouseDragEvent",
   :MouseEvent => "javafx.scene.input.MouseEvent",
   :RotateEvent => "javafx.scene.input.RotateEvent",

data/lib/jrubyfx/java_fx_impl.rb

@@ -79,12 +79,6 @@ module JavaFXImpl #:nodoc: all
     end
 
     def self.launch_app_from_thread(application_class, args)
-      #platformImpl startup?
-      CountDownLatch.new(1).tap do |latch|
-        PlatformImpl.startup { latch.countDown }
-        latch.await
-      end
-
       begin
         launch_app_after_platform(application_class, args) 
       rescue => ex

data/lib/jrubyfx/module.rb

@@ -167,6 +167,9 @@ module JRubyFX
         end
         return instance_variable_get("@#{symbol_name}")
       end
+      send(:define_method, pname.snake_case) do
+        send(pname)
+      end
       add_method_signature pname, [ptype]
       add_method_signature "set" + camel, [java.lang.Void, type]
       add_method_signature "get" + camel, [type]

data/lib/jrubyfx/part_imports.rb

@@ -38,6 +38,10 @@ begin
     jre[:version].to_f < 1.8 or
     (jre[:version].to_f == 1.8 and jre[:release] == 'ea' and jre[:build].to_i < 75)
 
+  # Java 8 at some point requires explicit toolkit/platform initialization
+  # before any controls can be loaded.
+  JRubyFX.load_fx
+  
   # Attempt to load a javafx class
   Java.javafx.application.Application
 rescue  LoadError, NameError
@@ -90,7 +94,7 @@ module JRubyFX
           InnerShadow Lighting MotionBlur PerspectiveTransform Reflection SepiaTone Shadow],
           :image => %w[Image ImageView PixelReader PixelWriter],
           :input => %w[Clipboard ClipboardContent ContextMenuEvent DragEvent GestureEvent InputEvent InputMethodEvent KeyCode KeyEvent
-          Mnemonic MouseDragEvent MouseEvent RotateEvent ScrollEvent SwipeEvent TouchEvent TransferMode ZoomEvent],
+          Mnemonic MouseButton MouseDragEvent MouseEvent RotateEvent ScrollEvent SwipeEvent TouchEvent TransferMode ZoomEvent],
           :layout => %w[AnchorPane BorderPane ColumnConstraints FlowPane GridPane HBox Pane Priority RowConstraints StackPane TilePane VBox],
           :media => %w[AudioClip AudioEqualizer AudioTrack EqualizerBand Media MediaException
           MediaErrorEvent MediaMarkerEvent MediaPlayer MediaView VideoTrack],

data/lib/jrubyfx/utils.rb

@@ -63,3 +63,14 @@ module Enumerable
     end]
   end
 end
+
+module JRubyFX
+  def self.load_fx(force=false)
+    return if @already_loaded_fx and !force
+    @already_loaded_fx = true
+    java.util.concurrent.CountDownLatch.new(1).tap do |latch|
+      com.sun.javafx.application.PlatformImpl.startup { latch.countDown }
+      latch.await
+    end
+  end
+end

data/lib/jrubyfx/utils/common_converters.rb

@@ -140,6 +140,9 @@ module JRubyFX
         },
         :color => lambda { |value|
           new_value = NAME_TO_COLORS[value.to_s.gsub(/_/, "")]
+          if !new_value && value.kind_of?(Symbol)
+            raise ArgumentError.new("No such color: #{value.to_s}") 
+          end
           new_value ? new_value : value
         },
         :rectangle2d => lambda { |value|

data/lib/jrubyfx/utils/string_utils.rb

@@ -0,0 +1,48 @@
+class String
+
+  # steal handy methods from activesupport
+  # Tries to find a constant with the name specified in the argument string.
+  #
+  # 'Module'.constantize # => Module
+  # 'Test::Unit'.constantize # => Test::Unit
+  #
+  # The name is assumed to be the one of a top-level constant, no matter
+  # whether it starts with "::" or not. No lexical context is taken into
+  # account:
+  #
+  # C = 'outside'
+  # module M
+  # C = 'inside'
+  # C # => 'inside'
+  # 'C'.constantize # => 'outside', same as ::C
+  # end
+  #
+  # NameError is raised when the name is not in CamelCase or the constant is
+  # unknown.
+  def constantize_by(splitter="::")
+    camel_cased_word = self
+    names = camel_cased_word.split(splitter)
+    names.shift if names.empty? || names.first.empty?
+
+    names.inject(Object) do |constant, name|
+      if constant == Object
+        constant.const_get(name)
+      else
+        candidate = constant.const_get(name)
+        next candidate if constant.const_defined?(name, false)
+        next candidate unless Object.const_defined?(name)
+
+        # Go down the ancestors to check it it's owned
+        # directly before we reach Object or the end of ancestors.
+        constant = constant.ancestors.inject do |const, ancestor|
+          break const if ancestor == Object
+          break ancestor if ancestor.const_defined?(name, false)
+          const
+        end
+
+        # owner is in Object, so raise
+        constant.const_get(name, false)
+      end
+    end
+  end
+end

data/lib/jrubyfx/version.rb

@@ -1,4 +1,4 @@
 module JRubyFX
   # Current gem version. Used in rake task.
-  VERSION='1.1.0'
+  VERSION='1.1.1'
 end

data/lib/jrubyfx_tasks.rb

@@ -26,14 +26,14 @@ module JRubyFX
   module Tasks
     extend Rake::DSL
     # Base URL of JRuby-complete.jar download location
-    BASE_URL='http://repository.codehaus.org/org/jruby/jruby-complete'
+    BASE_URL='http://jruby.org.s3.amazonaws.com/downloads'
 
     ##
     # Downloads the jruby-complete jar file for `jruby_version` and save in
     # ~/.jruby-jar/jruby-complete.jar unless it already exits. If the jar is
     # corrupt or an older version, set force to true to delete and re-download
     def download_jruby(jruby_version, force=false)
-      dist = "#{ENV['HOME']}/.jruby-jar"
+      dist = "#{Dir.home}/.jruby-jar"
       unless force || (File.exists?("#{dist}/jruby-complete-#{jruby_version}.jar") && File.size("#{dist}/jruby-complete-#{jruby_version}.jar") > 0)
         mkdir_p dist
         base_dir = Dir.pwd

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrubyfx
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.1.0
+  version: 1.1.1
 platform: java
 authors:
 - Patrick Plenefisch
@@ -12,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -21,13 +20,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -37,13 +34,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -52,14 +47,12 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
-    none: false
+        version: '0.4'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
-    none: false
+        version: '0.4'
   prerelease: false
   type: :runtime
 description: Enables JavaFX with FXML controllers and application in pure ruby
@@ -77,52 +70,56 @@ extra_rdoc_files: []
 files:
 - lib/jrubyfx.rb
 - lib/jrubyfx_tasks.rb
-- lib/jrubyfx/part_imports.rb
-- lib/jrubyfx/dsl.rb
-- lib/jrubyfx/version.rb
-- lib/jrubyfx/controller.rb
-- lib/jrubyfx/compiler_app.rb
-- lib/jrubyfx/dsl_map.rb
 - lib/jrubyfx/imports.rb
-- lib/jrubyfx/module.rb
+- lib/jrubyfx/dsl_map.rb
 - lib/jrubyfx/application.rb
+- lib/jrubyfx/compiler_app.rb
+- lib/jrubyfx/controller.rb
+- lib/jrubyfx/dsl.rb
+- lib/jrubyfx/dsl_control.rb
 - lib/jrubyfx/java_fx_impl.rb
+- lib/jrubyfx/part_imports.rb
 - lib/jrubyfx/utils.rb
-- lib/jrubyfx/core_ext/grid_pane.rb
-- lib/jrubyfx/core_ext/media_player.rb
+- lib/jrubyfx/version.rb
+- lib/jrubyfx/module.rb
+- lib/jrubyfx/core_ext/border_pane.rb
+- lib/jrubyfx/core_ext/column_constraints.rb
+- lib/jrubyfx/core_ext/drag_event.rb
 - lib/jrubyfx/core_ext/duration.rb
 - lib/jrubyfx/core_ext/effects.rb
-- lib/jrubyfx/core_ext/transition.rb
+- lib/jrubyfx/core_ext/image_view.rb
+- lib/jrubyfx/core_ext/media_player.rb
 - lib/jrubyfx/core_ext/pagination.rb
-- lib/jrubyfx/core_ext/drag_event.rb
+- lib/jrubyfx/core_ext/progress_indicator.rb
+- lib/jrubyfx/core_ext/radial_gradient.rb
 - lib/jrubyfx/core_ext/region.rb
-- lib/jrubyfx/core_ext/image_view.rb
-- lib/jrubyfx/core_ext/tree_view.rb
+- lib/jrubyfx/core_ext/rotate.rb
+- lib/jrubyfx/core_ext/stage.rb
 - lib/jrubyfx/core_ext/table_view.rb
-- lib/jrubyfx/core_ext/file_chooser.rb
-- lib/jrubyfx/core_ext/geometry.rb
+- lib/jrubyfx/core_ext/timeline.rb
+- lib/jrubyfx/core_ext/transition.rb
+- lib/jrubyfx/core_ext/tree_view.rb
 - lib/jrubyfx/core_ext/xy_chart.rb
-- lib/jrubyfx/core_ext/rotate.rb
+- lib/jrubyfx/core_ext/precompiled.rb
 - lib/jrubyfx/core_ext/exts.yml
-- lib/jrubyfx/core_ext/column_constraints.rb
+- lib/jrubyfx/core_ext/file_chooser.rb
+- lib/jrubyfx/core_ext/geometry.rb
+- lib/jrubyfx/core_ext/grid_pane.rb
 - lib/jrubyfx/core_ext/observable_value.rb
-- lib/jrubyfx/core_ext/precompiled.rb
-- lib/jrubyfx/core_ext/stage.rb
-- lib/jrubyfx/core_ext/border_pane.rb
-- lib/jrubyfx/core_ext/timeline.rb
-- lib/jrubyfx/core_ext/radial_gradient.rb
-- lib/jrubyfx/core_ext/progress_indicator.rb
 - lib/jrubyfx/core_ext/path.rb
+- lib/jrubyfx/utils/__ignore_java_stupid_rdoc.rb
 - lib/jrubyfx/utils/common_utils.rb
 - lib/jrubyfx/utils/common_converters.rb
-- lib/jrubyfx/utils/__ignore_java_stupid_rdoc.rb
+- lib/jrubyfx/utils/string_utils.rb
 - LICENSE
 - README.md
 - bin/jrubyfx-generator
 - bin/jrubyfx-jarify
 - bin/jrubyfx-compile
 homepage: https://github.com/jruby/jrubyfx
-licenses: []
+licenses:
+- Apache-2.0
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -132,23 +129,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2
-  none: false
 requirements: []
 rubyforge_project: jrubyfx
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: JavaFX for JRuby with FXML
 test_files: []