jrubyfx 1.2.0-java → 2.0.0-java

data/lib/jrubyfx/module.rb

@@ -17,6 +17,7 @@ limitations under the License.
 
 require_relative 'utils/common_utils'
 
+
 # This module contains useful methods for defining JavaFX code. Include it in your
 # class to use it, and the JRubyFX::FXImports. JRubyFX::Application and JRubyFX::Controller already include it.
 module JRubyFX
@@ -116,15 +117,20 @@ module JRubyFX
       end
       camel = symbol_name.id2name
       camel = camel[0].upcase + camel[1..-1]
+      jcn = type.java_class.name
+      java_signature "void set" + camel + "(#{jcn} f)"
       send(:define_method, "set" + camel) do |val|
         instance_variable_set("@#{symbol_name}", val)
       end
+      java_signature "#{jcn} get" + camel + "()"
       send(:define_method, "get" + camel) do
         instance_variable_get("@#{symbol_name}")
       end
+      java_signature "java.lang.Class " + symbol_name.id2name + "GetType()"
       send(:define_method, symbol_name.id2name + "GetType") do
         return type.java_class
       end
+      java_field "@javafx.fxml.FXML #{type.java_class.name} #{symbol_name}", instance_variable: true
     end
     def fxml_accessor(symbol_name,ptype=Java::javafx.beans.property.SimpleStringProperty, type=nil)
       # TODO: RDoc
@@ -175,4 +181,26 @@ module JRubyFX
       add_method_signature "get" + camel, [type]
     end
   end
+
+  # FXML requires loading both ruby and java classes.
+  # JRuby has no such single classloader builtin, so we proxy them all
+  # This is a minimal classloader only for classes, resources not supported
+  class PolyglotClassLoader < java.lang.ClassLoader
+    def initialize()
+      super(JRuby.runtime.jruby_class_loader)
+      @prefix = File.basename(fxml_root) + "."
+    end
+    java_signature "java.lang.Class findClass(java.lang.String name)"
+    def findClass(a)
+      return nil unless a.start_with? @prefix or a[0].upcase == a[0]
+      a = a[@prefix.length..-1] unless a[0].upcase == a[0]
+      begin # TODO: become_java! idempotent?
+        return a.constantize_by(/[.$]/).tap{|x| x.become_java!}.java_class
+      rescue NameError
+        raise java.lang.ClassNotFoundException.new("Could not find Ruby or Java class '#{a.gsub(/[.$]/, "::")}' or '#{a}'") # Must be a java CNF, not a Ruby Name Error
+      end
+    end
+    become_java!
+  end
+
 end

data/lib/jrubyfx/part_imports.rb

@@ -21,23 +21,17 @@ require_relative 'utils'
 begin
   if ENV['JFX_DIR']
     $LOAD_PATH << ENV['JFX_DIR']
-  else #should we check for 1.7 vs 1.8? oh well, adding extra paths won't hurt anybody (maybe performance loading)
-    jfx_path = ENV_JAVA["sun.boot.library.path"]
-    $LOAD_PATH << if jfx_path.include? ":\\" and !jfx_path.include? "/" # can be tricked, but should work fine
-      #windows
-      jfx_path.gsub(/\\bin[\\]*$/i, "\\lib")
-    else
-      # *nix
-      jfx_path.gsub(/[\/\\][amdix345678_]+$/, "") # strip i386 or amd64 (including variants). TODO: ARM
+  end
+  
+  # add OpenJFX support if follow instruction from https://openjfx.io
+  if ENV['JFX_DIR']
+    require 'jfxrt.jar'
+  elsif ENV['PATH_TO_FX'] # support the OpenJFX installation as in https://openjfx.io/openjfx-docs/#install-javafx as of 15th May 2020
+    Dir.glob(File.join(ENV['PATH_TO_FX'],"*.jar")).each do |jar|
+      require jar
     end
   end
 
-  # Java 8 (after ea-b75) and above has JavaFX as part of the normal distib, only require it if we are 7 or below
-  jre = ENV_JAVA["java.runtime.version"].match %r{^(?<version>(?<major>\d+)\.(?<minor>\d+))\.(?<patch>\d+)(_\d+)?-?(?<release>ea|u\d)?(-?b(?<build>\d+))?}
-  require 'jfxrt.jar' if ENV['JFX_DIR'] or
-    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
@@ -45,8 +39,9 @@ begin
   # Attempt to load a javafx class
   Java.javafx.application.Application
 rescue  LoadError, NameError
