refactoring use/import statements

abedra · weavejester · commit 5752c7bf2260 · 2010-01-14T05:25:15.000+08:00
diff --git a/src/compojure/crypto.clj b/src/compojure/crypto.clj
@@ -8,16 +8,13 @@
 
 (ns compojure.crypto
   "Functions for cryptographically signing, verifying and encrypting data."
-  (:use compojure.encodings)
-  (:use clojure.contrib.def)
-  (:use clojure.contrib.java-utils)
-  (:import java.security.SecureRandom)
-  (:import javax.crypto.Cipher)
-  (:import javax.crypto.KeyGenerator)
-  (:import javax.crypto.Mac)
-  (:import javax.crypto.spec.SecretKeySpec)
-  (:import javax.crypto.spec.IvParameterSpec)
-  (:import java.util.UUID))
+  (:use compojure.encodings
+        clojure.contrib.def
+        clojure.contrib.java-utils)
+  (:import java.security.SecureRandom
+           [javax.crypto Cipher KeyGenerator Mac]
+           [javax.crypto.spec SecretKeySpec IvParameterSpec]
+           java.util.UUID))
 
 (defvar hmac-defaults
   {:algorithm "HmacSHA256"}
diff --git a/src/compojure/encodings.clj b/src/compojure/encodings.clj
@@ -8,12 +8,10 @@
 
 (ns compojure.encodings
   "Functions for encoding data."
-  (:use compojure.str-utils)
-  (:use clojure.contrib.duck-streams)
-  (:import java.net.URLEncoder)
-  (:import java.net.URLDecoder)
-  (:import org.apache.commons.codec.binary.Base64)
-  (:import org.apache.commons.codec.binary.Hex))
+  (:use compojure.str-utils
+        clojure.contrib.duck-streams)
+  (:import [java.net URLEncoder URLDecoder]
+           [org.apache.commons.codec.binary Base64 Hex]))
 
 (defn urlencode
   "Encode a urlencoded string using the default encoding."
diff --git a/src/compojure/html/form_helpers.clj b/src/compojure/html/form_helpers.clj
@@ -8,11 +8,11 @@
 
 (ns compojure.html.form-helpers
   "Functions for generating HTML forms and input fields."
-  (:use compojure.html.gen)
-  (:use compojure.control)
-  (:use compojure.str-utils)
-  (:use clojure.contrib.def)
-  (:use clojure.contrib.seq-utils))
+  (:use compojure.html.gen
+        compojure.control
+        compojure.str-utils
+        clojure.contrib.def
+        clojure.contrib.seq-utils))
 
 ;; Global parameters for easy default values
 
diff --git a/src/compojure/html/gen.clj b/src/compojure/html/gen.clj
@@ -10,8 +10,8 @@
   "A library for generating HTML output from a tree of vectors. The first item
    of the vector is the tag name, the optional second item is a hash of
    attributes, and the rest is the body of the tag."
