Removed core.typed.

project.clj

@@ -0,0 +1,8 @@
+(defproject clojurefx "0.1.0-SNAPSHOT"
+  :dependencies [[org.clojure/clojure "1.8.0"]
+                 [com.taoensso/timbre "4.7.4" :exclusions [com.taoensso/carmine]]
+                 [org.clojure/core.typed "0.3.26"]
+                 [clojure-jsr-223 "0.1.0"]]
+  :injections [(require 'clojure.core.typed)
+               (clojure.core.typed/install)]
+  :profiles {:uberjar {:aot :all}})

src/clojurefx/clojurefx.clj

@@ -1,8 +1,5 @@
 1(ns clojurefx.clojurefx 
-   (:refer-clojure :exclude [atom doseq let fn defn ref dotimes defprotocol loop for send meta with-meta])
+   (:require [taoensso.timbre :as timbre]
-   (:require [clojure.core.typed :refer :all]
-             [clojure.core.typed.unsafe :refer [ignore-with-unchecked-cast]]
-             [taoensso.timbre :as timbre]
              [clojure.java.io :as io]
              [clojure.zip :as zip]
              [clojurefx.protocols :as p]
@@ -12,41 +9,39 @@
 
 ;; ## Threading helpers
 
-(ann run-later* [(Fn [-> Any]) -> nil])
+(defn run-later*"
-  (defn run-later*"
   Simple wrapper for Platform/runLater. You should use run-later.
-" [f]
+  " [f]
-(tc-ignore (assert (instance? Runnable f))
+  (assert (instance? Runnable f))
-           (javafx.application.Platform/runLater f))
+  (javafx.application.Platform/runLater f)
-nil)
+  nil)
 
 (defmacro run-later [& body]
   `(run-later* (fn [] ~@body)))
 
-(ann run-now* (All [x] [[-> x] -> x]))
+(defn run-now* "
-  (defn run-now* "
   A modification of run-later waiting for the running method to return. You should use run-now.
-" [f]
+  " [f]
-(if (javafx.application.Platform/isFxApplicationThread)
+  (if (javafx.application.Platform/isFxApplicationThread)
     (apply f [])
     (let [result (promise)]
       (run-later
        (deliver result (try (f) (catch Throwable e e))))
       @result)))
 
-  (defmacro run-now "
+(defmacro run-now "
   Runs the code on the FX application thread and waits until the return value is delivered.
-" [& body]
+  " [& body]
-`(run-now* (fn [] ~@body)))
+  `(run-now* (fn [] ~@body)))
 
-  (defn collize "
+(defn collize "
   Turns the input into a collection, if it isn't already.
   " [input]
   (if (coll? input)
     input
     (list input)))
 
-(tc-ignore (timbre/refer-timbre))
+(timbre/refer-timbre)
 
 (import (javafx.scene.control Labeled Label TextField TextArea CheckBox ComboBox Menu MenuItem MenuBar
                               MenuButton ContextMenu ToolBar SplitPane ScrollPane Accordion
@@ -59,21 +54,14 @@ nil)
         (javafx.event Event ActionEvent EventTarget)
         (java.util Collection))
 
-(defn tc-assert [clazz :- Class value :- Any & [message :- String]]
+(defn pred-protocol [proto check]
-  (try (assert (instance? clazz value))
-       (catch AssertionError e (tc-ignore (error (if message message "") e)
-                                          (error "Expected:" clazz "Actual:" (type value))
-                                          (throw e)))))
-
-(defn pred-protocol [proto :- (HMap :mandatory {:impls (Map Keyword Class)}) check :- Any] :- Boolean
   (let [impls (keys (proto :impls))
         check (type check)]
     (reduce #(or %1 (isa? check %2)) false impls)))
 
 ;;## Shadows
 
-(tc-ignore
+(extend-protocol p/FXMeta
- (extend-protocol p/FXMeta
   clojure.lang.IObj
   (meta [this] (clojure.core/meta this))
   (with-meta [this metadata] (clojure.core/with-meta this metadata))
@@ -82,24 +70,23 @@ nil)
   (with-meta [this metadata] (.setUserData ^Node this metadata) this)
   MenuItem
   (meta [this] (.getUserData ^MenuItem this))
-   (with-meta [this metadata] (.setUserData ^MenuItem this metadata) this)))
+  (with-meta [this metadata] (.setUserData ^MenuItem this metadata) this))
 
 ;;## Standard
 
-(tc-ignore
+(extend-protocol p/FXValue
- (extend-protocol p/FXValue
   Labeled
   (value [this] (.getText ^Label this))
-   (set-value! [this value] (tc-assert String value) (.setText ^Label this ^String value) this)
+  (set-value! [this value] (.setText ^Label this ^String value) this)
   TextField
   (value [this] (.getText ^TextField this))
-   (set-value! [this value] (tc-assert String value) (.setText ^TextField this ^String value) this)
+  (set-value! [this value] (.setText ^TextField this ^String value) this)
   TextArea
   (value [this] (.getText ^TextArea this))
-   (set-value! [this value] (tc-assert String value) (.setText ^TextArea this ^String value) this)
+  (set-value! [this value] (.setText ^TextArea this ^String value) this)
   CheckBox
   (value [this] (.isSelected ^CheckBox this))
-   (set-value! [this value] (tc-assert Boolean value) (.setSelected ^CheckBox this ^Boolean value) this)
+  (set-value! [this value] (.setSelected ^CheckBox this ^Boolean value) this)
   ComboBox
   (value [this] (let [selection-model (.getSelectionModel ^ComboBox this)
                       _ (assert (not (nil? selection-model)))
@@ -110,22 +97,20 @@ nil)
   (set-value! [this value] (let [sel-model (.getSelectionModel ^ComboBox this)
                                  item (first (filter #(= value %) (.getItems ^ComboBox this)))]
                              (if-not (nil? item)
-                                (tc-ignore (.select ^javafx.scene.control.SingleSelectionModel sel-model item)))) this)
+                               (.select ^javafx.scene.control.SingleSelectionModel sel-model item))) this)
   Menu
   (value [this] (.getText ^Menu this))
-   (set-value! [this value] (tc-assert String value) (.setText ^Menu this ^String value) this)
+  (set-value! [this value] (.setText ^Menu this ^String value) this)
   MenuItem
   (value [this] (.getText ^MenuItem this))
-   (set-value! [this value] (tc-assert String value) (.setText ^MenuItem this ^String value) this)))
+  (set-value! [this value] (.setText ^MenuItem this ^String value) this))
 
-(tc-ignore
+(extend-protocol p/FXId
- (extend-protocol p/FXId
   Styleable
   (id [this] (.getId ^Styleable this))
-   (set-id! [this id] (tc-assert String id) (.setId ^Styleable this ^String id) this)))
+  (set-id! [this id] (.setId ^Styleable this ^String id) this))
 
-(tc-ignore
+(extend-protocol p/FXParent
- (extend-protocol p/FXParent
   Pane
   (subnodes [this] (.getChildren ^Pane this))
   (set-subnodes! [this nodes] (.setAll ^ObservableList (.getChildren ^Pane this) (collize nodes)) this)
@@ -152,10 +137,9 @@ nil)
   (set-subnodes! [this nodes] (.setAll ^ObservableList (.getItems ^SplitPane this) (collize nodes)) this)
   Accordion
   (subnodes [this] (.getPanes ^Accordion this))
-   (set-subnodes! [this nodes] (.setAll ^ObservableList (.getPanes ^Accordion this) (collize nodes)) this)))
+  (set-subnodes! [this nodes] (.setAll ^ObservableList (.getPanes ^Accordion this) (collize nodes)) this))
 
-(tc-ignore
+(extend-protocol p/FXContainer
- (extend-protocol p/FXContainer
   Tab
   (content [this] (.getContent ^Tab this))
   (set-content! [this node] (.setContent ^Tab this ^Node node) this)
@@ -164,26 +148,23 @@ nil)
   (set-content! [this node] (.setContent ^TitledPane this ^Node node) this)
   ScrollPane
   (content [this] (.getContent ^ScrollPane this))
-   (set-content! [this node] (.setContent ^ScrollPane this ^Node node) this)))
+  (set-content! [this node] (.setContent ^ScrollPane this ^Node node) this))
 
-(tc-ignore
+(extend-protocol p/FXGraphic
- (extend-protocol p/FXGraphic
   Labeled
   (graphic [this] (.getGraphic ^Labeled this))
   (set-graphic! [this graphic] (.setGraphic ^Labeled this ^Node graphic))
   MenuItem
   (graphic [this] (.getGraphic ^Menu this))
-   (set-graphic! [this graphic] (.setGraphic ^Menu this ^Node graphic))))
+  (set-graphic! [this graphic] (.setGraphic ^Menu this ^Node graphic)))
 
-(tc-ignore
+(extend-protocol p/FXStyleSetter
- (extend-protocol p/FXStyleSetter
   Node
   (set-style! [this style] (.setStyle ^Node this ^String style) this)
   MenuItem
-   (set-style! [this style] (.setStyle ^MenuItem this ^String style) this)))
+  (set-style! [this style] (.setStyle ^MenuItem this ^String style) this))
 
-(tc-ignore
+(extend-type Styleable
- (extend-type Styleable
   p/FXStyleable
   (css-meta [this] (.getCssMetaData ^Styleable this))
   (pseudo-class-styles [this] (.getPseudoClassStyles ^Styleable this))
@@ -191,11 +172,10 @@ nil)
   (style-classes [this] (.getStyleClass ^Styleable this))
   (set-style-classes! [this classes] (.setAll ^ObservableList (.getStyleClass ^Styleable this) classes) this)
   (styleable-parent [this] (.getStyleableParent ^Styleable this))
-   (type-selector [this] (.getTypeSelector ^Styleable this))))
+  (type-selector [this] (.getTypeSelector ^Styleable this)))
 
 (declare bind-event)
-(tc-ignore
+(extend-protocol p/FXOnAction
- (extend-protocol p/FXOnAction
   ButtonBase
   (action [this] (.getOnAction ^ButtonBase this))
   (set-action! [this action] (.setOnAction ^ButtonBase this (bind-event action)) this)
@@ -203,73 +183,67 @@ nil)
   MenuItem
   (action [this] (.getOnAction ^MenuItem this))
   (set-action! [this action] (.setOnAction ^ButtonBase this (bind-event action)) this)
-   (fire! [this] (.fire this))))
+  (fire! [this] (.fire this)))
 
 ;;## Special Types
 
 ;;### javafx.event
 
-(tc-ignore
+(extend-type Event
- (extend-type Event
   p/FXEvent
   (source [this] (.getSource ^Event this))
   (consume! [this] (.consume ^Event this) this)
   (copy [this new-src new-target] (.copy ^Event this new-src new-target))
   (event-type [this] (.getEventType this))
   (target [this] (.getTarget this))
-   (consumed? [this] (.isConsumed this))))
+  (consumed? [this] (.isConsumed this)))
 
 ;;### javafx.stage
 
-(tc-ignore
+(extend-type Stage
- (extend-type Stage
   p/FXStage
   (title [this] (.getTitle ^Stage this))
   (set-title! [this title] (.setTitle ^Stage this ^String title))
   (scene [this] (.getScene ^Stage this))
-   (set-scene! [this scene] (.setScene ^Stage this ^Scene scene))))
+  (set-scene! [this scene] (.setScene ^Stage this ^Scene scene)))
 
 ;;### javafx.scene
 
-(tc-ignore
+(extend-type Scene
- (extend-type Scene
   p/FXScene
   (root [this] (.getRoot ^Scene this))
-   (set-root! [this root] (.setRoot ^Scene this ^Parent root) this)))
+  (set-root! [this root] (.setRoot ^Scene this ^Parent root) this))
 
 ;;## Event handling helper
-(tc-ignore
+(defn bind-event
- (defn bind-event
+  [handler]
-   [handler :- (All [[A :variance :covariant :< Event]] (Fn [A -> Any]))] :- javafx.event.EventHandler
   (reify javafx.event.EventHandler
-     (handle [_ event] (handler event)))))
+    (handle [_ event] (handler event))))
 
 ;;## IdMapper
 (defn fxzipper [root]
-  (zip/zipper (fn branch? [node :- Any] :- Boolean
+  (zip/zipper (fn branch? [node]
                 (or (pred-protocol p/FXParent node) (pred-protocol p/FXContainer node)))
-              (fn children [node :- (U p/FXParent p/FXContainer)] :- java.util.List
+              (fn children [node]
                 (if (pred-protocol p/FXParent node)
                   (into [] (p/subnodes node))
                   [(p/content node)]))
-              (fn make-node [node :- (U p/FXParent p/FXContainer) children :- Any] :- (U p/FXParent p/FXContainer)
+              (fn make-node [node children]
                 (if (pred-protocol p/FXParent node)
                   (p/set-subnodes! node children)
                   (p/set-content! node children)))
               root))
 
-(tc-ignore
+(defn get-node-by-id [graph id]
- (defn get-node-by-id [graph id]
   (loop [zipper (fxzipper graph)]
     (cond (zip/end? zipper) nil
           (= (p/id (zip/node zipper)) (name id)) (zip/node zipper)
-           :else (recur (zip/next zipper))))))
+          :else (recur (zip/next zipper)))))
 
-(tc-ignore
+(defn get-id-map [graph]
- (defn get-id-map [graph]
   (loop [zipper (fxzipper graph)
          ids {}]
     (if (zip/end? zipper)
       ids
       (recur (zip/next zipper)
-              (assoc ids (keyword (p/id (zip/node zipper))) (zip/node zipper)))))))
+             (assoc ids (keyword (p/id (zip/node zipper))) (zip/node zipper))))))

src/clojurefx/factory.clj

@@ -1,18 +1,15 @@
 (ns clojurefx.factory 
-  (:refer-clojure :exclude [atom doseq let fn defn ref dotimes defprotocol loop for send compile meta with-meta])
+  (:require [taoensso.timbre :as timbre]
-  (:require [clojure.core.typed :refer :all]
-            [clojure.core.typed.unsafe :refer [ignore-with-unchecked-cast]]
-            [taoensso.timbre :as timbre]
             [clojure.java.io :as io]
             [clojurefx.clojurefx :as fx]
             [clojurefx.protocols :refer :all])
   (:import (javafx.scene Scene Node Parent)))
 
-(tc-ignore (timbre/refer-timbre))
+(timbre/refer-timbre)
 
 ;;## FXMLLoader
 
-(defn load-fxml [filename :- String] :- javafx.scene.Node
+(defn load-fxml [filename]
   (let [loader (new javafx.fxml.FXMLLoader)]
     (.setLocation loader (io/resource ""))
     (.load loader (-> filename io/resource io/input-stream))))
@@ -22,7 +19,6 @@
 (def getter first)
 (def setter second)
 
-(ann translation-map (Atom1 (Map Keyword (Vec clojure.lang.Var))))
 (def translation-map
   (atom {;;; FXValue
          :text (with-meta [#'value #'set-value!] {:argument String :parent FXValue})
@@ -49,7 +45,6 @@
   (atom {javafx.scene.Scene [:root]}))
 
 (declare compile-o-matic)
-(ann apply-props-to-node [Any (Map Keyword Any) -> Any])
 (defn apply-props-to-node [node props]
   (doseq [[k v] props]
     (let [translation (get @translation-map k)
@@ -65,7 +60,6 @@
       ((setter translation) node v)))
   node)
 
-(ann build-node [Any (Map Keyword Any) -> Any])
 (defn build-node [object props]
   (debug "build-node:" object props)
   (let [mandatory (get mandatory-constructor-args object)
@@ -87,7 +81,6 @@
 ;;     (string? thing) (recur (symbol thing))
 ;;     :else thing))
 
-(ann compile [(Vec Any) -> Any])
 (defn compile
   ([args] (compile args []))
   ([[obj & other] accu]
@@ -98,7 +91,6 @@
      (class? obj) (recur (rest other) (conj accu (build-node obj (first other))))
      :else (recur other (conj accu obj)))))
 
-(ann compile-o-matic [Any -> Any])
 (defn compile-o-matic [thing]
   (if (instance? java.util.List thing)
     (if (and (not (coll? (first thing))) (map? (second thing)))

src/clojurefx/protocols.clj

@@ -1,101 +1,91 @@
-(ns clojurefx.protocols
+(ns clojurefx.protocols)
-  (:refer-clojure :exclude [atom doseq let fn defn ref dotimes defprotocol loop for send meta with-meta])
-  (:require [clojure.core.typed :refer :all]))
 
 ;;## Shadows
 
-(defprotocol [[A :variance :covariant]]
+(defprotocol
     FXMeta
-  (meta [this :- A] :- (Map Any Any))
+  (meta [this])
-  (with-meta [this :- A metadata :- (Map Any Any)] :- A))
+  (with-meta [this metadata]))
 
 ;;## Standard
 
-(declare-protocols FXValue FXId FXParent)
+;; (declare-protocols FXValue FXId FXParent)
-(defprotocol [[A :variance :covariant]
+(defprotocol
-              [B :variance :covariant]]
     FXValue
-  (value [this :- A] :- B)
+  (value [this])
-  (set-value! [this :- A value :- B] :- A))
+  (set-value! [this value]))
 
-(defprotocol [[A :variance :covariant]
+(defprotocol
-              [x :variance :covariant]]
     FXId
-  (id [this :- A] :- (U nil String))
+  (id [this])
-  (set-id! [this :- A id :- String] :- A))
+  (set-id! [this id]))
 
-(defalias FXElement (U FXValue FXId))
+;; (defalias FXElement (U FXValue FXId))
 
-(defprotocol [[A :variance :covariant]
+(defprotocol
-              [B :variance :covariant :< Seqable]]
     FXParent
   "The ClojureFX extension to javafx.scene.Parent."
-  (subnodes [this :- A] :- B)
+  (subnodes [this])
-  (set-subnodes! [this :- A nodes :- B] :- A))
+  (set-subnodes! [this nodes]))
 
-(defprotocol [[A :variance :covariant]
+(defprotocol
-              [B :variance :covariant]]
     FXContainer
-  (content [this :- A] :- B)
+  (content [this])
-  (set-content! [this :- A node :- B] :- A))
+  (set-content! [this node]))
 
-(defprotocol [[A :variance :covariant]
+(defprotocol
-              [B :variance :covariant :< javafx.scene.Node]]
     FXGraphic
-  (graphic [this :- A] :- B)
+  (graphic [this])
-  (set-graphic! [this :- A graphic :- B] :- A))
+  (set-graphic! [this graphic]))
 
-(defprotocol [[A :variance :covariant :< javafx.css.Styleable]
+(defprotocol
-              [B :variance :covariant :< javafx.css.Styleable]]
     FXStyleable
   "http://download.java.net/jdk8/jfxdocs/javafx/css/Styleable.html"
-  (css-meta [this :- A] :- (java.util.List javafx.css.CssMetaData)) ;; TODO
+  (css-meta [this]) ;; TODO
-  (pseudo-class-styles [this :- A] :- (javafx.collections.ObservableSet javafx.css.PseudoClass))
+  (pseudo-class-styles [this])
-  (style [this :- A] :- String)
+  (style [this])
-  (style-classes [this :- A] :- (javafx.collections.ObservableList String))
+  (style-classes [this])
-  (set-style-classes! [this :- A classes :- java.util.Collection] :- A)
+  (set-style-classes! [this classes])
-  (styleable-parent [this :- A] :- (U nil B))
+  (styleable-parent [this])
-  (type-selector [this :- A] :- String))
+  (type-selector [this]))
 
-(defprotocol [[A :variance :covariant]]
+(defprotocol
     FXStyleSetter
-  (set-style! [this :- A style :- String] :- A))
+  (set-style! [this style]))
 
-(defalias FXStyled (U FXStyleable FXStyleSetter))
+;; (defalias FXStyled (U FXStyleable FXStyleSetter))
 
-(defprotocol [[A :variance :covariant]]
+(defprotocol
     FXOnAction
-  (action [this :- A] :- [javafx.event.EventHandler -> Any])
+  (action [this])
-  (set-action! [this :- A action :- [javafx.event.EventHandler -> Any]] :- A)
+  (set-action! [this action])
-  (fire! [this :- A] :- nil))
+  (fire! [this]))
 
 ;;## Special Types
 
 ;;### javafx.event
 
-(defprotocol [[A :variance :covariant :< javafx.event.Event]]
+(defprotocol
     FXEvent
-  (source [this :- A] :- Any)
+  (source [this])
-  (consume! [this :- A] :- A)
+  (consume! [this])
-  (copy [this :- A newSource :- Object newTarget :- javafx.event.EventTarget] :- A)
+  (copy [this newSource newTarget])
-  (event-type [this :- A] :- javafx.event.EventType)
+  (event-type [this])
-  (target [this :- A] :- javafx.event.EventTarget)
+  (target [this])
-  (consumed? [this :- A] :- Boolean))
+  (consumed? [this]))
 
 ;;### javafx.stage
 
-(defprotocol [[A :variance :covariant :< javafx.stage.Stage]
+(defprotocol
-              [B :variance :covariant :< javafx.scene.Scene]]
     FXStage
-  (title [this :- A] :- String)
+  (title [this])
-  (set-title! [this :- A title :- String] :- A)
+  (set-title! [this title])
-  (scene [this :- A] :- B)
+  (scene [this])
-  (set-scene! [this :- A scene :- B] :- A))
+  (set-scene! [this scene]))
 
 ;;### javafx.scene
 
-(defprotocol [[A :variance :covariant :< javafx.scene.Scene]
+(defprotocol
-              [B :variance :covariant :< javafx.scene.Parent]]
     FXScene
-  (root [this :- A] :- B)
+  (root [this])
-  (set-root! [this :- A root :- B] :- A))
+  (set-root! [this root]))