-  puts "JavaFX runtime not found.  Please install Java 7u6 or newer or set environment variable JFX_DIR to the folder that contains jfxrt.jar "
-  puts "If you have Java 7u6 or later, this is a bug. Please report to the issue tracker on github. Include your OS version, 32/64bit, and architecture (x86, ARM, PPC, etc)"
+  # Advice user too about the OpenJFX support
+  puts "JavaFX runtime not found.  Please install Java 8 or newer, set environment variable JFX_DIR to the folder that contains jfxrt.jar or set the environment variable PATH_TO_FX that points to the OpenJFX libraries"
+  puts "If you have Java 8 or later, this is a bug. Please report to the issue tracker on github. Include your OS version, 32/64bit, and architecture (x86, ARM, PPC, etc)"
   exit -1
 end
 
@@ -67,49 +62,65 @@ module JRubyFX
     # classes by using either `Hash.flat_tree_inject` from jrubyfx/utils.rb or
     # writing your own traversal function
     #
-    JFX_CLASS_HIERARCHY = { :javafx => {
-        :animation => %w[Animation AnimationTimer FadeTransition FillTransition Interpolator KeyFrame KeyValue ParallelTransition PathTransition
-        PauseTransition RotateTransition ScaleTransition SequentialTransition StrokeTransition Timeline Transition TranslateTransition],
-        :application => ['Platform'],
+    JFX_CLASS_HIERARCHY = {
+      :javafx => {
+        :animation => %w[Animation AnimationTimer FadeTransition FillTransition Interpolatable Interpolator KeyFrame KeyValue ParallelTransition PathTransition PauseTransition RotateTransition ScaleTransition SequentialTransition StrokeTransition Timeline Transition TranslateTransition],
+        :application => %w[Application ConditionalFeature HostServices Platform Preloader],
         :beans => {
-          :property => %w[SimpleBooleanProperty SimpleDoubleProperty SimpleFloatProperty SimpleIntegerProperty SimpleListProperty SimpleLongProperty SimpleMapProperty SimpleObjectProperty SimpleSetProperty SimpleStringProperty],
-          #TODO: import more
-          :value => ['ChangeListener']
+          :binding => %w[Binding Bindings BooleanBinding BooleanExpression DoubleBinding DoubleExpression FloatBinding FloatExpression IntegerBinding IntegerExpression ListBinding ListExpression LongBinding LongExpression MapBinding MapExpression NumberBinding NumberExpression NumberExpressionBase ObjectBinding ObjectExpression SetBinding SetExpression StringBinding StringExpression When],
+          '' => %w[DefaultProperty InvalidationListener NamedArg Observable WeakInvalidationListener WeakListener],
+          :property => {
+            :adapter => %w[JavaBeanBooleanProperty JavaBeanBooleanPropertyBuilder JavaBeanDoubleProperty JavaBeanDoublePropertyBuilder JavaBeanFloatProperty JavaBeanFloatPropertyBuilder JavaBeanIntegerProperty JavaBeanIntegerPropertyBuilder JavaBeanLongProperty JavaBeanLongPropertyBuilder JavaBeanObjectProperty JavaBeanObjectPropertyBuilder JavaBeanProperty JavaBeanStringProperty JavaBeanStringPropertyBuilder ReadOnlyJavaBeanBooleanProperty ReadOnlyJavaBeanBooleanPropertyBuilder ReadOnlyJavaBeanDoubleProperty ReadOnlyJavaBeanDoublePropertyBuilder ReadOnlyJavaBeanFloatProperty ReadOnlyJavaBeanFloatPropertyBuilder ReadOnlyJavaBeanIntegerProperty ReadOnlyJavaBeanIntegerPropertyBuilder ReadOnlyJavaBeanLongProperty ReadOnlyJavaBeanLongPropertyBuilder ReadOnlyJavaBeanObjectProperty ReadOnlyJavaBeanObjectPropertyBuilder ReadOnlyJavaBeanProperty ReadOnlyJavaBeanStringProperty ReadOnlyJavaBeanStringPropertyBuilder],
+            '' => %w[BooleanProperty BooleanPropertyBase DoubleProperty DoublePropertyBase FloatProperty FloatPropertyBase IntegerProperty IntegerPropertyBase ListProperty ListPropertyBase LongProperty LongPropertyBase MapProperty MapPropertyBase ObjectProperty ObjectPropertyBase Property ReadOnlyBooleanProperty ReadOnlyBooleanPropertyBase ReadOnlyBooleanWrapper ReadOnlyDoubleProperty ReadOnlyDoublePropertyBase ReadOnlyDoubleWrapper ReadOnlyFloatProperty ReadOnlyFloatPropertyBase ReadOnlyFloatWrapper ReadOnlyIntegerProperty ReadOnlyIntegerPropertyBase ReadOnlyIntegerWrapper ReadOnlyListProperty ReadOnlyListPropertyBase ReadOnlyListWrapper ReadOnlyLongProperty ReadOnlyLongPropertyBase ReadOnlyLongWrapper ReadOnlyMapProperty ReadOnlyMapPropertyBase ReadOnlyMapWrapper ReadOnlyObjectProperty ReadOnlyObjectPropertyBase ReadOnlyObjectWrapper ReadOnlyProperty ReadOnlySetProperty ReadOnlySetPropertyBase ReadOnlySetWrapper ReadOnlyStringProperty ReadOnlyStringPropertyBase ReadOnlyStringWrapper SetProperty SetPropertyBase SimpleBooleanProperty SimpleDoubleProperty SimpleFloatProperty SimpleIntegerProperty SimpleListProperty SimpleLongProperty SimpleMapProperty SimpleObjectProperty SimpleSetProperty SimpleStringProperty StringProperty StringPropertyBase],
+          },
+          :value => %w[ChangeListener ObservableBooleanValue ObservableDoubleValue ObservableFloatValue ObservableIntegerValue ObservableListValue ObservableLongValue ObservableMapValue ObservableNumberValue ObservableObjectValue ObservableSetValue ObservableStringValue ObservableValue ObservableValueBase WeakChangeListener WritableBooleanValue WritableDoubleValue WritableFloatValue WritableIntegerValue WritableListValue WritableLongValue WritableMapValue WritableNumberValue WritableObjectValue WritableSetValue WritableStringValue WritableValue],
+        },
+        :collections => {
+          '' => %w[ArrayChangeListener FXCollections ListChangeListener MapChangeListener ModifiableObservableListBase ObservableArray ObservableArrayBase ObservableFloatArray ObservableIntegerArray ObservableList ObservableListBase ObservableMap ObservableSet SetChangeListener WeakListChangeListener WeakMapChangeListener WeakSetChangeListener],
+          :transformation => %w[FilteredList SortedList TransformationList],
         },
-        :collections => ['FXCollections'],
-        :concurrent => %w[Worker Task Service],
-        :event => %w[Event ActionEvent EventHandler],
-        :fxml => ['Initializable', 'LoadException'],
-        :geometry => %w[HorizontalDirection HPos Insets Orientation Pos Rectangle2D Side VerticalDirection VPos],
+        :concurrent => %w[ScheduledService Service Task Worker WorkerStateEvent],
+        :css => {
+          '' => %w[CompoundSelector CssMetaData CssParser Declaration FontCssMetaData FontFace Match ParsedValue PseudoClass Rule Selector SimpleSelector SimpleStyleableBooleanProperty SimpleStyleableDoubleProperty SimpleStyleableFloatProperty SimpleStyleableIntegerProperty SimpleStyleableLongProperty SimpleStyleableObjectProperty SimpleStyleableStringProperty Size SizeUnits Style Styleable StyleableBooleanProperty StyleableDoubleProperty StyleableFloatProperty StyleableIntegerProperty StyleableLongProperty StyleableObjectProperty StyleableProperty StyleablePropertyFactory StyleableStringProperty StyleClass StyleConverter StyleOrigin Stylesheet],
+          :converter => %w[BooleanConverter ColorConverter CursorConverter DeriveColorConverter DeriveSizeConverter DurationConverter EffectConverter EnumConverter FontConverter InsetsConverter LadderConverter PaintConverter ShapeConverter SizeConverter StopConverter URLConverter],
+        },
+        :embed => {
+          :swing => %w[JFXPanel SwingFXUtils SwingNode],
+        },
+        :event => %w[ActionEvent Event EventDispatchChain EventDispatcher EventHandler EventTarget EventType WeakEventHandler],
+        :fxml => %w[FXML FXMLLoader Initializable JavaFXBuilderFactory LoadException LoadListener],
+        :geometry => %w[BoundingBox Bounds Dimension2D HorizontalDirection HPos Insets NodeOrientation Orientation Point2D Point3D Pos Rectangle2D Side VerticalDirection VPos],
+        :print => %w[Collation JobSettings PageLayout PageOrientation PageRange Paper PaperSource PrintColor Printer PrinterAttributes PrinterJob PrintQuality PrintResolution PrintSides],
         :scene => {
-          '' => %w[Group Node Parent Scene],
-          :canvas => ['Canvas'],
-          :chart => %w[AreaChart Axis BarChart BubbleChart CategoryAxis Chart LineChart NumberAxis
-          PieChart ScatterChart StackedAreaChart StackedBarChart ValueAxis XYChart],
-          :control => %w[Accordion Button Cell CheckBox CheckBoxTreeItem CheckMenuItem ChoiceBox ColorPicker ComboBox ContextMenu Hyperlink
-          Label ListCell ListView Menu MenuBar MenuButton MenuItem Pagination PasswordField PopupControl ProgressBar ProgressIndicator RadioButton
-          RadioMenuItem ScrollBar ScrollPane Separator SeparatorMenuItem Slider SplitMenuButton SplitPane Tab TableView TableCell TableColumn TabPane TextArea
-          TextField TitledPane ToggleButton ToggleGroup ToolBar Tooltip TreeCell TreeItem TreeView ContentDisplay OverrunStyle SelectionMode],
-          :effect => %w[Blend BlendMode Bloom BlurType BoxBlur ColorAdjust ColorInput DisplacementMap DropShadow GaussianBlur Glow ImageInput
-          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 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],
-          :paint => %w[Color CycleMethod ImagePattern LinearGradient Paint RadialGradient Stop],
-          :shape => %w[Arc ArcTo ArcType Circle ClosePath CubicCurve CubicCurveTo Ellipse FillRule HLineTo Line LineTo MoveTo Path PathElement
-          Polygon Polyline QuadCurve QuadCurveTo Rectangle Shape StrokeLineCap StrokeLineJoin StrokeType SVGPath VLineTo],
-          :text => %w[Font FontPosture FontSmoothingType FontWeight Text TextAlignment TextBoundsType],
-          :transform => %w[Affine Rotate Scale Shear Translate],
-          :web => ['WebView', 'HTMLEditor']
+          '' => %w[AccessibleAction AccessibleAttribute AccessibleRole AmbientLight CacheHint Camera Cursor DepthTest Group ImageCursor LightBase Node ParallelCamera Parent PerspectiveCamera PointLight Scene SceneAntialiasing SnapshotParameters SnapshotResult SubScene],
+          :canvas => %w[Canvas GraphicsContext],
+          :chart => %w[AreaChart Axis BarChart BubbleChart CategoryAxis Chart LineChart NumberAxis PieChart ScatterChart StackedAreaChart StackedBarChart ValueAxis XYChart],
+          :control => {
+            '' => %w[Accordion Alert Button ButtonBar ButtonBase ButtonType Cell CheckBox CheckBoxTreeItem CheckMenuItem ChoiceBox ChoiceDialog ColorPicker ComboBox ComboBoxBase ContentDisplay ContextMenu Control CustomMenuItem DateCell DatePicker Dialog DialogEvent DialogPane FocusModel Hyperlink IndexedCell IndexRange Label Labeled ListCell ListView Menu MenuBar MenuButton MenuItem MultipleSelectionModel OverrunStyle Pagination PasswordField PopupControl ProgressBar ProgressIndicator RadioButton RadioMenuItem ResizeFeaturesBase ScrollBar ScrollPane ScrollToEvent SelectionMode SelectionModel Separator SeparatorMenuItem SingleSelectionModel Skin SkinBase Skinnable Slider SortEvent Spinner SpinnerValueFactory SplitMenuButton SplitPane Tab TableCell TableColumn TableColumnBase TableFocusModel TablePosition TablePositionBase TableRow TableSelectionModel TableView TabPane TextArea TextField TextFormatter TextInputControl TextInputDialog TitledPane Toggle ToggleButton ToggleGroup ToolBar Tooltip TreeCell TreeItem TreeSortMode TreeTableCell TreeTableColumn TreeTablePosition TreeTableRow TreeTableView TreeView],
+            :cell => %w[CheckBoxListCell CheckBoxTableCell CheckBoxTreeCell CheckBoxTreeTableCell ChoiceBoxListCell ChoiceBoxTableCell ChoiceBoxTreeCell ChoiceBoxTreeTableCell ComboBoxListCell ComboBoxTableCell ComboBoxTreeCell ComboBoxTreeTableCell MapValueFactory ProgressBarTableCell ProgressBarTreeTableCell PropertyValueFactory TextFieldListCell TextFieldTableCell TextFieldTreeCell TextFieldTreeTableCell TreeItemPropertyValueFactory],
+            :skin => %w[AccordionSkin ButtonBarSkin ButtonSkin CellSkinBase CheckBoxSkin ChoiceBoxSkin ColorPickerSkin ComboBoxBaseSkin ComboBoxListViewSkin ComboBoxPopupControl ContextMenuSkin DateCellSkin DatePickerSkin HyperlinkSkin LabeledSkinBase LabelSkin ListCellSkin ListViewSkin MenuBarSkin MenuButtonSkin MenuButtonSkinBase NestedTableColumnHeader PaginationSkin ProgressBarSkin ProgressIndicatorSkin RadioButtonSkin ScrollBarSkin ScrollPaneSkin SeparatorSkin SliderSkin SpinnerSkin SplitMenuButtonSkin SplitPaneSkin TableCellSkin TableCellSkinBase TableColumnHeader TableHeaderRow TableRowSkin TableRowSkinBase TableViewSkin TableViewSkinBase TabPaneSkin TextAreaSkin TextFieldSkin TextInputControlSkin TitledPaneSkin ToggleButtonSkin ToolBarSkin TooltipSkin TreeCellSkin TreeTableCellSkin TreeTableRowSkin TreeTableViewSkin TreeViewSkin VirtualContainerBase VirtualFlow],
+          },
+          :effect => %w[Blend BlendMode Bloom BlurType BoxBlur ColorAdjust ColorInput DisplacementMap DropShadow Effect FloatMap GaussianBlur Glow ImageInput InnerShadow Light Lighting MotionBlur PerspectiveTransform Reflection SepiaTone Shadow],
+          :image => %w[Image ImageView PixelFormat PixelReader PixelWriter WritableImage WritablePixelFormat],
+          :input => %w[Clipboard ClipboardContent ContextMenuEvent DataFormat Dragboard DragEvent GestureEvent InputEvent InputMethodEvent InputMethodHighlight InputMethodRequests InputMethodTextRun KeyCharacterCombination KeyCode KeyCodeCombination KeyCombination KeyEvent Mnemonic MouseButton MouseDragEvent MouseEvent PickResult RotateEvent ScrollEvent SwipeEvent TouchEvent TouchPoint TransferMode ZoomEvent],
+          :layout => %w[AnchorPane Background BackgroundFill BackgroundImage BackgroundPosition BackgroundRepeat BackgroundSize Border BorderImage BorderPane BorderRepeat BorderStroke BorderStrokeStyle BorderWidths ColumnConstraints ConstraintsBase CornerRadii FlowPane GridPane HBox Pane Priority Region RowConstraints StackPane TilePane VBox],
+          :media => %w[AudioClip AudioEqualizer AudioSpectrumListener AudioTrack EqualizerBand Media MediaErrorEvent MediaException MediaMarkerEvent MediaPlayer MediaView SubtitleTrack Track VideoTrack],
+          :paint => %w[Color CycleMethod ImagePattern LinearGradient Material Paint PhongMaterial RadialGradient Stop],
+          :robot => %w[Robot],
+          :shape => %w[Arc ArcTo ArcType Box Circle ClosePath CubicCurve CubicCurveTo CullFace Cylinder DrawMode Ellipse FillRule HLineTo Line LineTo Mesh MeshView MoveTo ObservableFaceArray Path PathElement Polygon Polyline QuadCurve QuadCurveTo Rectangle Shape Shape3D Sphere StrokeLineCap StrokeLineJoin StrokeType SVGPath TriangleMesh VertexFormat VLineTo],
+          :text => %w[Font FontPosture FontSmoothingType FontWeight HitInfo Text TextAlignment TextBoundsType TextFlow],
+          :transform => %w[Affine MatrixType NonInvertibleTransformException Rotate Scale Shear Transform TransformChangedEvent Translate],
+          :web => %w[HTMLEditor HTMLEditorSkin PopupFeatures PromptData WebEngine WebErrorEvent WebEvent WebHistory WebView],
         },
         :stage => %w[DirectoryChooser FileChooser Modality Popup PopupWindow Screen Stage StageStyle Window WindowEvent],
-        :util => ['Duration']
-      }
+        :util => {
+          '' => %w[Builder BuilderFactory Callback Duration FXPermission Pair StringConverter],
+          :converter => %w[BigDecimalStringConverter BigIntegerStringConverter BooleanStringConverter ByteStringConverter CharacterStringConverter CurrencyStringConverter DateStringConverter DateTimeStringConverter DefaultStringConverter DoubleStringConverter FloatStringConverter FormatStringConverter IntegerStringConverter LocalDateStringConverter LocalDateTimeStringConverter LocalTimeStringConverter LongStringConverter NumberStringConverter PercentageStringConverter ShortStringConverter TimeStringConverter],
+        },
+      },
     }
 
+
     $WRITE_OUT << <<HERE
     def const_missing(c)
       if LOCAL_NAME_MAP.has_key? c

data/lib/jrubyfx/utils.rb

@@ -79,7 +79,12 @@ module JRubyFX
     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 }
