jrubyfx 1.1.0-java → 2.0.0-java

data/lib/jrubyfx/core_ext/stage.rb

@@ -72,7 +72,7 @@ class Java::javafx::stage::Stage
   #
   def layout_scene(*args, &code)
     root = code.arity == 1 ? code[node] : instance_eval(&code)
-    build(Scene, root, *args).tap { |scene| set_scene scene }
+    build(Java::JavafxScene::Scene, root, *args).tap { |scene| set_scene scene }
   end
   
   def fxml(source, options={})

data/lib/jrubyfx/dsl.rb

@@ -28,6 +28,8 @@ module JRubyFX
       include JRubyFX::FXImports
 
       ##
+      # DEPRECATED: Please include JRubyFX::DSLControl instead of this method.
+      #
       # Register your own type for use in the DSL.
       #
       #   class MyFooWidget < Region
@@ -37,11 +39,16 @@ module JRubyFX
       #   register_type(MyFooWidget)
       #   register_type(MyFooWidget, "aliased_name")
       #
+      #   class MyOtherWidget < Region
+      #     register_type
+      #   end
+      #
+      #
       # Note, this also makes it possible to override existing definitions
       # of built-in components.
       #
-      def register_type(type, name=nil)
-        name = type.name.snake_case unless name
+      def register_type(type=self, name=nil)
+        name = type.name.snake_case(true) unless name
         JRubyFX::DSL::NAME_TO_CLASSES[name.to_s] = type
       end
       module_function :register_type
@@ -83,7 +90,7 @@ module JRubyFX
       clazz = NAME_TO_CLASSES[fixed_name]
       unless clazz
         clazz = NAME_TO_CLASS_NAME[fixed_name]
-        clazz = (NAME_TO_CLASSES[fixed_name] = clazz.constantize_by) if clazz
+        clazz = (NAME_TO_CLASSES[fixed_name] = clazz.constantize_by("::")) if clazz
       end
 
       unless clazz
@@ -189,7 +196,7 @@ module JRubyFX
         },
         rotate: ->(on){
           "  def rotate(*args)
-    transforms << build(Rotate, *args)
+    transforms << build(#{JRubyFX::DSL::NAME_TO_CLASS_NAME['rotate']}, *args)
   end\n"
         },
         method_missing: ->(on, type) {
@@ -235,9 +242,12 @@ module JRubyFX
         next if defs == "" || defs == nil
         # TODO: do we need to include the dsl? is this the fastest way to do it?
         outf<< <<HERDOC
+begin
 class #{clz}
   include JRubyFX::DSL
 #{defs}end
+rescue NameError # ignore, different JDK version likely
+end
 HERDOC
       end
     end

data/lib/jrubyfx/dsl_control.rb

@@ -0,0 +1,28 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'java'
+require 'jrubyfx/dsl'
+
+module JRubyFX
+  # If you want a control to be registered with the dsl calling syntax
+  # you should indicate it by including this module.
+  module DSLControl
+    def self.included(mod)
+      JRubyFX::DSL::ClassUtils.register_type mod
+    end
+  end
+end