zilti/clojurefx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preparing next minor version

Browse source
This commit is contained in:
Daniel Ziltener 2017-08-30 11:58:57 +00:00
parent e83575e97b
commit a5e7f42a26
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
project.clj
View file

@ -1,4 +1,4 @@
(defproject clojurefx/clojurefx "0.3.0" (defproject clojurefx/clojurefx "0.3.1-SNAPSHOT"
:description "A Clojure wrapper for JavaFX." :description "A Clojure wrapper for JavaFX."
:license "Like Clojure." :license "Like Clojure."
:url "https://www.bitbucket.org/zilti/clojurefx" :url "https://www.bitbucket.org/zilti/clojurefx"
@ -10,8 +10,8 @@
[com.taoensso/timbre "4.7.4" :exclusions [com.taoensso/carmine]] [com.taoensso/timbre "4.7.4" :exclusions [com.taoensso/carmine]]
[net.openhft/compiler "2.3.0"] [net.openhft/compiler "2.3.0"]
[clojure-jsr-223 "0.1.0"]] [clojure-jsr-223 "0.1.0"]]
;; :profiles {:uberjar {:aot :all}}
:profiles {:test {:source-paths ["test"] :profiles {:test {:source-paths ["test"]
:resource-paths ["test-resources"]}} :resource-paths ["test-resources"]}
:uberjar {:aot :all}}
:source-paths ["src"] :source-paths ["src"]
:java-source-paths ["src"]) :java-source-paths ["src"])

9
src/clojurefx/clojurefx.clj
View file

@ -20,12 +20,13 @@
(let [iface-ref (reflect/type-reflect interface) (let [iface-ref (reflect/type-reflect interface)
bogus (debug "iface-ref:" iface-ref) bogus (debug "iface-ref:" iface-ref)
methods (filter #(instance? clojure.reflect.Method %) (:members iface-ref)) methods (filter #(instance? clojure.reflect.Method %) (:members iface-ref))
bogus (debug "methods:" (pr-str methods)) functional-method (filter (fn [x] (some #(= % :abstract) (:flags x))) methods)
method-sym (:name (first methods))] bogus (debug "methods:" (pr-str functional-method))
method-sym (:name (first functional-method))]
(debug "method-sym:" method-sym) (debug "method-sym:" method-sym)
(when-not (= (count methods) 1) (when-not (= (count functional-method) 1)
(throw (new Exception (str "can't take an interface with more than one method:" (pr-str methods))))) (throw (new Exception (str "can't take an interface with more than one method:" (pr-str functional-method)))))
(debug (pr-str `(proxy [~interface] [] (debug (pr-str `(proxy [~interface] []
(~method-sym ~args ~@code)))) (~method-sym ~args ~@code))))

4
src/clojurefx/controllergen.clj
View file

@ -106,7 +106,9 @@
;; Plumber ;; Plumber
(defn gen-fx-controller-class [fxmlpath clj-fn] (defn gen-fx-controller-class [fxmlpath clj-fn]
(let [fxmlzip (zip-tree-seq (xml/parse (io/input-stream fxmlpath))) (let [clj-fn (if (symbol? clj-fn)
(str (namespace clj-fn) "/" (name clj-fn)))
fxmlzip (zip-tree-seq (xml/parse (io/input-stream fxmlpath)))
clazz (get-controller-class fxmlzip) clazz (get-controller-class fxmlzip)
[pkg classname] (reverse (map str/reverse (str/split (str/reverse clazz) #"\." 2))) [pkg classname] (reverse (map str/reverse (str/split (str/reverse clazz) #"\." 2)))
cljvec (str/split clj-fn #"/")] cljvec (str/split clj-fn #"/")]