+      platform = unless javafx.application.Platform.respond_to? :startup
+        com.sun.javafx.application.PlatformImpl
+      else
+        javafx.application.Platform
+      end
+      platform.startup { latch.countDown }
       latch.await
     end
   end

data/lib/jrubyfx/version.rb

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

data/lib/jrubyfx.rb

@@ -15,12 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 =end
 
-if RUBY_VERSION.include? "1.8" or !JRUBY_VERSION
-  puts "JRubyFX requires JRuby to be in 1.9 mode"
+if !JRUBY_VERSION
+  puts "JRubyFX requires JRuby"
   exit -2
 end
-if Gem::Version.new(JRUBY_VERSION) < Gem::Version.new("1.7.4")
-  puts "Warning: JRuby 1.7.3 and prior have bugs that can cause strange errors. Do not submit any bug reports. Please use JRuby 1.7.4 or later."
+if Gem::Version.new(JRUBY_VERSION) < Gem::Version.new("9.3.4.0")
+  puts "JRubyFX 2.0 requires JRuby 9.3.4.0 or later. Use JRubyFX 1.x for earlier versions."
+  exit -2
 end
 
 require 'java' # for java_import
@@ -36,6 +37,6 @@ 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/fxml_helper'
 require_relative 'jrubyfx/application'
 require_relative 'jrubyfx/controller'
