From 0df101a2797df64e2290ea2b98fab79bcf43ffae Mon Sep 17 00:00:00 2001 From: zilti Date: Tue, 6 Nov 2018 10:53:31 +0000 Subject: [PATCH] Updated version --- project.clj | 4 ++-- src/clojurefx/clojurefx.clj | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/project.clj b/project.clj index 9ead1c9..32ffd68 100644 --- a/project.clj +++ b/project.clj @@ -1,11 +1,11 @@ -(defproject clojurefx/clojurefx "0.5.0-SNAPSHOT" +(defproject clojurefx/clojurefx "0.5.1-SNAPSHOT" :description "A Clojure wrapper for JavaFX." :license "Like Clojure." :url "https://www.bitbucket.org/zilti/clojurefx" :signing {:gpg-key "68484437"} :dependencies [[org.clojure/clojure "1.9.0"] [org.clojure/core.async "0.4.474" :scope "test"] - [org.clojars.tristefigure/shuriken "0.14.28" :scope "test"] + ;;[org.clojars.tristefigure/shuriken "0.14.28" :scope "test"] [org.openjfx/javafx-fxml "11-ea+25" :scope "test"] [org.openjfx/javafx-swing "11-ea+25" :scope "test"] [swiss-arrows "1.0.0"] diff --git a/src/clojurefx/clojurefx.clj b/src/clojurefx/clojurefx.clj index 7a7ccf6..19ae0f2 100644 --- a/src/clojurefx/clojurefx.clj +++ b/src/clojurefx/clojurefx.clj @@ -6,8 +6,7 @@ [clojure.string :as str] [swiss.arrows :refer :all] [clojure.spec.alpha :as s] - [clojure.pprint :refer :all] - [shuriken.macro :as sm]) + [clojure.pprint :refer :all]) (:import (javafx.scene.layout Region) (javafx.scene.shape Rectangle) (clojurefx.ApplicationInitializer) @@ -185,8 +184,7 @@ ) (defn- graph-node-get-children [node] - {:pre [(s/valid? ::scenegraph node)] - :post [coll?]} + {:post [coll?]} (cond (has-method? node "getChildren") (.getChildren node) (has-method? node "getGraphic") [(.getGraphic node)] (has-method? node "getMenus") (.getMenus node) @@ -209,7 +207,7 @@ (lazy-seq (cons (zip/node zipper) (flat-zipper (zip/next zipper)))))) (defn- has-id? [node id] - {:pre [(s/valid? ::scenegraph node) (string? id)] + {:pre [any? (string? id)] :post [boolean?]} (if (s/valid? ::node node) (= id (.getId node))