jrubyfx-master 1.1.1.brakemanpro4-java → 1.1.1.brakemanpro5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c907949344192111b20cbe818d3ae58dd2dd31e3
-  data.tar.gz: c1f5a5bcc9be456db41290a8252452d51c1ce9d1
+  metadata.gz: 0deb425d85b71adb1d439170449f4d1dddc15a56
+  data.tar.gz: 4257df580966faed9e69a1c358824a05b681950c
 SHA512:
-  metadata.gz: 14e4bbe373c3ed67c4bad9ee7c3cd123c0e5dd83a39a1972b8af08f3f336d0e869196320363cee5ed4845db8eaf6843ac654f81a031c74a4fafb07c775d84746
-  data.tar.gz: 40b729ff57ae9e9966caa8361906ca47a02f21c173e62e913b1be9a98471d48541f839c1c2604bb3d6bd9fb110f42e2a157e8413e8804bed8d7edde66262606f
+  metadata.gz: 594e9dc0eca84784201629b21e12adfaaf2474b7b26cf1b3f15868b0b1566cda65193238c8b8b79b0aef46193730c65d0c9de2313c3d7611af9944fee9a0f4db
+  data.tar.gz: 2a9c8c7fa37ea9d106509344e82b0f234b7a4be12d3f24f23ed52fa4527811666e1e10172e2ad75bf5fd63f6f59169584d07ead1141464c5ddb814dffd9e1316

data/lib/jrubyfx/application.rb

@@ -27,7 +27,8 @@ 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/")}
+    puts "in jar? #{ENV["IN_JAR"]}"
+    ENV["IN_JAR"]
   end
 
   ##

data/lib/jrubyfx/core_ext/precompiled.rb

@@ -6,6 +6,9 @@ class Java::JavafxAnimation::PathTransition
 end
 class Java::JavafxScene::Node
   include JRubyFX::DSL
+  def node_orientation=(rbenum)
+    java_send "setNodeOrientation", [Java::JavafxGeometry::NodeOrientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::NodeOrientation)
+  end
   def depth_test=(rbenum)
     java_send "setDepthTest", [Java::JavafxScene::DepthTest], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::DepthTest)
   end
@@ -21,9 +24,6 @@ class Java::JavafxScene::Node
   def notify_accessible_attribute_changed=(rbenum)
     java_send "notifyAccessibleAttributeChanged", [Java::JavafxScene::AccessibleAttribute], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::AccessibleAttribute)
   end
-  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?
       setOnContextMenuRequested block
@@ -783,12 +783,12 @@ class Java::JavafxSceneControl::TableColumn
 end
 class Java::JavafxSceneControl::TabPane
   include JRubyFX::DSL
-  def tab_closing_policy=(rbenum)
-    java_send "setTabClosingPolicy", [Java::JavafxSceneControl::TabPane::TabClosingPolicy], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneControl::TabPane::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
@@ -818,6 +818,9 @@ 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 node_orientation=(rbenum)
+    java_send "setNodeOrientation", [Java::JavafxGeometry::NodeOrientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::NodeOrientation)
+  end
   def depth_test=(rbenum)
     java_send "setDepthTest", [Java::JavafxScene::DepthTest], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::DepthTest)
   end
@@ -833,9 +836,6 @@ class Java::JavafxSceneControl::ToggleButton
   def notify_accessible_attribute_changed=(rbenum)
     java_send "notifyAccessibleAttributeChanged", [Java::JavafxScene::AccessibleAttribute], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxScene::AccessibleAttribute)
   end
