jrubyfx 1.1.1-java → 1.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e779816cf2c32f18185c48d093e9578ccfdc40c8
-  data.tar.gz: 5a86e7f2556ff10b25164fc7fe8153a28d186f23
+  metadata.gz: 8a064999e484e03f5884810d6e550fc45dc5a004
+  data.tar.gz: 65024687422bb89e24e05a79b90856591961f3e2
 SHA512:
-  metadata.gz: 0568951c9f29eabead092a89898801f404bad06b438726af98562ee30e9702960fc2997aee1ae20c94efdc85850e98ded68545f2d0064b8b1b6db647926d3147
-  data.tar.gz: 0a90fe37ecc726d9d158a61a3990e509110b85df46c7412ae26c30bfc1815e4034cd4622afc783185abaf34d67f002f9e44f70e2c5d53faef26c119015b4b53b
+  metadata.gz: 03c78c8e191648d7cbe82f13db565b1ca0552e4870940bbc9bbd58153165b16aed5d5dcc4e328151b0ed149267678d86c1972f63c219b5f051abb7dbbd976081
+  data.tar.gz: 0fdad3b966bec08eb468cec0d412ca9e9eb02db40e34e6ea6cbe1c3fc7e61ae907ae482a7231cd651fb5ef367f8a62c0c086a2a8190a072fe463118bc643637d

data/lib/jrubyfx/application.rb

@@ -27,7 +27,7 @@ class JRubyFX::Application < Java.javafx.application.Application
   # and, if jruby changes, false negatives. If you are using this, it might be a
   # very bad idea... (though it is handy)
   def self.in_jar?()
-    $LOAD_PATH.inject(false) { |res,i| res || i.include?(".jar!/META-INF/jruby.home/lib/ruby/")}
+    $LOAD_PATH.inject(false) { |res,i| res || i.include?("/META-INF/jruby.home/lib/ruby/")}
   end
 
   ##

data/lib/jrubyfx/compiler_app.rb

@@ -35,6 +35,8 @@ class CompilerApp < JRubyFX::Application
         loader.load(jruby_ext: {jit: 0, dont_load: true, jit_opts: {force: true}})
       end
       puts "done"
+    rescue java.lang.Throwable, Exception => e
+      $JRUBYFX_AOT_ERROR = e
     ensure
       Platform.exit
     end

data/lib/jrubyfx/controller.rb

@@ -26,23 +26,28 @@ end
 # Special methods for fxml loading
 module Kernel
   @@jrubyfx_res_dir = {}
-  def fxml_root(value=nil, jar_value=nil)
+  @@jrubyfx_fxml_res_cl = nil
+  def fxml_root(value=nil, jar_value=nil, class_loader = nil)
+  	@@jrubyfx_fxml_res_cl = class_loader if class_loader
     if value or jar_value
-      @@jrubyfx_fxml_dir = JRubyFX::Application.in_jar? ? jar_value : File.expand_path(value)
+      @@jrubyfx_fxml_dir = (JRubyFX::Application.in_jar? and jar_value) ? 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)
+      @@jrubyfx_res_dir[res_name.to_sym] = (JRubyFX::Application.in_jar? and jar_value) ? jar_value : File.expand_path(value)
     else
       @@jrubyfx_res_dir[res_name.to_sym]
     end
   end
+  def get_fxml_resource_class_loader
+  	@@jrubyfx_fxml_res_cl || JRuby.runtime.jruby_class_loader.method("get_resource")
+  end
   def resource_url(type, relative_path)
     if JRubyFX::Application.in_jar?
-      JRuby.runtime.jruby_class_loader.get_resource("#{resource_root(type)}/#{relative_path}");
+      get_fxml_resource_class_loader.call("#{resource_root(type)}/#{relative_path}")
     else
       java.net.URL.new("file:" + File.join(resource_root(type), relative_path))
     end
@@ -108,6 +113,7 @@ module JRubyFX::Controller
     def load_into(stage, settings={})
       # Inherit from default settings
       settings = DEFAULT_SETTINGS.merge({root_dir: (self.instance_variable_get("@fxml_root_dir") || fxml_root),
+          class_loader: (get_fxml_resource_class_loader),
           filename: self.instance_variable_get("@filename")}).merge settings
 
       # Custom controls don't always need to be pure java, but oh well...
@@ -120,7 +126,7 @@ module JRubyFX::Controller
       ctrl.stage = stage
 
       # load the FXML file
-      root = Controller.get_fxml_loader(settings[:filename], ctrl, settings[:root_dir]).load
+      root = Controller.get_fxml_loader(settings[:filename], ctrl, settings[:root_dir], settings[:class_loader]).load
 
       # Unless the FXML root node is a scene, wrap that node in a scene
       if root.is_a? Scene
@@ -255,7 +261,7 @@ module JRubyFX::Controller
   end
 
   def load_fxml(filename, root_dir=nil)
-    fx = Controller.get_fxml_loader(filename, self, root_dir || @fxml_root_dir || fxml_root)
+    fx = Controller.get_fxml_loader(filename, self, root_dir || @fxml_root_dir || fxml_root, get_fxml_resource_class_loader)
     fx.root = self
     fx.load
   end
@@ -300,10 +306,11 @@ module JRubyFX::Controller
   def self.load_fxml_only(filename, stage, settings={})
     # Inherit from default settings
     settings = DEFAULT_SETTINGS.merge({root_dir: fxml_root,
+    	class_loader: get_fxml_resource_class_loader,
         filename: filename}).merge settings
 
     # load the FXML file
-    root = Controller.get_fxml_loader(settings[:filename], nil, settings[:root_dir]).load
+    root = Controller.get_fxml_loader(settings[:filename], nil, settings[:root_dir], settings[:class_loader]).load
 
     # TODO: de-duplicate this code
 
@@ -336,10 +343,16 @@ module JRubyFX::Controller
   # === Equivalent Java
   #   Parent root = FXMLLoader.load(getClass().getResource("Demo.fxml"));
   #
-  def self.get_fxml_loader(filename, controller = nil, root_dir = nil)
+  def self.get_fxml_loader(filename, controller = nil, root_dir = nil, class_loader = JRuby.runtime.jruby_class_loader.method("get_resource"))
     fx = FxmlLoader.new
-    fx.location =
-    if JRubyFX::Application.in_jar?
+    fx.location = get_fxml_location(root_dir, filename, class_loader)
+    # we must set this here for JFX to call our events
+    fx.controller = controller
+    fx
+  end
+  
+  def self.get_fxml_location(root_dir, filename, class_loader)
+    if JRubyFX::Application.in_jar? and filename.match(/^[^.\/]/)
       # 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
       
@@ -349,18 +362,14 @@ module JRubyFX::Controller
       # 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
-      URL.new "file:#{File.join root_dir, filename}"
+      location = class_loader.call(File.join(root_dir, filename))
+      
+      # fall back if not found
+      return location if location
     end
-    # we must set this here for JFX to call our events
-    fx.controller = controller
-    fx
+    
+    root_dir ||= fxml_root
+    # If we are in the normal filesystem, create a file url path relative to relative_to or this file
+    URL.new "file:#{File.join root_dir, filename}"
   end
 end

data/lib/jrubyfx/core_ext/precompiled.rb

@@ -6,14 +6,23 @@ class Java::JavafxAnimation::PathTransition
 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 accessible_role=(rbenum)
+    java_send "setAccessibleRole", [Java::JavafxScene::AccessibleRole], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::AccessibleRole)
+  end
+  def notify_accessible_attribute_changed=(rbenum)
+    java_send "notifyAccessibleAttributeChanged", [Java::JavafxScene::AccessibleAttribute], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::AccessibleAttribute)
+  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)
+  def node_orientation=(rbenum)
+    java_send "setNodeOrientation", [Java::JavafxGeometry::NodeOrientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::NodeOrientation)
   end
   def on_context_menu_requested(&block)
     if block_given?
@@ -22,95 +31,60 @@ class Java::JavafxScene::Node
       getOnContextMenuRequested
     end
   end
-  def on_drag_detected(&block)
-    if block_given?
-      setOnDragDetected block
-    else
-      getOnDragDetected
-    end
-  end
-  def on_drag_done(&block)
-    if block_given?
-      setOnDragDone block
-    else
-      getOnDragDone
-    end
-  end
-  def on_drag_dropped(&block)
-    if block_given?
-      setOnDragDropped block
-    else
-      getOnDragDropped
-    end
-  end
-  def on_drag_entered(&block)
-    if block_given?
-      setOnDragEntered block
-    else
-      getOnDragEntered
-    end
-  end
-  def on_drag_exited(&block)
-    if block_given?
-      setOnDragExited block
-    else
-      getOnDragExited
-    end
-  end
-  def on_drag_over(&block)
+  def on_mouse_clicked(&block)
     if block_given?