-require_relative 'jrubyfx/java_fx_impl'

data/lib/jrubyfx_tasks.rb

@@ -69,6 +69,8 @@ module JRubyFX
       FileList[src].each do |iv_srv|
         cp_r iv_srv, "#{target}/#{File.basename(iv_srv)}" if (main_script == nil || main_script != iv_srv) && opts[:file_filter].call(iv_srv)
       end
+	cp_r "./.jrubyfx_cache", "#{target}/.jrubyfx_cache"
+
       cp main_script, "#{target}/jar-bootstrap.rb" unless main_script == nil
 
       unless File.exists? "#{target}/jar-bootstrap.rb"
@@ -105,7 +107,7 @@ module JRubyFX
       # edit the jar
       base_dir = Dir.pwd
       cd target
-      sh "#{opts[:jar]} ufe '#{output_jar}' org.jruby.JarBootstrapMain *"
+      sh "#{opts[:jar]} ufe '#{output_jar}' org.jruby.JarBootstrapMain * .jr*"
       chmod 0775, output_jar
       cd base_dir
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrubyfx
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: java
 authors:
 - Patrick Plenefisch
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2022-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -41,20 +41,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  name: jrubyfx-fxmlloader
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.4'
 description: Enables JavaFX with FXML controllers and application in pure ruby
 email:
 - simonpatp@gmail.com
