From d552766eb6153fffc1b384f5fc8055c74bd29247 Mon Sep 17 00:00:00 2001
From: Stuart Halloway <stu@thinkrelevance.com>
Date: Tue, 13 Jul 2010 20:51:49 -0400
Subject: [PATCH 1/6] preparing for 1.2.0-beta1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6444bd68..65e5413b 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">
   <properties>
-    <clojure.version>1.2.0-master-SNAPSHOT</clojure.version>
+    <clojure.version>1.2.0-beta1</clojure.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.clojure</groupId>
   <artifactId>clojure-contrib</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.0-beta1</version>
   <url>http://clojure.org/</url>
   <description>Clojure user contributions library.</description>
   <name>${artifactId}</name>

From fc08a89cbaa785a55e5fc6a22367a1511deec508 Mon Sep 17 00:00:00 2001
From: Stuart Halloway <stu@thinkrelevance.com>
Date: Wed, 14 Jul 2010 12:55:05 -0400
Subject: [PATCH 2/6] fix release build destination

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 65e5413b..cf0673eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
     </repository>
     <repository>
       <id>clojure-releases</id>
-      <url>http://build.clojure.org/snapshots</url>
+      <url>http://build.clojure.org/releases</url>
       <releases>
         <enabled>true</enabled>
       </releases>

From fcca920397484f37aba6f6baef394fa25e8a2ab4 Mon Sep 17 00:00:00 2001
From: Franz Haas <tramp@lavabit.com>
Date: Sun, 17 Oct 2010 14:00:06 +0200
Subject: [PATCH 3/6] Added add-mouse-clicked-listener in the style of
 add-key-typed-listener

---
 src/main/clojure/clojure/contrib/swing_utils.clj | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/clojure/clojure/contrib/swing_utils.clj b/src/main/clojure/clojure/contrib/swing_utils.clj
index 013d7d29..a418a58b 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,19 @@
     (.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] []
+                   (mouseClicked [event] (apply f event args)))]
+    (.addMouseListener component listener)
+    listener))
+
 ;; ----------------------------------------------------------------------
 ;; Meikel Brandmeyer
 

From 8b85ff1cc05487c2fb13a2e33f7d0e69d10d389a Mon Sep 17 00:00:00 2001
From: Franz Haas <tramp@lavabit.com>
Date: Mon, 18 Oct 2010 22:58:23 +0200
Subject: [PATCH 4/6] added empty functions for all interface functions of
 MouseListener

---
 src/main/clojure/clojure/contrib/swing_utils.clj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/clojure/clojure/contrib/swing_utils.clj b/src/main/clojure/clojure/contrib/swing_utils.clj
index a418a58b..5a62ae0f 100644
--- a/src/main/clojure/clojure/contrib/swing_utils.clj
+++ b/src/main/clojure/clojure/contrib/swing_utils.clj
@@ -49,6 +49,10 @@
   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))

From 1f60506400d12d9602a601446409e154bf467b20 Mon Sep 17 00:00:00 2001
From: Franz Haas <tramp@lavabit.com>
Date: Tue, 26 Oct 2010 11:56:07 +0200
Subject: [PATCH 5/6] swing-message box added

---
 src/main/clojure/clojure/contrib/swing_utils.clj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/clojure/clojure/contrib/swing_utils.clj b/src/main/clojure/clojure/contrib/swing_utils.clj
index 5a62ae0f..fac2d02b 100644
--- a/src/main/clojure/clojure/contrib/swing_utils.clj
+++ b/src/main/clojure/clojure/contrib/swing_utils.clj
@@ -167,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)))

From 187fd53ed12789de7d3790ffd661d930f8e33946 Mon Sep 17 00:00:00 2001
From: Franz Haas <tramp@lavabit.com>
Date: Tue, 26 Oct 2010 11:58:35 +0200
Subject: [PATCH 6/6] round for complex numbers

---
 src/main/clojure/clojure/contrib/complex_numbers.clj | 6 ++++++
 1 file changed, 6 insertions(+)

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))))