-      setOnDragOver block
+      setOnMouseClicked block
     else
-      getOnDragOver
+      getOnMouseClicked
     end
   end
-  def on_input_method_text_changed(&block)
+  def on_mouse_dragged(&block)
     if block_given?
-      setOnInputMethodTextChanged block
+      setOnMouseDragged block
     else
-      getOnInputMethodTextChanged
+      getOnMouseDragged
     end
   end
-  def on_key_pressed(&block)
+  def on_mouse_entered(&block)
     if block_given?
-      setOnKeyPressed block
+      setOnMouseEntered block
     else
-      getOnKeyPressed
+      getOnMouseEntered
     end
   end
-  def on_key_released(&block)
+  def on_mouse_exited(&block)
     if block_given?
-      setOnKeyReleased block
+      setOnMouseExited block
     else
-      getOnKeyReleased
+      getOnMouseExited
     end
   end
-  def on_key_typed(&block)
+  def on_mouse_moved(&block)
     if block_given?
-      setOnKeyTyped block
+      setOnMouseMoved block
     else
-      getOnKeyTyped
+      getOnMouseMoved
     end
   end
-  def on_mouse_clicked(&block)
+  def on_mouse_pressed(&block)
     if block_given?
-      setOnMouseClicked block
+      setOnMousePressed block
     else
-      getOnMouseClicked
+      getOnMousePressed
     end
   end
-  def on_mouse_drag_entered(&block)
+  def on_mouse_released(&block)
     if block_given?
-      setOnMouseDragEntered block
+      setOnMouseReleased block
     else
-      getOnMouseDragEntered
+      getOnMouseReleased
     end
   end
-  def on_mouse_drag_exited(&block)
+  def on_drag_detected(&block)
     if block_given?
-      setOnMouseDragExited block
+      setOnDragDetected block
     else
-      getOnMouseDragExited
+      getOnDragDetected
     end
   end
   def on_mouse_drag_over(&block)
@@ -127,46 +101,46 @@ class Java::JavafxScene::Node
       getOnMouseDragReleased
     end
   end
-  def on_mouse_dragged(&block)
+  def on_mouse_drag_entered(&block)
     if block_given?
-      setOnMouseDragged block
+      setOnMouseDragEntered block
     else
-      getOnMouseDragged
+      getOnMouseDragEntered
     end
   end
-  def on_mouse_entered(&block)
+  def on_mouse_drag_exited(&block)
     if block_given?
-      setOnMouseEntered block
+      setOnMouseDragExited block
     else
-      getOnMouseEntered
+      getOnMouseDragExited
     end
   end
-  def on_mouse_exited(&block)
+  def on_scroll_started(&block)
     if block_given?
-      setOnMouseExited block
+      setOnScrollStarted block
     else
-      getOnMouseExited
+      getOnScrollStarted
     end
   end
-  def on_mouse_moved(&block)
+  def on_scroll(&block)
     if block_given?
-      setOnMouseMoved block
+      setOnScroll block
     else
-      getOnMouseMoved
+      getOnScroll
     end
   end
-  def on_mouse_pressed(&block)
+  def on_scroll_finished(&block)
     if block_given?
-      setOnMousePressed block
+      setOnScrollFinished block
     else
-      getOnMousePressed
+      getOnScrollFinished
     end
   end
-  def on_mouse_released(&block)
+  def on_rotation_started(&block)
     if block_given?
-      setOnMouseReleased block
+      setOnRotationStarted block
     else
-      getOnMouseReleased
+      getOnRotationStarted
     end
   end
   def on_rotate(&block)
@@ -183,32 +157,32 @@ class Java::JavafxScene::Node
       getOnRotationFinished
     end
   end
-  def on_rotation_started(&block)
+  def on_zoom_started(&block)
     if block_given?
-      setOnRotationStarted block
+      setOnZoomStarted block
     else
-      getOnRotationStarted
+      getOnZoomStarted
     end
   end
-  def on_scroll(&block)
+  def on_zoom(&block)
     if block_given?
-      setOnScroll block
+      setOnZoom block
     else
-      getOnScroll
+      getOnZoom
     end
   end
-  def on_scroll_finished(&block)
+  def on_zoom_finished(&block)
     if block_given?
-      setOnScrollFinished block
+      setOnZoomFinished block
     else
-      getOnScrollFinished
+      getOnZoomFinished
     end
   end
-  def on_scroll_started(&block)
+  def on_swipe_up(&block)
     if block_given?
-      setOnScrollStarted block
+      setOnSwipeUp block
     else
-      getOnScrollStarted
+      getOnSwipeUp
     end
   end
   def on_swipe_down(&block)
@@ -232,11 +206,11 @@ class Java::JavafxScene::Node
       getOnSwipeRight
     end
   end
-  def on_swipe_up(&block)
+  def on_touch_pressed(&block)
     if block_given?
-      setOnSwipeUp block
+      setOnTouchPressed block
     else
-      getOnSwipeUp
+      getOnTouchPressed
     end
   end
   def on_touch_moved(&block)
@@ -246,13 +220,6 @@ class Java::JavafxScene::Node
       getOnTouchMoved
     end
   end
-  def on_touch_pressed(&block)
-    if block_given?
-      setOnTouchPressed block
-    else
-      getOnTouchPressed
-    end
-  end
   def on_touch_released(&block)
     if block_given?
       setOnTouchReleased block
@@ -267,225 +234,142 @@ class Java::JavafxScene::Node
       getOnTouchStationary
     end
   end
-  def on_zoom(&block)
+  def on_drag_entered(&block)
     if block_given?
-      setOnZoom block
+      setOnDragEntered block
     else
-      getOnZoom
+      getOnDragEntered
     end
   end
-  def on_zoom_finished(&block)
+  def on_drag_exited(&block)
     if block_given?
-      setOnZoomFinished block
+      setOnDragExited block
     else
-      getOnZoomFinished
+      getOnDragExited
     end
   end
-  def on_zoom_started(&block)
+  def on_drag_over(&block)
     if block_given?
-      setOnZoomStarted block
+      setOnDragOver block
     else
-      getOnZoomStarted
+      getOnDragOver
     end
   end
-  def rotate(*args)
-    transforms << build(Rotate, *args)
-  end
-  def effect(*r)
-    if r.length > 0
-      self.effect = r[0]
+  def on_drag_dropped(&block)
+    if block_given?
+      setOnDragDropped block
     else
-      get_effect
+      getOnDragDropped
     end
   end
-end
-class Java::JavafxSceneChart::Axis
-  include JRubyFX::DSL
-  def side=(rbenum)
-    java_send "setSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
-  end
-  def tick_label_fill=(value)
-    setTickLabelFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
-  end
-end
-class Java::JavafxSceneChart::Chart
-  include JRubyFX::DSL
-  def legend_side=(rbenum)
-    java_send "setLegendSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
-  end
-  def title_side=(rbenum)
-    java_send "setTitleSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
+  def on_drag_done(&block)
+    if block_given?
+      setOnDragDone block
+    else
+      getOnDragDone
+    end
   end
-end
-class Java::JavafxSceneControl::ListView
-  include JRubyFX::DSL
-  def orientation=(rbenum)
-    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
+  def on_key_pressed(&block)
+    if block_given?
+      setOnKeyPressed block
+    else
+      getOnKeyPressed
+    end
   end
-  def on_edit_cancel(&block)
+  def on_key_released(&block)
     if block_given?
-      setOnEditCancel block
+      setOnKeyReleased block
     else
-      getOnEditCancel
+      getOnKeyReleased
     end
   end
-  def on_edit_commit(&block)
+  def on_key_typed(&block)
     if block_given?
-      setOnEditCommit block
+      setOnKeyTyped block
     else
-      getOnEditCommit
+      getOnKeyTyped
     end
   end
-  def on_edit_start(&block)
+  def on_input_method_text_changed(&block)
     if block_given?
-      setOnEditStart block
+      setOnInputMethodTextChanged block
     else
-      getOnEditStart
+      getOnInputMethodTextChanged
+    end
+  end
+  def rotate(*args)
+    transforms << build(Java::JavafxSceneTransform::Rotate, *args)
+  end
+  def effect(*r)
+    if r.length > 0
+      self.effect = r[0]
+    else
+      get_effect
     end
   end
 end
-class Java::JavafxSceneControl::MenuButton
+class Java::JavafxScene::Scene
   include JRubyFX::DSL
-  def popup_side=(rbenum)
-    java_send "setPopupSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
+  def node_orientation=(rbenum)
+    java_send "setNodeOrientation", [Java::JavafxGeometry::NodeOrientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::NodeOrientation)
   end
