diff options
| author | Ben Smith-Mannschott <bsmith.occs@gmail.com> | 2010-08-28 11:22:22 +0200 |
|---|---|---|
| committer | Stuart Sierra <mail@stuartsierra.com> | 2010-09-03 12:23:37 -0400 |
| commit | fe4ed311166677cd571d23774171af1d830f7fc5 (patch) | |
| tree | 70d6c519b8afa7bbee51bb8c3e243d4f3903b2e2 /modules/miglayout | |
| parent | 034d3d1703d139117b38fe6a10f552e23aa48b5c (diff) | |
remove deprecated clojure.contrib.string
Since clojure.contrib.string is used by other submodules, some changes
were required:
- gen-html-docs and prxml needed changes because of functions were
renamed or arguments reordered when promoted to clojure.string.
- jmx, json, miglayout, prxml and sql gained a private one-argument
implementation of as-str.
- repl-utils gained a private copy of c.c.string/partition, named
spartition.
- repl-utils replaced a call to c.c.string/substring? with a call to
the java String method '.contains' (with swapped argument order).
Signed-off-by: Stuart Sierra <mail@stuartsierra.com>
Diffstat (limited to 'modules/miglayout')
| -rw-r--r-- | modules/miglayout/pom.xml | 5 | ||||
| -rw-r--r-- | modules/miglayout/src/main/clojure/clojure/contrib/miglayout/internal.clj | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/miglayout/pom.xml b/modules/miglayout/pom.xml index 22328c7e..b7e3b856 100644 --- a/modules/miglayout/pom.xml +++ b/modules/miglayout/pom.xml @@ -27,10 +27,5 @@ <artifactId>fcase</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.clojure.contrib</groupId> - <artifactId>string</artifactId> - <version>1.3.0-SNAPSHOT</version> - </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/modules/miglayout/src/main/clojure/clojure/contrib/miglayout/internal.clj b/modules/miglayout/src/main/clojure/clojure/contrib/miglayout/internal.clj index f6e6431f..86cbac12 100644 --- a/modules/miglayout/src/main/clojure/clojure/contrib/miglayout/internal.clj +++ b/modules/miglayout/src/main/clojure/clojure/contrib/miglayout/internal.clj @@ -20,8 +20,7 @@ (:use (clojure.contrib [core :only (new-by-name)] [except :only (throwf)] - [fcase :only (fcase)] - [string :only (as-str)]))) + [fcase :only (fcase)]))) (def MigLayout "net.miginfocom.swing.MigLayout") (def LayoutCallback "net.miginfocom.layout.LayoutCallback") @@ -44,6 +43,12 @@ (throwf IllegalArgumentException "unrecognized constraint: %s (%s)" c (class c)))]) +(defn- as-str + [x] + (if (instance? clojure.lang.Named x) + (name x) + (str x))) + (defn format-constraints "Returns a string representing all the constraints for one keyword-item or component formatted for miglayout." |