@@ -105,8 +91,8 @@ files:
 - lib/jrubyfx/dsl.rb
 - lib/jrubyfx/dsl_control.rb
 - lib/jrubyfx/dsl_map.rb
+- lib/jrubyfx/fxml_helper.rb
 - lib/jrubyfx/imports.rb
-- lib/jrubyfx/java_fx_impl.rb
 - lib/jrubyfx/module.rb
 - lib/jrubyfx/part_imports.rb
 - lib/jrubyfx/utils.rb
@@ -135,8 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: jrubyfx
-rubygems_version: 2.6.8
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: JavaFX for JRuby with FXML

data/lib/jrubyfx/java_fx_impl.rb

@@ -1,137 +0,0 @@
-=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
-#:nodoc: all
-
-# Due to certain bugs in JRuby 1.7 (namely some newInstance mapping bugs), we
-# are forced to re-create the Launcher if we want a pure ruby wrapper
-# I can't wait to delete this. The _ONLY_ code that should use this is
-# JRubyFX::Application.launch. Do _NOT_ use this code anywhere else.
-module JavaFXImpl #:nodoc: all
-  java_import 'com.sun.javafx.application.PlatformImpl'
-  java_import 'javafx.stage.Stage'
-
-  #JRuby, you make me have to create real classes!
-  class FinisherInterface
-    include PlatformImpl::FinishListener
-
-    def initialize(&block)
-      @exitBlock = block
-    end
-
-    def idle(someBoolean)
-      @exitBlock.call
-    end
-
-    def exitCalled()
-      @exitBlock.call
-    end
-  end
-
-  class Launcher
-    java_import 'java.util.concurrent.atomic.AtomicBoolean'
-    java_import 'java.util.concurrent.CountDownLatch'
-    java_import 'java.lang.IllegalStateException'
-    java_import 'com.sun.javafx.application.ParametersImpl'
-
-    @@launchCalled = AtomicBoolean.new(false) # Atomic boolean go boom on bikini
-
-    def self.launch_app(application_class, *args)
-      #prevent multiple!
-      if @@launchCalled.getAndSet(true)
-        throw IllegalStateException.new "Application launch must not be called more than once"
-      end
-
-      begin
-        #create a java thread, and run the real worker, and wait till it exits
-        count_down_latch = CountDownLatch.new(1)
-        thread = Java.java.lang.Thread.new do
-          begin
-            launch_app_from_thread(application_class, args)
-          rescue => ex
-            puts "Exception starting app:"
-            p ex
-            p ex.backtrace
-          end
-          count_down_latch.countDown #always count down
-        end
-        thread.name = "JavaFX-Launcher"
-        thread.start
-        count_down_latch.await
-      rescue => ex
-        puts "Exception launching JavaFX-Launcher thread:"
-        p ex
-        puts ex.backtrace
-      end
-    end
-
-    def self.launch_app_from_thread(application_class, args)
-      begin
-        launch_app_after_platform(application_class, args) 
-      rescue => ex
-        puts "Error running Application:"
-        p ex
-        puts ex.backtrace
-      end
-
-      PlatformImpl.tkExit # kill the toolkit and exit
-    end
-
-    def self.launch_app_after_platform(application_class, args)
-      #listeners - for the end
-      finished_latch = CountDownLatch.new(1)
-
-      # register for shutdown
-      PlatformImpl.addListener(FinisherInterface.new {
-          # this is called when the stage exits
-          finished_latch.countDown
-        })
-
-      application = application_class.new
-
-      unless application.is_a? Java::javafx.application.Application
-        raise "Invalid type: cannot launch non-Application"
-      end
-
-      ParametersImpl.registerParameters(application, ParametersImpl.new(args))
-
-      application.init
-
-      error = false
-      #RUN! and hope it works!
-      PlatformImpl.runAndWait do
-        begin
-          stage = Stage.new
-          stage.impl_setPrimary(true)
-          application.start(stage)
-          # no countDown here because its up top... yes I know
-        rescue => ex
-          puts "Exception running Application:"
-          p ex
-          puts ex.backtrace
-          error = true
-          finished_latch.countDown # but if we fail, we need to unlatch it
-        end
-      end
-
-      #wait for stage exit
-      finished_latch.await
-
-      # call stop on the interface
-      application.stop unless error
-    end
-  end
-end