-  def method_missing(name, *args, &block)
-    super(name, *args, &block).tap do |obj|
-      add(obj) if obj.kind_of?(Java::JavafxSceneControl::MenuItem) && !name.to_s.end_with?('!')
-    end
-  end
-  def add(value)
-    get_items() << value
-  end
-end
-class Java::JavafxSceneControl::ScrollBar
-  include JRubyFX::DSL
-  def orientation=(rbenum)
-    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
-  end
-end
-class Java::JavafxSceneControl::ScrollPane
-  include JRubyFX::DSL
-  def hbar_policy=(rbenum)
-    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::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 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 halignment=(rbenum)
-    java_send "setHalignment", [Java::JavafxGeometry::HPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::HPos)
-  end
-end
-class Java::JavafxSceneControl::Slider
-  include JRubyFX::DSL
-  def orientation=(rbenum)
-    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
-  end
-end
-class Java::JavafxSceneControl::SplitPane
-  include JRubyFX::DSL
-  def orientation=(rbenum)
-    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
-  end
-end
-class Java::JavafxSceneControl::TableColumn
-  include JRubyFX::DSL
-  def sort_type=(rbenum)
-    java_send "setSortType", [Java::JavafxSceneControl::TableColumn::SortType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::TableColumn::SortType)
+  def fill=(value)
+    setFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
   end
-  def on_edit_cancel(&block)
+  def on_context_menu_requested(&block)
     if block_given?
-      setOnEditCancel block
+      setOnContextMenuRequested block
     else
-      getOnEditCancel
+      getOnContextMenuRequested
     end
   end
-  def on_edit_commit(&block)
+  def on_mouse_clicked(&block)
     if block_given?
-      setOnEditCommit block
+      setOnMouseClicked block
     else
-      getOnEditCommit
+      getOnMouseClicked
     end
   end
-  def on_edit_start(&block)
+  def on_mouse_dragged(&block)
     if block_given?
-      setOnEditStart block
+      setOnMouseDragged block
     else
-      getOnEditStart
+      getOnMouseDragged
     end
   end
-end
-class Java::JavafxSceneControl::TabPane
-  include JRubyFX::DSL
-  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
-  include JRubyFX::DSL
-  def alignment=(rbenum)
-    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
-  end
-  def on_action(&block)
+  def on_mouse_entered(&block)
     if block_given?
-      setOnAction block
+      setOnMouseEntered block
     else
-      getOnAction
+      getOnMouseEntered
     end
   end
-end
-class Java::JavafxSceneControl::ToggleButton
-  include JRubyFX::DSL
-  def content_display=(rbenum)
-    java_send "setContentDisplay", [Java::JavafxSceneControl::ContentDisplay], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::ContentDisplay)
-  end
-  def text_alignment=(rbenum)
-    java_send "setTextAlignment", [Java::JavafxSceneText::TextAlignment], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::TextAlignment)
-  end
-  def text_overrun=(rbenum)
-    java_send "setTextOverrun", [Java::JavafxSceneControl::OverrunStyle], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::OverrunStyle)
-  end
-  def alignment=(rbenum)
-    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
-  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)
+  def on_mouse_exited(&block)
+    if block_given?
+      setOnMouseExited block
+    else
+      getOnMouseExited
+    end
   end
-  def text_fill=(value)
-    setTextFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  def on_mouse_moved(&block)
+    if block_given?
+      setOnMouseMoved block
+    else
+      getOnMouseMoved
+    end
   end
-  def on_action(&block)
+  def on_mouse_pressed(&block)
     if block_given?
-      setOnAction block
+      setOnMousePressed block
     else
-      getOnAction
+      getOnMousePressed
     end
   end
-  def on_context_menu_requested(&block)
+  def on_mouse_released(&block)
     if block_given?
-      setOnContextMenuRequested block
+      setOnMouseReleased block
     else
-      getOnContextMenuRequested
+      getOnMouseReleased
     end
   end
   def on_drag_detected(&block)
@@ -495,570 +379,548 @@ class Java::JavafxSceneControl::ToggleButton
       getOnDragDetected
     end
   end
-  def on_drag_done(&block)
+  def on_mouse_drag_over(&block)
     if block_given?
-      setOnDragDone block
+      setOnMouseDragOver block
     else
-      getOnDragDone
+      getOnMouseDragOver
     end
   end
-  def on_drag_dropped(&block)
+  def on_mouse_drag_released(&block)
     if block_given?
-      setOnDragDropped block
+      setOnMouseDragReleased block
     else
-      getOnDragDropped
+      getOnMouseDragReleased
     end
   end
-  def on_drag_entered(&block)
+  def on_mouse_drag_entered(&block)
     if block_given?
-      setOnDragEntered block
+      setOnMouseDragEntered block
     else
-      getOnDragEntered
+      getOnMouseDragEntered
     end
   end
-  def on_drag_exited(&block)
+  def on_mouse_drag_exited(&block)
     if block_given?
-      setOnDragExited block
+      setOnMouseDragExited block
     else
-      getOnDragExited
+      getOnMouseDragExited
     end
   end
-  def on_drag_over(&block)
+  def on_scroll_started(&block)
     if block_given?
-      setOnDragOver block
+      setOnScrollStarted block
     else
-      getOnDragOver
+      getOnScrollStarted
     end
   end
-  def on_input_method_text_changed(&block)
+  def on_scroll(&block)
     if block_given?
-      setOnInputMethodTextChanged block
+      setOnScroll block
     else
-      getOnInputMethodTextChanged
+      getOnScroll
     end
   end
-  def on_key_pressed(&block)
+  def on_scroll_finished(&block)
     if block_given?
-      setOnKeyPressed block
+      setOnScrollFinished block
     else
-      getOnKeyPressed
+      getOnScrollFinished
     end
   end
-  def on_key_released(&block)
+  def on_rotation_started(&block)
     if block_given?
-      setOnKeyReleased block
+      setOnRotationStarted block
     else
-      getOnKeyReleased
+      getOnRotationStarted
     end
   end
-  def on_key_typed(&block)
+  def on_rotate(&block)
     if block_given?
-      setOnKeyTyped block
+      setOnRotate block
     else
-      getOnKeyTyped
+      getOnRotate
     end
   end
-  def on_mouse_clicked(&block)
+  def on_rotation_finished(&block)
     if block_given?
-      setOnMouseClicked block
+      setOnRotationFinished block
     else
-      getOnMouseClicked
+      getOnRotationFinished
     end
   end
-  def on_mouse_drag_entered(&block)
+  def on_zoom_started(&block)
     if block_given?
-      setOnMouseDragEntered block
+      setOnZoomStarted block
     else
-      getOnMouseDragEntered
+      getOnZoomStarted
     end
   end
-  def on_mouse_drag_exited(&block)
+  def on_zoom(&block)
     if block_given?
-      setOnMouseDragExited block
+      setOnZoom block
     else
-      getOnMouseDragExited
+      getOnZoom
     end
   end
-  def on_mouse_drag_over(&block)
+  def on_zoom_finished(&block)
     if block_given?
-      setOnMouseDragOver block
+      setOnZoomFinished block
     else
-      getOnMouseDragOver
+      getOnZoomFinished
     end
   end
-  def on_mouse_drag_released(&block)
+  def on_swipe_up(&block)
     if block_given?
-      setOnMouseDragReleased block
+      setOnSwipeUp block
     else
-      getOnMouseDragReleased
+      getOnSwipeUp
     end
   end
-  def on_mouse_dragged(&block)
+  def on_swipe_down(&block)
     if block_given?
-      setOnMouseDragged block
+      setOnSwipeDown block
     else
-      getOnMouseDragged
+      getOnSwipeDown
     end
   end
-  def on_mouse_entered(&block)
+  def on_swipe_left(&block)
     if block_given?
-      setOnMouseEntered block
+      setOnSwipeLeft block
     else
-      getOnMouseEntered
+      getOnSwipeLeft
     end
   end
-  def on_mouse_exited(&block)
+  def on_swipe_right(&block)
     if block_given?
-      setOnMouseExited block
+      setOnSwipeRight block
     else
-      getOnMouseExited
+      getOnSwipeRight
     end
   end
-  def on_mouse_moved(&block)
+  def on_touch_pressed(&block)
     if block_given?
-      setOnMouseMoved block
+      setOnTouchPressed block
     else
-      getOnMouseMoved
+      getOnTouchPressed
     end
   end
-  def on_mouse_pressed(&block)
+  def on_touch_moved(&block)
     if block_given?
-      setOnMousePressed block
+      setOnTouchMoved block
     else
-      getOnMousePressed
+      getOnTouchMoved
     end
   end