-  def node_orientation=(rbenum)
-    java_send "setNodeOrientation", [Java::JavafxGeometry::NodeOrientation], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxGeometry::NodeOrientation)
-  end
   def text_fill=(value)
     setTextFill(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
   end
@@ -1188,12 +1188,12 @@ class Java::JavafxSceneLayout::FlowPane
   def row_valignment=(rbenum)
     java_send "setRowValignment", [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)
-  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
@@ -1209,12 +1209,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
@@ -1227,12 +1227,12 @@ class Java::JavafxSceneLayout::TilePane
   def tile_alignment=(rbenum)
     java_send "setTileAlignment", [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
   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::VBox
   include JRubyFX::DSL
@@ -1269,12 +1269,12 @@ class Java::JavafxSceneShape::Shape
   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 stroke=(value)
+    setStroke(JRubyFX::Utils::CommonConverters::CONVERTERS[:color].call(value))
+  end
   def fill(*r)
     if r.length > 0
       self.fill = r[0]
@@ -1291,15 +1291,15 @@ 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 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
-  def text_alignment=(rbenum)
-    java_send "setTextAlignment", [Java::JavafxSceneText::TextAlignment], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::TextAlignment)
-  end
   def font_smoothing_type=(rbenum)
     java_send "setFontSmoothingType", [Java::JavafxSceneText::FontSmoothingType], JRubyFX::Utils::CommonConverters.parse_ruby_symbols(rbenum, Java::JavafxSceneText::FontSmoothingType)
   end
@@ -1552,6 +1552,13 @@ class Java::JavafxSceneControl::Menu
 end
 class Java::JavafxSceneControl::MenuItem
   include JRubyFX::DSL
+  def on_action(&block)
+    if block_given?
+      setOnAction block
+    else
+      getOnAction
+    end
+  end
   def on_menu_validation(&block)
     if block_given?
       setOnMenuValidation block
@@ -1559,6 +1566,9 @@ class Java::JavafxSceneControl::MenuItem
       getOnMenuValidation
     end
   end
+ end
+class Java::JavafxSceneControl::RadioMenuItem
+  include JRubyFX::DSL
   def on_action(&block)
     if block_given?
       setOnAction block
@@ -1566,9 +1576,6 @@ class Java::JavafxSceneControl::MenuItem
       getOnAction
     end
   end
- end
-class Java::JavafxSceneControl::RadioMenuItem
-  include JRubyFX::DSL
   def on_menu_validation(&block)
     if block_given?
       setOnMenuValidation block
@@ -1576,16 +1583,16 @@ class Java::JavafxSceneControl::RadioMenuItem
       getOnMenuValidation
     end
   end
-  def on_action(&block)
+end
+class Java::JavafxSceneControl::Tab
+  include JRubyFX::DSL
+  def on_close_request(&block)
     if block_given?
-      setOnAction block
+      setOnCloseRequest block
     else
-      getOnAction
+      getOnCloseRequest
     end
   end
-end
-class Java::JavafxSceneControl::Tab
-  include JRubyFX::DSL
   def on_selection_changed(&block)
     if block_given?
       setOnSelectionChanged block
@@ -1600,17 +1607,17 @@ class Java::JavafxSceneControl::Tab
       getOnClosed
     end
   end
-  def on_close_request(&block)
-    if block_given?
-      setOnCloseRequest block
-    else
-      getOnCloseRequest
-    end
-  end
   #TODO: logical_child(content)
 end
 class Java::JavafxSceneControl::TableView
   include JRubyFX::DSL
+  def on_scroll_to(&block)
+    if block_given?
+      setOnScrollTo block
+    else
+      getOnScrollTo
+    end
+  end
   def on_sort(&block)
     if block_given?
       setOnSort block
@@ -1625,13 +1632,6 @@ class Java::JavafxSceneControl::TableView
       getOnScrollToColumn
     end
   end
-  def on_scroll_to(&block)
-    if block_given?
-      setOnScrollTo block
-    else
-      getOnScrollTo
-    end
-  end
   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?('!')

data/lib/jrubyfx/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrubyfx-master
 version: !ruby/object:Gem::Version
-  version: 1.1.1.brakemanpro4
+  version: 1.1.1.brakemanpro5
 platform: java
 authors:
 - Patrick Plenefisch