-  (:use compojure.str-utils)
-  (:use clojure.contrib.def))
+  (:use compojure.str-utils
+        clojure.contrib.def))
 
 (defn optional-attrs
   "Adds an optional attribute map to the supplied function's arguments."
diff --git a/src/compojure/html/page_helpers.clj b/src/compojure/html/page_helpers.clj
@@ -8,19 +8,19 @@
 
 (ns compojure.html.page-helpers
   "Functions for generating document and header boilerplate."
-  (:use compojure.control)
-  (:use compojure.html.gen)
-  (:use compojure.str-utils)
-  (:use clojure.contrib.str-utils)
+  (:use compojure.control
+        compojure.html.gen
+        compojure.str-utils
+        clojure.contrib.str-utils)
   (:import java.net.URLEncoder))
 
 (def doctype
   {:html4
    (str "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" "
         "\"http://www.w3.org/TR/html4/strict.dtd\">\n")
 
-	 :html5
-	  (str "<!DOCTYPE html>")
+   :html5
+   (str "<!DOCTYPE html>")
 
    :xhtml-strict
    (str "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
diff --git a/src/compojure/http/helpers.clj b/src/compojure/http/helpers.clj
@@ -8,11 +8,11 @@
 
 (ns compojure.http.helpers
   "Helper functions for things like redirection, serving files, 404s, etc."
-  (:use compojure.encodings)
-  (:use compojure.str-utils)
-  (:use clojure.contrib.def)
-  (:use clojure.contrib.str-utils)
-  (:use clojure.contrib.duck-streams)
+  (:use compojure.encodings
+        compojure.str-utils
+        clojure.contrib.def
+        clojure.contrib.str-utils
+        clojure.contrib.duck-streams)
   (:import java.io.File))
 
 (defn- encode-cookie
diff --git a/src/compojure/http/middleware.clj b/src/compojure/http/middleware.clj
@@ -8,10 +8,10 @@
 
 (ns compojure.http.middleware
   "Various middleware functions."
-  (:use compojure.http.routes)
-  (:use compojure.str-utils)
-  (:use clojure.contrib.def)
-  (:use clojure.contrib.str-utils))
+  (:use compojure.http.routes
+        compojure.str-utils
+        clojure.contrib.def
+        clojure.contrib.str-utils))
 
 (defn header-option
   "Converts a header option KeyValue into a string."
diff --git a/src/compojure/http/multipart.clj b/src/compojure/http/multipart.clj
@@ -9,12 +9,10 @@
 (ns compojure.http.multipart
   "Add multipart form handling to Compojure. Relies on the Apache Commons
    FileUpload library."
-  (:use clojure.contrib.def)
-  (:use compojure.map-utils)
-  (:import org.apache.commons.fileupload.FileUpload)
-  (:import org.apache.commons.fileupload.RequestContext)
-  (:import org.apache.commons.fileupload.disk.DiskFileItemFactory)
-  (:import org.apache.commons.fileupload.disk.DiskFileItem))
+  (:use clojure.contrib.def
+        compojure.map-utils)
+  (:import [org.apache.commons.fileupload FileUpload RequestContext]
+           [org.apache.commons.fileupload.disk DiskFileItemFactory DiskFileItem]))
 
 (defn multipart-form?
   "Does a request have a multipart form?"
diff --git a/src/compojure/http/request.clj b/src/compojure/http/request.clj
@@ -8,14 +8,14 @@
 
 (ns compojure.http.request
   "Functions for pulling useful data out of a HTTP request map."
-  (:use compojure.control)
-  (:use compojure.encodings)
-  (:use compojure.map-utils)
-  (:use compojure.str-utils)
-  (:use clojure.contrib.duck-streams)
-  (:use clojure.contrib.str-utils)
-  (:import java.net.URLDecoder)
-  (:import java.io.InputStreamReader))
+  (:use compojure.control
+        compojure.encodings
+        compojure.map-utils
+        compojure.str-utils
+        clojure.contrib.duck-streams
+        clojure.contrib.str-utils)
+  (:import java.net.URLDecoder
+           java.io.InputStreamReader))
 
 (defn- parse-params
   "Parse parameters from a string into a map."
diff --git a/src/compojure/http/response.clj b/src/compojure/http/response.clj
@@ -8,16 +8,16 @@
 
 (ns compojure.http.response
   "Parse a Compojure route return value into a HTTP response map."
-  (:use clojure.contrib.def)
-  (:use compojure.http.helpers)
-  (:import clojure.lang.Fn)
-  (:import clojure.lang.IPersistentVector)
-  (:import java.util.Map)
-  (:import clojure.lang.ISeq)
-  (:import java.io.File)
-  (:import java.io.InputStream)
-  (:import java.net.URL)
-  (:import clojure.lang.Keyword))
+  (:use clojure.contrib.def
+        compojure.http.helpers)
+  (:import clojure.lang.Fn
+           clojure.lang.IPersistentVector
+           java.util.Map
+           clojure.lang.ISeq
+           java.io.File
+           java.io.InputStream
+           java.net.URL
+           clojure.lang.Keyword))
 
 (defmulti update-response
   "Update a response with an object. The type of object determines how the
diff --git a/src/compojure/http/routes.clj b/src/compojure/http/routes.clj
@@ -10,15 +10,15 @@
   "Macros and functions for compiling routes in the form (method path & body)
    into stand-alone functions that return the return value of the body, or the
    keyword :next if they don't match."
-  (:use compojure.http.request)
-  (:use compojure.http.response)
-  (:use compojure.http.session)
-  (:use compojure.str-utils)
-  (:use compojure.map-utils)
-  (:use compojure.control)
-  (:use compojure.encodings)
-  (:import java.util.regex.Pattern)
-  (:import java.util.Map))
+  (:use compojure.http.request
+        compojure.http.response
+        compojure.http.session
+        compojure.str-utils
+        compojure.map-utils
+        compojure.control
+        compojure.encodings)
+  (:import java.util.regex.Pattern
+           java.util.Map))
 
 ;; Functions for lexing a string
 
diff --git a/src/compojure/http/servlet.clj b/src/compojure/http/servlet.clj
@@ -8,18 +8,13 @@
 
 (ns compojure.http.servlet
   "Functions for interfacing Compojure with the Java servlet standard."
-  (:use compojure.http.routes)
-  (:use compojure.http.request)
-  (:import java.io.File)
-  (:import java.io.InputStream)
-  (:import java.io.FileInputStream)
-  (:import java.util.Map$Entry)
-  (:import javax.servlet.http.Cookie)
-  (:import javax.servlet.http.HttpServlet)
-  (:import javax.servlet.http.HttpServletRequest)
-  (:import javax.servlet.http.HttpServletResponse)
-  (:import javax.servlet.ServletContext)
-  (:import org.apache.commons.io.IOUtils))
+  (:use compojure.http.routes
+        compojure.http.request)
+  (:import [java.io File InputStream FileInputStream]
+           java.util.Map$Entry
+           [javax.servlet.http Cookie HttpServlet HttpServletRequest HttpServletResponse]
+           javax.servlet.ServletContext
+           org.apache.commons.io.IOUtils))
 
 ;; Functions to pull information from the request object
 
diff --git a/src/compojure/http/session.clj b/src/compojure/http/session.clj
@@ -8,13 +8,13 @@
 
 (ns compojure.http.session
   "Functions for creating and updating HTTP sessions."
-  (:use compojure.str-utils)
-  (:use compojure.http.helpers)
-  (:use compojure.http.request)
-  (:use compojure.http.response)
-  (:use compojure.encodings)
-  (:use compojure.crypto)
-  (:use clojure.contrib.except))
+  (:use compojure.str-utils
+        compojure.http.helpers
+        compojure.http.request
+        compojure.http.response
+        compojure.encodings
+        compojure.crypto
+        clojure.contrib.except))
 
 ;; Override these mulitmethods to create your own session storage.
 ;; Uses the Compojure repository pattern.
diff --git a/src/compojure/server/grizzly.clj b/src/compojure/server/grizzly.clj
@@ -9,11 +9,11 @@
 (ns compojure.server.grizzly
   "Clojure interface to start an embedded Grizzly server. To compile, use:
    ant -Dwith.grizzly"
-  (:use compojure.control)
-  (:use compojure.server.common)
-  (:import javax.servlet.Servlet)
-  (:import com.sun.grizzly.http.embed.GrizzlyWebServer)
-  (:import com.sun.grizzly.http.servlet.ServletAdapter))
+  (:use compojure.control
+        compojure.server.common)
+  (:import javax.servlet.Servlet
+           com.sun.grizzly.http.embed.GrizzlyWebServer
+           com.sun.grizzly.http.servlet.ServletAdapter))
 
 (defn #^ServletAdapter servlet-adapter
   "Wrap a servlet in a ServletAdapter object with a supplied set of parameters
diff --git a/src/compojure/server/jetty.clj b/src/compojure/server/jetty.clj
@@ -8,13 +8,12 @@
 
 (ns compojure.server.jetty
   "Clojure interface to start an embedded Jetty server."
-  (:use compojure.control)
-  (:use compojure.server.common)
-  (:import org.mortbay.jetty.Server)
-  (:import org.mortbay.jetty.servlet.Context)
-  (:import org.mortbay.jetty.servlet.ServletHolder)
-  (:import org.mortbay.jetty.bio.SocketConnector)
-  (:import org.mortbay.jetty.security.SslSocketConnector))
+  (:use compojure.control
+        compojure.server.common)
+  (:import org.mortbay.jetty.Server
+           [org.mortbay.jetty.servlet Context ServletHolder]
+           org.mortbay.jetty.bio.SocketConnector
+           org.mortbay.jetty.security.SslSocketConnector))
 
 (defn servlet-holder
   "Wrap a servlet in a ServletHolder object with a supplied set of parameters
diff --git a/src/compojure/str_utils.clj b/src/compojure/str_utils.clj
@@ -8,8 +8,8 @@
 
 (ns compojure.str-utils
   "Utility functions for manipulating strings."
-  (:use clojure.contrib.seq-utils)
-  (:use clojure.contrib.str-utils)
+  (:use clojure.contrib.seq-utils
+        clojure.contrib.str-utils)
   (:import clojure.lang.Named))
 
 (defn escape
diff --git a/src/compojure/validation.clj b/src/compojure/validation.clj
@@ -8,10 +8,10 @@
 
 (ns compojure.validation
   "Functions for validating form parameters."
-  (:use compojure.control)
-  (:use compojure.html.form-helpers)
-  (:use compojure.html.page-helpers)
-  (:use clojure.contrib.def))
+  (:use compojure.control
+        compojure.html.form-helpers
+        compojure.html.page-helpers
+        clojure.contrib.def))
 
 (defvar *errors* {}
   "Var containing validation errors.")