-  def on_mouse_released(&block)
+  def on_touch_released(&block)
     if block_given?
-      setOnMouseReleased block
+      setOnTouchReleased block
     else
-      getOnMouseReleased
+      getOnTouchReleased
     end
   end
-  def on_rotate(&block)
+  def on_touch_stationary(&block)
     if block_given?
-      setOnRotate block
+      setOnTouchStationary block
     else
-      getOnRotate
+      getOnTouchStationary
     end
   end
-  def on_rotation_finished(&block)
+  def on_drag_entered(&block)
     if block_given?
-      setOnRotationFinished block
+      setOnDragEntered block
     else
-      getOnRotationFinished
+      getOnDragEntered
     end
   end
-  def on_rotation_started(&block)
+  def on_drag_exited(&block)
     if block_given?
-      setOnRotationStarted block
+      setOnDragExited block
     else
-      getOnRotationStarted
+      getOnDragExited
     end
   end
-  def on_scroll(&block)
+  def on_drag_over(&block)
     if block_given?
-      setOnScroll block
+      setOnDragOver block
     else
-      getOnScroll
+      getOnDragOver
     end
   end
-  def on_scroll_finished(&block)
+  def on_drag_dropped(&block)
     if block_given?
-      setOnScrollFinished block
+      setOnDragDropped block
     else
-      getOnScrollFinished
+      getOnDragDropped
     end
   end
-  def on_scroll_started(&block)
+  def on_drag_done(&block)
     if block_given?
-      setOnScrollStarted block
+      setOnDragDone block
     else
-      getOnScrollStarted
+      getOnDragDone
     end
   end
-  def on_swipe_down(&block)
+  def on_key_pressed(&block)
     if block_given?
-      setOnSwipeDown block
+      setOnKeyPressed block
     else
-      getOnSwipeDown
+      getOnKeyPressed
     end
   end
-  def on_swipe_left(&block)
+  def on_key_released(&block)
     if block_given?
-      setOnSwipeLeft block
+      setOnKeyReleased block
     else
-      getOnSwipeLeft
+      getOnKeyReleased
     end
   end
-  def on_swipe_right(&block)
+  def on_key_typed(&block)
     if block_given?
-      setOnSwipeRight block
+      setOnKeyTyped block
     else
-      getOnSwipeRight
+      getOnKeyTyped
     end
   end
-  def on_swipe_up(&block)
+  def on_input_method_text_changed(&block)
     if block_given?
-      setOnSwipeUp block
+      setOnInputMethodTextChanged block
     else
-      getOnSwipeUp
+      getOnInputMethodTextChanged
     end
   end
-  def on_touch_moved(&block)
+  #TODO: logical_child(root)
+  def self.new(*args)
+    super *JRubyFX::Utils::CommonConverters.convert_args(args, [[:none], [:none, :color], [:none, :none, :none], [:none, :none, :none, :color]])
+  end
+end
+class Java::JavafxSceneChart::Axis
+  include JRubyFX::DSL
+  def side=(rbenum)
+    java_send "setSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
+  end
+  def tick_label_fill=(value)
+    setTickLabelFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  end
+end
+class Java::JavafxSceneChart::Chart
+  include JRubyFX::DSL
+  def title_side=(rbenum)
+    java_send "setTitleSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
+  end
+  def legend_side=(rbenum)
+    java_send "setLegendSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
+  end
+end
+class Java::JavafxSceneChart::LineChart
+  include JRubyFX::DSL
+  def axis_sorting_policy=(rbenum)
+    java_send "setAxisSortingPolicy", [Java::JavafxSceneChart::LineChart::SortingPolicy], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneChart::LineChart::SortingPolicy)
+  end
+end
+class Java::JavafxSceneControl::ListView
+  include JRubyFX::DSL
+  def orientation=(rbenum)
+    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
+  end
+  def on_edit_start(&block)
     if block_given?
-      setOnTouchMoved block
+      setOnEditStart block
     else
-      getOnTouchMoved
+      getOnEditStart
     end
   end
-  def on_touch_pressed(&block)
+  def on_edit_commit(&block)
     if block_given?
-      setOnTouchPressed block
+      setOnEditCommit block
     else
-      getOnTouchPressed
+      getOnEditCommit
     end
   end
-  def on_touch_released(&block)
+  def on_edit_cancel(&block)
     if block_given?
-      setOnTouchReleased block
+      setOnEditCancel block
     else
-      getOnTouchReleased
+      getOnEditCancel
     end
   end
-  def on_touch_stationary(&block)
+  def on_scroll_to(&block)
     if block_given?
-      setOnTouchStationary block
+      setOnScrollTo block
     else
-      getOnTouchStationary
+      getOnScrollTo
     end
   end
-  def on_zoom(&block)
+end
+class Java::JavafxSceneControl::MenuButton
+  include JRubyFX::DSL
+  def popup_side=(rbenum)
+    java_send "setPopupSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
+  end
+  def method_missing(name, *args, &block)
+    super(name, *args, &block).tap do |obj|
+      add(obj) if obj.kind_of?(Java::JavafxSceneControl::MenuItem) && !name.to_s.end_with?('!')
+    end
+  end
+  def add(value)
+    get_items() << value
+  end
+end
+class Java::JavafxSceneControl::PopupControl
+  include JRubyFX::DSL
+  def anchor_location=(rbenum)
+    java_send "setAnchorLocation", [Java::JavafxStage::PopupWindow::AnchorLocation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxStage::PopupWindow::AnchorLocation)
+  end
+  def on_auto_hide(&block)
     if block_given?
-      setOnZoom block
+      setOnAutoHide block
     else
-      getOnZoom
+      getOnAutoHide
     end
   end
-  def on_zoom_finished(&block)
+  def on_close_request(&block)
     if block_given?
-      setOnZoomFinished block
+      setOnCloseRequest block
     else
-      getOnZoomFinished
+      getOnCloseRequest
     end
   end
-  def on_zoom_started(&block)
+  def on_showing(&block)
     if block_given?
-      setOnZoomStarted block
+      setOnShowing block
     else
-      getOnZoomStarted
+      getOnShowing
     end
   end
-end
-class Java::JavafxSceneControl::ToolBar
-  include JRubyFX::DSL
-  def orientation=(rbenum)
-    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
-  end
-end
-class Java::JavafxSceneControl::Tooltip
-  include JRubyFX::DSL
-  def content_display=(rbenum)
-    java_send "setContentDisplay", [Java::JavafxSceneControl::ContentDisplay], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::ContentDisplay)
-  end
-  def text_alignment=(rbenum)
-    java_send "setTextAlignment", [Java::JavafxSceneText::TextAlignment], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::TextAlignment)
+  def on_shown(&block)
+    if block_given?
+      setOnShown block
+    else
+      getOnShown
+    end
   end
-  def text_overrun=(rbenum)
-    java_send "setTextOverrun", [Java::JavafxSceneControl::OverrunStyle], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::OverrunStyle)
+  def on_hiding(&block)
+    if block_given?
+      setOnHiding block
+    else
+      getOnHiding
+    end
   end
-end
-class Java::JavafxSceneEffect::Blend
-  include JRubyFX::DSL
-  def mode=(rbenum)
-    java_send "setMode", [Java::JavafxSceneEffect::BlendMode], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlendMode)
+  def on_hidden(&block)
+    if block_given?
+      setOnHidden block
+    else
+      getOnHidden
+    end
   end
 end
-class Java::JavafxSceneEffect::DropShadow
+class Java::JavafxSceneControl::ScrollBar
   include JRubyFX::DSL
-  def blur_type=(rbenum)
-    java_send "setBlurType", [Java::JavafxSceneEffect::BlurType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlurType)
-  end
-  def color=(value)
-    setColor(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  def orientation=(rbenum)
+    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
   end
 end
-class Java::JavafxSceneEffect::InnerShadow
+class Java::JavafxSceneControl::ScrollPane
   include JRubyFX::DSL
-  def blur_type=(rbenum)
-    java_send "setBlurType", [Java::JavafxSceneEffect::BlurType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlurType)
+  def hbar_policy=(rbenum)
+    java_send "setHbarPolicy", [Java::JavafxSceneControl::ScrollPane::ScrollBarPolicy], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::ScrollPane::ScrollBarPolicy)
   end
