diff --git a/pom.xml b/pom.xml index 6444bd68..cf0673eb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - 1.2.0-master-SNAPSHOT + 1.2.0-beta1 UTF-8 4.0.0 org.clojure clojure-contrib - 1.2.0-SNAPSHOT + 1.2.0-beta1 http://clojure.org/ Clojure user contributions library. ${artifactId} @@ -41,7 +41,7 @@ clojure-releases - http://build.clojure.org/snapshots + http://build.clojure.org/releases true diff --git a/src/main/clojure/clojure/contrib/complex_numbers.clj b/src/main/clojure/clojure/contrib/complex_numbers.clj index 01f90b9c..f6448b21 100644 --- a/src/main/clojure/clojure/contrib/complex_numbers.clj +++ b/src/main/clojure/clojure/contrib/complex_numbers.clj @@ -291,3 +291,9 @@ [x] (let [i (imag x)] (complex (gm/cos i) (gm/sin i)))) + +;Franz Haas +(defmethod gm/round ::complex + [x] + (let [[r i] (vals x)] + (complex (gm/round r) (gm/round i)))) diff --git a/src/main/clojure/clojure/contrib/swing_utils.clj b/src/main/clojure/clojure/contrib/swing_utils.clj index 013d7d29..fac2d02b 100644 --- a/src/main/clojure/clojure/contrib/swing_utils.clj +++ b/src/main/clojure/clojure/contrib/swing_utils.clj @@ -14,7 +14,7 @@ ;; Created 31 May 2009 (ns clojure.contrib.swing-utils - (:import (java.awt.event ActionListener KeyAdapter) + (:import (java.awt.event ActionListener KeyAdapter MouseListener) (javax.swing AbstractAction Action JMenu JMenuBar JMenuItem SwingUtilities)) @@ -40,6 +40,23 @@ (.addKeyListener component listener) listener)) +;; ---------------------------------------------------------------------- +;; Franz Haas + +(defn add-mouse-clicked-listener + "Adds a MouseListener, only setting the clicked interface When a key + is typed, f is invoked with the MouseEvent as its first argument + followed by args. Returns the listener." + [component f & args] + (let [listener (proxy [MouseListener] [] + (mouseEntered [e]) + (mouseExited [e]) + (mousePressed [e]) + (mouseReleased [e]) + (mouseClicked [event] (apply f event args)))] + (.addMouseListener component listener) + listener)) + ;; ---------------------------------------------------------------------- ;; Meikel Brandmeyer @@ -150,3 +167,9 @@ menubar)) ;; ---------------------------------------------------------------------- +;; Franz Haas + +(defn message-box + "shows a message box and return imediately" + [text] + (do-swing (javax.swing.JOptionPane/showMessageDialog nil text)))