-  def color=(value)
-    setColor(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  def vbar_policy=(rbenum)
+    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::JavafxSceneEffect::Shadow
+class Java::JavafxSceneControl::Separator
   include JRubyFX::DSL
-  def blur_type=(rbenum)
-    java_send "setBlurType", [Java::JavafxSceneEffect::BlurType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlurType)
-  end
-  def color=(value)
-    setColor(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  def orientation=(rbenum)
+    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
   end
-end
-class Java::JavafxSceneLayout::ColumnConstraints
-  include JRubyFX::DSL
   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)
+  def valignment=(rbenum)
+    java_send "setValignment", [Java::JavafxGeometry::VPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::VPos)
   end
 end
-class Java::JavafxSceneLayout::FlowPane
+class Java::JavafxSceneControl::Slider
   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
 end
-class Java::JavafxSceneLayout::GridPane
+class Java::JavafxSceneControl::SplitPane
   include JRubyFX::DSL
-  def alignment=(rbenum)
-    java_send "setAlignment", [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
 end
-class Java::JavafxSceneLayout::HBox
+class Java::JavafxSceneControl::TableColumn
   include JRubyFX::DSL
-  def alignment=(rbenum)
-    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  def sort_type=(rbenum)
+    java_send "setSortType", [Java::JavafxSceneControl::TableColumn::SortType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::TableColumn::SortType)
   end
-end
-class Java::JavafxSceneLayout::RowConstraints
-  include JRubyFX::DSL
-  def valignment=(rbenum)
-    java_send "setValignment", [Java::JavafxGeometry::VPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::VPos)
+  def on_edit_start(&block)
+    if block_given?
+      setOnEditStart block
+    else
+      getOnEditStart
+    end
   end
-  def vgrow=(rbenum)
-    java_send "setVgrow", [Java::JavafxSceneLayout::Priority], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneLayout::Priority)
+  def on_edit_commit(&block)
+    if block_given?
+      setOnEditCommit block
+    else
+      getOnEditCommit
+    end
   end
-end
-class Java::JavafxSceneLayout::StackPane
-  include JRubyFX::DSL
-  def alignment=(rbenum)
-    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  def on_edit_cancel(&block)
+    if block_given?
+      setOnEditCancel block
+    else
+      getOnEditCancel
+    end
   end
 end
-class Java::JavafxSceneLayout::TilePane
+class Java::JavafxSceneControl::TabPane
   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)
+  def side=(rbenum)
+    java_send "setSide", [Java::JavafxGeometry::Side], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Side)
   end
-  def tile_alignment=(rbenum)
-    java_send "setTileAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  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::JavafxSceneLayout::VBox
+class Java::JavafxSceneControl::TextField
   include JRubyFX::DSL
   def alignment=(rbenum)
     java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
   end
-end
-class Java::JavafxSceneShape::Arc
-  include JRubyFX::DSL
-  def type=(rbenum)
-    java_send "setType", [Java::JavafxSceneShape::ArcType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::ArcType)
-  end
-end
-class Java::JavafxSceneShape::Path
-  include JRubyFX::DSL
-  def fill_rule=(rbenum)
-    java_send "setFillRule", [Java::JavafxSceneShape::FillRule], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::FillRule)
-  end
-  def add(value)
-    elements() << value
-  end
-  def rotate(*args)
-    transforms << build(Rotate, *args)
-  end
-end
-class Java::JavafxSceneShape::Shape
-  include JRubyFX::DSL
-  def stroke_line_cap=(rbenum)
-    java_send "setStrokeLineCap", [Java::JavafxSceneShape::StrokeLineCap], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::StrokeLineCap)
-  end
-  def stroke_line_join=(rbenum)
-    java_send "setStrokeLineJoin", [Java::JavafxSceneShape::StrokeLineJoin], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::StrokeLineJoin)
-  end
-  def stroke_type=(rbenum)
-    java_send "setStrokeType", [Java::JavafxSceneShape::StrokeType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::StrokeType)
-  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]
+  def on_action(&block)
+    if block_given?
+      setOnAction block
     else
-      get_fill
+      getOnAction
     end
   end
 end
-class Java::JavafxSceneShape::SVGPath
+class Java::JavafxSceneControl::ToggleButton
   include JRubyFX::DSL
-  def fill_rule=(rbenum)
-    java_send "setFillRule", [Java::JavafxSceneShape::FillRule], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::FillRule)
+  def alignment=(rbenum)
+    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
   end
-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
-  def font_smoothing_type=(rbenum)
-    java_send "setFontSmoothingType", [Java::JavafxSceneText::FontSmoothingType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::FontSmoothingType)
-  end
-  def text_origin=(rbenum)
-    java_send "setTextOrigin", [Java::JavafxGeometry::VPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::VPos)
+  def text_overrun=(rbenum)
+    java_send "setTextOverrun", [Java::JavafxSceneControl::OverrunStyle], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::OverrunStyle)
   end
-end
-class Java::JavafxSceneWeb::WebView
-  include JRubyFX::DSL
-  def font_smoothing_type=(rbenum)
-    java_send "setFontSmoothingType", [Java::JavafxSceneText::FontSmoothingType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::FontSmoothingType)
+  def content_display=(rbenum)
+    java_send "setContentDisplay", [Java::JavafxSceneControl::ContentDisplay], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::ContentDisplay)
   end
-end
-class Java::JavafxStage::Stage
-  include JRubyFX::DSL
-  def init_modality=(rbenum)
-    java_send "initModality", [Java::JavafxStage::Modality], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxStage::Modality)
+  def blend_mode=(rbenum)
+    java_send "setBlendMode", [Java::JavafxSceneEffect::BlendMode], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlendMode)
   end
-  def init_style=(rbenum)
-    java_send "initStyle", [Java::JavafxStage::StageStyle], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxStage::StageStyle)
+  def cache_hint=(rbenum)
+    java_send "setCacheHint", [Java::JavafxScene::CacheHint], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::CacheHint)
   end
-end
-class Java::JavafxAnimation::FillTransition
-  include JRubyFX::DSL
-  def from_value=(value)
-    setFromValue(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  def accessible_role=(rbenum)
+    java_send "setAccessibleRole", [Java::JavafxScene::AccessibleRole], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::AccessibleRole)
   end
-  def to_value=(value)
-    setToValue(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  def notify_accessible_attribute_changed=(rbenum)
+    java_send "notifyAccessibleAttributeChanged", [Java::JavafxScene::AccessibleAttribute], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::AccessibleAttribute)
   end
-end
-class Java::JavafxAnimation::StrokeTransition
-  include JRubyFX::DSL
-  def from_value=(value)
-    setFromValue(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  def depth_test=(rbenum)
+    java_send "setDepthTest", [Java::JavafxScene::DepthTest], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::DepthTest)
   end
-  def to_value=(value)
-    setToValue(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  def node_orientation=(rbenum)
+    java_send "setNodeOrientation", [Java::JavafxGeometry::NodeOrientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::NodeOrientation)
   end
-end
-class Java::JavafxScene::Scene
-  include JRubyFX::DSL
-  def fill=(value)
-    setFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  def text_fill=(value)
+    setTextFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
   end
-  def on_context_menu_requested(&block)
+  def on_action(&block)
     if block_given?
-      setOnContextMenuRequested block
+      setOnAction block
     else
-      getOnContextMenuRequested
+      getOnAction
     end
   end
-  def on_drag_detected(&block)
+  def on_context_menu_requested(&block)
     if block_given?
-      setOnDragDetected block
+      setOnContextMenuRequested block
     else
-      getOnDragDetected
+      getOnContextMenuRequested
     end
   end
-  def on_drag_done(&block)
+  def on_mouse_clicked(&block)
     if block_given?
-      setOnDragDone block
+      setOnMouseClicked block
     else
-      getOnDragDone
+      getOnMouseClicked
     end
   end
-  def on_drag_dropped(&block)
+  def on_mouse_dragged(&block)
     if block_given?
-      setOnDragDropped block
+      setOnMouseDragged block
     else
-      getOnDragDropped
+      getOnMouseDragged
     end
   end
-  def on_drag_entered(&block)
+  def on_mouse_entered(&block)
     if block_given?
-      setOnDragEntered block
+      setOnMouseEntered block
     else
-      getOnDragEntered
+      getOnMouseEntered
     end
   end
-  def on_drag_exited(&block)
+  def on_mouse_exited(&block)
     if block_given?
-      setOnDragExited block
+      setOnMouseExited block
     else
-      getOnDragExited
+      getOnMouseExited
     end
   end
-  def on_drag_over(&block)
+  def on_mouse_moved(&block)
     if block_given?
-      setOnDragOver block
+      setOnMouseMoved block
     else
-      getOnDragOver
+      getOnMouseMoved
     end
   end
-  def on_input_method_text_changed(&block)
+  def on_mouse_pressed(&block)
     if block_given?
-      setOnInputMethodTextChanged block
+      setOnMousePressed block
     else
-      getOnInputMethodTextChanged
+      getOnMousePressed
     end
   end
-  def on_key_pressed(&block)
+  def on_mouse_released(&block)
     if block_given?
-      setOnKeyPressed block
+      setOnMouseReleased block
     else
-      getOnKeyPressed
+      getOnMouseReleased
     end
   end
-  def on_key_released(&block)
+  def on_drag_detected(&block)
     if block_given?
-      setOnKeyReleased block
+      setOnDragDetected block
     else
-      getOnKeyReleased
+      getOnDragDetected
     end
   end
-  def on_key_typed(&block)
+  def on_mouse_drag_over(&block)
     if block_given?
-      setOnKeyTyped block
+      setOnMouseDragOver block
     else
-      getOnKeyTyped
+      getOnMouseDragOver
     end
   end
-  def on_mouse_clicked(&block)
+  def on_mouse_drag_released(&block)
     if block_given?
-      setOnMouseClicked block
+      setOnMouseDragReleased block
     else
-      getOnMouseClicked
+      getOnMouseDragReleased
     end
   end
   def on_mouse_drag_entered(&block)
@@ -1075,184 +937,417 @@ class Java::JavafxScene::Scene
       getOnMouseDragExited
     end
   end
-  def on_mouse_drag_over(&block)
+  def on_scroll_started(&block)
     if block_given?
-      setOnMouseDragOver block
+      setOnScrollStarted block
     else
-      getOnMouseDragOver
+      getOnScrollStarted
     end
   end
-  def on_mouse_drag_released(&block)
+  def on_scroll(&block)
     if block_given?
-      setOnMouseDragReleased block
+      setOnScroll block
     else
-      getOnMouseDragReleased
+      getOnScroll
     end
   end
-  def on_mouse_dragged(&block)
+  def on_scroll_finished(&block)
     if block_given?
-      setOnMouseDragged block
+      setOnScrollFinished block
     else
-      getOnMouseDragged
+      getOnScrollFinished
     end
   end
-  def on_mouse_entered(&block)
+  def on_rotation_started(&block)
     if block_given?
-      setOnMouseEntered block
+      setOnRotationStarted block
     else
-      getOnMouseEntered
+      getOnRotationStarted
     end
   end
-  def on_mouse_exited(&block)
+  def on_rotate(&block)
     if block_given?
-      setOnMouseExited block
+      setOnRotate block
     else
-      getOnMouseExited
+      getOnRotate
     end
   end
-  def on_mouse_moved(&block)
+  def on_rotation_finished(&block)
     if block_given?
-      setOnMouseMoved block
+      setOnRotationFinished block
     else
-      getOnMouseMoved
+      getOnRotationFinished
     end
   end
-  def on_mouse_pressed(&block)
+  def on_zoom_started(&block)
     if block_given?
-      setOnMousePressed block
+      setOnZoomStarted block
     else
-      getOnMousePressed
+      getOnZoomStarted
     end
   end
-  def on_mouse_released(&block)
+  def on_zoom(&block)
     if block_given?
-      setOnMouseReleased block
+      setOnZoom block
     else
-      getOnMouseReleased
+      getOnZoom
     end
   end
-  def on_rotate(&block)
+  def on_zoom_finished(&block)
     if block_given?
-      setOnRotate block
+      setOnZoomFinished block
     else
-      getOnRotate
+      getOnZoomFinished
     end
   end
-  def on_rotation_finished(&block)
+  def on_swipe_up(&block)
     if block_given?
-      setOnRotationFinished block
+      setOnSwipeUp block
     else
-      getOnRotationFinished
+      getOnSwipeUp
     end
   end
-  def on_rotation_started(&block)
+  def on_swipe_down(&block)
     if block_given?
-      setOnRotationStarted block
+      setOnSwipeDown block
     else
-      getOnRotationStarted
+      getOnSwipeDown
     end
   end
-  def on_scroll(&block)
+  def on_swipe_left(&block)
     if block_given?
-      setOnScroll block
+      setOnSwipeLeft block
     else
-      getOnScroll
+      getOnSwipeLeft
     end
   end
-  def on_scroll_finished(&block)
+  def on_swipe_right(&block)
     if block_given?
-      setOnScrollFinished block
+      setOnSwipeRight block
     else
-      getOnScrollFinished
+      getOnSwipeRight
     end
   end
-  def on_scroll_started(&block)
+  def on_touch_pressed(&block)
     if block_given?
-      setOnScrollStarted block
+      setOnTouchPressed block
     else
-      getOnScrollStarted
+      getOnTouchPressed
     end
   end
-  def on_swipe_down(&block)
+  def on_touch_moved(&block)
     if block_given?
-      setOnSwipeDown block
+      setOnTouchMoved block
     else
-      getOnSwipeDown
+      getOnTouchMoved
     end
   end
-  def on_swipe_left(&block)
+  def on_touch_released(&block)
     if block_given?
-      setOnSwipeLeft block
+      setOnTouchReleased block
     else
-      getOnSwipeLeft
+      getOnTouchReleased
     end
   end
-  def on_swipe_right(&block)
+  def on_touch_stationary(&block)
     if block_given?
-      setOnSwipeRight block
+      setOnTouchStationary block
     else
-      getOnSwipeRight
+      getOnTouchStationary
     end
   end
-  def on_swipe_up(&block)
+  def on_drag_entered(&block)
     if block_given?
-      setOnSwipeUp block
+      setOnDragEntered block
     else
-      getOnSwipeUp
+      getOnDragEntered
     end
   end
-  def on_touch_moved(&block)
+  def on_drag_exited(&block)
     if block_given?
-      setOnTouchMoved block
+      setOnDragExited block
     else
-      getOnTouchMoved
+      getOnDragExited
     end
   end
-  def on_touch_pressed(&block)
+  def on_drag_over(&block)
     if block_given?
-      setOnTouchPressed block
+      setOnDragOver block
     else
-      getOnTouchPressed
+      getOnDragOver
     end
   end
-  def on_touch_released(&block)
+  def on_drag_dropped(&block)
     if block_given?
-      setOnTouchReleased block
+      setOnDragDropped block
     else
-      getOnTouchReleased
+      getOnDragDropped
     end
   end
-  def on_touch_stationary(&block)
+  def on_drag_done(&block)
     if block_given?
-      setOnTouchStationary block
+      setOnDragDone block
     else
-      getOnTouchStationary
+      getOnDragDone
     end
   end
-  def on_zoom(&block)
+  def on_key_pressed(&block)
     if block_given?
-      setOnZoom block
+      setOnKeyPressed block
     else
-      getOnZoom
+      getOnKeyPressed
     end
   end
-  def on_zoom_finished(&block)
+  def on_key_released(&block)
     if block_given?
-      setOnZoomFinished block
+      setOnKeyReleased block
     else
-      getOnZoomFinished
+      getOnKeyReleased
     end
   end
-  def on_zoom_started(&block)
+  def on_key_typed(&block)
     if block_given?
-      setOnZoomStarted block
+      setOnKeyTyped block
     else
-      getOnZoomStarted
+      getOnKeyTyped
     end
   end
-  #TODO: logical_child(root)
-  def self.new(*args)
-    super *JRubyFX::Utils::CommonConverters.convert_args(args, [[:none], [:none, :color], [:none, :none, :none], [:none, :none, :none, :color]])
+  def on_input_method_text_changed(&block)
+    if block_given?
+      setOnInputMethodTextChanged block
+    else
+      getOnInputMethodTextChanged
+    end
+  end
+end
+class Java::JavafxSceneControl::ToolBar
+  include JRubyFX::DSL
+  def orientation=(rbenum)
+    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
+  end
+end
+class Java::JavafxSceneControl::Tooltip
+  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 text_overrun=(rbenum)
+    java_send "setTextOverrun", [Java::JavafxSceneControl::OverrunStyle], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::OverrunStyle)
+  end
+  def content_display=(rbenum)
+    java_send "setContentDisplay", [Java::JavafxSceneControl::ContentDisplay], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::ContentDisplay)
+  end
+end
+class Java::JavafxSceneEffect::Blend
+  include JRubyFX::DSL
+  def mode=(rbenum)
+    java_send "setMode", [Java::JavafxSceneEffect::BlendMode], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlendMode)
+  end
+end
+class Java::JavafxSceneEffect::DropShadow
+  include JRubyFX::DSL
+  def blur_type=(rbenum)
+    java_send "setBlurType", [Java::JavafxSceneEffect::BlurType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlurType)
+  end
+  def color=(value)
+    setColor(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  end
+end
+class Java::JavafxSceneEffect::InnerShadow
+  include JRubyFX::DSL
+  def blur_type=(rbenum)
+    java_send "setBlurType", [Java::JavafxSceneEffect::BlurType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlurType)
+  end
+  def color=(value)
+    setColor(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  end
+end
+class Java::JavafxSceneEffect::Shadow
+  include JRubyFX::DSL
+  def blur_type=(rbenum)
+    java_send "setBlurType", [Java::JavafxSceneEffect::BlurType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneEffect::BlurType)
+  end
+  def color=(value)
+    setColor(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  end
+end
+class Java::JavafxSceneLayout::ColumnConstraints
+  include JRubyFX::DSL
+  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
+end
+class Java::JavafxSceneLayout::GridPane
+  include JRubyFX::DSL
+  def alignment=(rbenum)
+    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  end
+end
+class Java::JavafxSceneLayout::HBox
+  include JRubyFX::DSL
+  def alignment=(rbenum)
+    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  end
+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
+end
+class Java::JavafxSceneLayout::StackPane
+  include JRubyFX::DSL
+  def alignment=(rbenum)
+    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  end
+end
+class Java::JavafxSceneLayout::TilePane
+  include JRubyFX::DSL
+  def orientation=(rbenum)
+    java_send "setOrientation", [Java::JavafxGeometry::Orientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Orientation)
+  end
+  def tile_alignment=(rbenum)
+    java_send "setTileAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  end
+  def alignment=(rbenum)
+    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  end
+end
+class Java::JavafxSceneLayout::VBox
+  include JRubyFX::DSL
+  def alignment=(rbenum)
+    java_send "setAlignment", [Java::JavafxGeometry::Pos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::Pos)
+  end
+end
+class Java::JavafxSceneShape::Arc
+  include JRubyFX::DSL
+  def type=(rbenum)
+    java_send "setType", [Java::JavafxSceneShape::ArcType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::ArcType)
+  end
+end
+class Java::JavafxSceneShape::Path
+  include JRubyFX::DSL
+  def fill_rule=(rbenum)
+    java_send "setFillRule", [Java::JavafxSceneShape::FillRule], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::FillRule)
+  end
+  def add(value)
+    elements() << value
+  end
+  def rotate(*args)
+    transforms << build(Java::JavafxSceneTransform::Rotate, *args)
+  end
+end
+class Java::JavafxSceneShape::Shape
+  include JRubyFX::DSL
+  def stroke_type=(rbenum)
+    java_send "setStrokeType", [Java::JavafxSceneShape::StrokeType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::StrokeType)
+  end
+  def stroke_line_join=(rbenum)
+    java_send "setStrokeLineJoin", [Java::JavafxSceneShape::StrokeLineJoin], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::StrokeLineJoin)
+  end
+  def stroke_line_cap=(rbenum)
+    java_send "setStrokeLineCap", [Java::JavafxSceneShape::StrokeLineCap], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::StrokeLineCap)
+  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]
+    else
+      get_fill
+    end
+  end
+end
+class Java::JavafxSceneShape::SVGPath
+  include JRubyFX::DSL
+  def fill_rule=(rbenum)
+    java_send "setFillRule", [Java::JavafxSceneShape::FillRule], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneShape::FillRule)
+  end
+end
+class Java::JavafxSceneText::Text
+  include JRubyFX::DSL
+  def font_smoothing_type=(rbenum)
+    java_send "setFontSmoothingType", [Java::JavafxSceneText::FontSmoothingType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::FontSmoothingType)
+  end
+  def text_alignment=(rbenum)
+    java_send "setTextAlignment", [Java::JavafxSceneText::TextAlignment], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::TextAlignment)
+  end
+  def text_origin=(rbenum)
+    java_send "setTextOrigin", [Java::JavafxGeometry::VPos], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::VPos)
+  end
+  def bounds_type=(rbenum)
+    java_send "setBoundsType", [Java::JavafxSceneText::TextBoundsType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::TextBoundsType)
+  end
+end
+class Java::JavafxSceneWeb::WebView
+  include JRubyFX::DSL
+  def font_smoothing_type=(rbenum)
+    java_send "setFontSmoothingType", [Java::JavafxSceneText::FontSmoothingType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::FontSmoothingType)
+  end
+end
+class Java::JavafxStage::PopupWindow
+  include JRubyFX::DSL
+  def anchor_location=(rbenum)
+    java_send "setAnchorLocation", [Java::JavafxStage::PopupWindow::AnchorLocation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxStage::PopupWindow::AnchorLocation)
+  end
+  def on_auto_hide(&block)
+    if block_given?
+      setOnAutoHide block
+    else
+      getOnAutoHide
+    end
+  end
+end
+class Java::JavafxStage::Stage
+  include JRubyFX::DSL
+  def init_style=(rbenum)
+    java_send "initStyle", [Java::JavafxStage::StageStyle], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxStage::StageStyle)
+  end
+  def init_modality=(rbenum)
+    java_send "initModality", [Java::JavafxStage::Modality], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxStage::Modality)
+  end
+end
+class Java::JavafxAnimation::FillTransition
+  include JRubyFX::DSL
+  def from_value=(value)
+    setFromValue(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  end
+  def to_value=(value)
+    setToValue(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  end
+end
+class Java::JavafxAnimation::StrokeTransition
+  include JRubyFX::DSL
+  def from_value=(value)
+    setFromValue(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  end
+  def to_value=(value)
+    setToValue(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
   end
 end
 class Java::JavafxSceneEffect::ColorInput
@@ -1266,19 +1361,71 @@ class Java::JavafxScenePaint::Color
   def interpolate=(value)
     interpolate(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
   end
-end
-class Java::JavafxAnimation::Animation
-  include JRubyFX::DSL
-  def on_finished(&block)
+end
+class Java::JavafxAnimation::Animation
+  include JRubyFX::DSL
+  def on_finished(&block)
+    if block_given?
+      setOnFinished block
+    else
+      getOnFinished
+    end
+  end
+end
+class Java::JavafxConcurrent::Task
+  include JRubyFX::DSL
+  def on_running(&block)
+    if block_given?
+      setOnRunning block
+    else
+      getOnRunning
+    end
+  end
+  def on_succeeded(&block)
+    if block_given?
+      setOnSucceeded block
+    else
+      getOnSucceeded
+    end
+  end
+  def on_cancelled(&block)
+    if block_given?
+      setOnCancelled block
+    else
+      getOnCancelled
+    end
+  end
+  def on_failed(&block)
+    if block_given?
+      setOnFailed block
+    else
+      getOnFailed
+    end
+  end
+  def on_scheduled(&block)
+    if block_given?
+      setOnScheduled block
+    else
+      getOnScheduled
+    end
+  end
+end
+class Java::JavafxConcurrent::Service
+  include JRubyFX::DSL
+  def on_running(&block)
+    if block_given?
+      setOnRunning block
+    else
+      getOnRunning
+    end
+  end
+  def on_succeeded(&block)
     if block_given?
-      setOnFinished block
+      setOnSucceeded block
     else
-      getOnFinished
+      getOnSucceeded
     end
   end
-end
-class Java::JavafxConcurrent::Task
-  include JRubyFX::DSL
   def on_cancelled(&block)
     if block_given?
       setOnCancelled block
@@ -1293,13 +1440,6 @@ class Java::JavafxConcurrent::Task
       getOnFailed
     end
   end
-  def on_running(&block)
-    if block_given?
-      setOnRunning block
-    else
-      getOnRunning
-    end
-  end
   def on_scheduled(&block)
     if block_given?
       setOnScheduled block
@@ -1307,16 +1447,6 @@ class Java::JavafxConcurrent::Task
       getOnScheduled
     end
   end
-  def on_succeeded(&block)
-    if block_given?
-      setOnSucceeded block
-    else
-      getOnSucceeded
-    end
-  end
-end
-class Java::JavafxConcurrent::Service
-  include JRubyFX::DSL
   def on_ready(&block)
     if block_given?
       setOnReady block
@@ -1324,39 +1454,42 @@ class Java::JavafxConcurrent::Service
       getOnReady
     end
   end
-  def on_cancelled(&block)
+end
+class Java::JavafxSceneControl::ChoiceBox
+  include JRubyFX::DSL
+  def on_action(&block)
     if block_given?
-      setOnCancelled block
+      setOnAction block
     else
-      getOnCancelled
+      getOnAction
     end
   end
-  def on_failed(&block)
+  def on_showing(&block)
     if block_given?
-      setOnFailed block
+      setOnShowing block
     else
-      getOnFailed
+      getOnShowing
     end
   end
-  def on_running(&block)
+  def on_shown(&block)
     if block_given?
-      setOnRunning block
+      setOnShown block
     else
-      getOnRunning
+      getOnShown
     end
   end
-  def on_scheduled(&block)
+  def on_hiding(&block)
     if block_given?
-      setOnScheduled block
+      setOnHiding block
     else
-      getOnScheduled
+      getOnHiding
     end
   end
-  def on_succeeded(&block)
+  def on_hidden(&block)
     if block_given?
-      setOnSucceeded block
+      setOnHidden block
     else
-      getOnSucceeded
+      getOnHidden
     end
   end
 end
@@ -1380,32 +1513,32 @@ class Java::JavafxSceneControl::ContextMenu
 end
 class Java::JavafxSceneControl::Menu
   include JRubyFX::DSL
-  def on_hidden(&block)
+  def on_showing(&block)
     if block_given?
-      setOnHidden block
+      setOnShowing block
     else
-      getOnHidden
+      getOnShowing
     end
   end
-  def on_hiding(&block)
+  def on_shown(&block)
     if block_given?
-      setOnHiding block
+      setOnShown block
     else
-      getOnHiding
+      getOnShown
     end
   end
-  def on_showing(&block)
+  def on_hiding(&block)
     if block_given?
-      setOnShowing block
+      setOnHiding block
     else
-      getOnShowing
+      getOnHiding
     end
   end
-  def on_shown(&block)
+  def on_hidden(&block)
     if block_given?
-      setOnShown block
+      setOnHidden block
     else
-      getOnShown
+      getOnHidden
     end
   end
   def method_missing(name, *args, &block)
@@ -1434,93 +1567,87 @@ class Java::JavafxSceneControl::MenuItem
     end
   end
  end
-class Java::JavafxSceneControl::PopupControl
+class Java::JavafxSceneControl::RadioMenuItem
   include JRubyFX::DSL
-  def on_auto_hide(&block)
-    if block_given?
-      setOnAutoHide block
-    else
-      getOnAutoHide
-    end
-  end
-  def on_close_request(&block)
+  def on_menu_validation(&block)
     if block_given?
-      setOnCloseRequest block
+      setOnMenuValidation block
     else
-      getOnCloseRequest
+      getOnMenuValidation
     end
   end
-  def on_hidden(&block)
+  def on_action(&block)
     if block_given?
-      setOnHidden block
+      setOnAction block
     else
-      getOnHidden
+      getOnAction
     end
   end
-  def on_hiding(&block)
+end
+class Java::JavafxSceneControl::Tab
+  include JRubyFX::DSL
+  def on_selection_changed(&block)
     if block_given?
-      setOnHiding block
+      setOnSelectionChanged block
     else
-      getOnHiding
+      getOnSelectionChanged
     end
   end
-  def on_showing(&block)
+  def on_closed(&block)
     if block_given?
-      setOnShowing block
+      setOnClosed block
     else
-      getOnShowing
+      getOnClosed
     end
   end
-  def on_shown(&block)
+  def on_close_request(&block)
     if block_given?
-      setOnShown block
+      setOnCloseRequest block
     else
-      getOnShown
+      getOnCloseRequest
     end
   end
+  #TODO: logical_child(content)
 end
-class Java::JavafxSceneControl::RadioMenuItem
+class Java::JavafxSceneControl::TableView
   include JRubyFX::DSL
-  def on_menu_validation(&block)
+  def on_scroll_to(&block)
     if block_given?
-      setOnMenuValidation block
+      setOnScrollTo block
     else
-      getOnMenuValidation
+      getOnScrollTo
     end
   end
-  def on_action(&block)
+  def on_sort(&block)
     if block_given?
-      setOnAction block
+      setOnSort block
     else
-      getOnAction
+      getOnSort
     end
   end
-end
-class Java::JavafxSceneControl::Tab
-  include JRubyFX::DSL
-  def on_closed(&block)
+  def on_scroll_to_column(&block)
     if block_given?
-      setOnClosed block
+      setOnScrollToColumn block
     else
-      getOnClosed
+      getOnScrollToColumn
     end
   end
-  def on_selection_changed(&block)
-    if block_given?
-      setOnSelectionChanged block
-    else
-      getOnSelectionChanged
+  def method_missing(name, *args, &block)
+    super(name, *args, &block).tap do |obj|
+      add(obj) if obj.kind_of?(Java::JavafxSceneControl::TableColumn) && !name.to_s.end_with?('!')
     end
   end
-  #TODO: logical_child(content)
+  def add(value)
+    get_columns() << value
+  end
 end
 class Java::JavafxSceneControl::TreeView
   include JRubyFX::DSL
-  def on_edit_cancel(&block)
+  def on_edit_start(&block)
     if block_given?
-      setOnEditCancel block
+      setOnEditStart block
     else
-      getOnEditCancel
+      getOnEditStart
     end
   end
   def on_edit_commit(&block)
@@ -1530,11 +1657,18 @@ class Java::JavafxSceneControl::TreeView
       getOnEditCommit
     end
   end
-  def on_edit_start(&block)
+  def on_edit_cancel(&block)
     if block_given?
-      setOnEditStart block
+      setOnEditCancel block
     else
-      getOnEditStart
+      getOnEditCancel
+    end
+  end
+  def on_scroll_to(&block)
+    if block_given?
+      setOnScrollTo block
+    else
+      getOnScrollTo
     end
   end
 end
@@ -1564,25 +1698,25 @@ class Java::JavafxSceneMedia::MediaPlayer
       getOnError
     end
   end
-  def on_end_of_media(&block)
+  def on_marker(&block)
     if block_given?
-      setOnEndOfMedia block
+      setOnMarker block
     else
-      getOnEndOfMedia
+      getOnMarker
     end
   end
-  def on_halted(&block)
+  def on_end_of_media(&block)
     if block_given?
-      setOnHalted block
+      setOnEndOfMedia block
     else
-      getOnHalted
+      getOnEndOfMedia
     end
   end
-  def on_marker(&block)
+  def on_playing(&block)
     if block_given?
-      setOnMarker block
+      setOnPlaying block
     else
-      getOnMarker
+      getOnPlaying
     end
   end
   def on_paused(&block)
@@ -1592,11 +1726,18 @@ class Java::JavafxSceneMedia::MediaPlayer
       getOnPaused
     end
   end
-  def on_playing(&block)
+  def on_stopped(&block)
     if block_given?
-      setOnPlaying block
+      setOnStopped block
     else
-      getOnPlaying
+      getOnStopped
+    end
+  end
+  def on_halted(&block)
+    if block_given?
+      setOnHalted block
+    else
+      getOnHalted
     end
   end
   def on_repeat(&block)
@@ -1613,13 +1754,6 @@ class Java::JavafxSceneMedia::MediaPlayer
       getOnStalled
     end
   end
-  def on_stopped(&block)
-    if block_given?
-      setOnStopped block
-    else
-      getOnStopped
-    end
-  end
 end
 class Java::JavafxSceneMedia::MediaView
   include JRubyFX::DSL
@@ -1631,16 +1765,6 @@ class Java::JavafxSceneMedia::MediaView
     end
   end
 end
-class Java::JavafxStage::PopupWindow
-  include JRubyFX::DSL
-  def on_auto_hide(&block)
-    if block_given?
-      setOnAutoHide block
-    else
-      getOnAutoHide
-    end
-  end
-end
 class Java::JavafxStage::Window
   include JRubyFX::DSL
   def on_close_request(&block)
@@ -1650,32 +1774,32 @@ class Java::JavafxStage::Window
       getOnCloseRequest
     end
   end
-  def on_hidden(&block)
+  def on_showing(&block)
     if block_given?
-      setOnHidden block
+      setOnShowing block
     else
-      getOnHidden
+      getOnShowing
     end
   end
-  def on_hiding(&block)
+  def on_shown(&block)
     if block_given?
-      setOnHiding block
+      setOnShown block
     else
-      getOnHiding
+      getOnShown
     end
   end
-  def on_showing(&block)
+  def on_hiding(&block)
     if block_given?
-      setOnShowing block
+      setOnHiding block
     else
-      getOnShowing
+      getOnHiding
     end
   end
-  def on_shown(&block)
+  def on_hidden(&block)
     if block_given?
-      setOnShown block
+      setOnHidden block
     else
-      getOnShown
+      getOnHidden
     end
   end
 end
@@ -1701,17 +1825,6 @@ class Java::JavafxSceneControl::TreeItem
     get_children() << value
   end
 end
-class Java::JavafxSceneControl::TableView
-  include JRubyFX::DSL
-  def method_missing(name, *args, &block)
-    super(name, *args, &block).tap do |obj|
-      add(obj) if obj.kind_of?(Java::JavafxSceneControl::TableColumn) && !name.to_s.end_with?('!')
-    end
-  end
-  def add(value)
-    get_columns() << value
-  end
-end
 class Java::JavafxAnimation::ParallelTransition
   include JRubyFX::DSL
   def method_missing(name, *args, &block)