Skip to content

Commit

Permalink
Pulled in kotarak's forms changes. Added a minimal test to exercise e…
Browse files Browse the repository at this point in the history
…verything and fixed a couple bugs.
  • Loading branch information
daveray committed Jul 6, 2011
1 parent 80d2ed4 commit 1e4c10e
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/seesaw/forms.clj
Expand Up @@ -35,7 +35,7 @@
(reify
ComponentSpec
(append [this builder]
(.append builder component column-span))))
(.append builder (seesaw.core/to-widget component true) column-span))))

(defn next-line
"Continue with the nth next line in the builder."
Expand All @@ -56,12 +56,12 @@
(.nextLine builder n)))))

(defn title
"Adds the given titel to the form."
"Adds the given title to the form."
[title]
(reify
ComponentSpec
(append [this builder]
(.appendTitle builder this))))
(.appendTitle builder title))))

(defn separator
"Adds a separator with an optional label to the form."
Expand Down
35 changes: 35 additions & 0 deletions test/seesaw/test/forms.clj
@@ -0,0 +1,35 @@
; Copyright (c) Dave Ray, 2011. All rights reserved.

; The use and distribution terms for this software are covered by the
; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
; which can be found in the file epl-v10.html at the root of this
; distribution.
; By using this software in any fashion, you are agreeing to be bound by
; the terms of this license.
; You must not remove this notice, or any other, from this software.

(ns seesaw.test.forms
(:use [seesaw [core :exclude (separator)] forms])
(:use [lazytest.describe :only (describe it testing)]
[lazytest.expect :only (expect)]))

(describe forms-panel
(it "Creates a JPanel using a JGoodies form builder"
(let [p (forms-panel
"pref,4dlu,80dlu,8dlu,pref,4dlu,80dlu"
:column-groups [[1 5]]
:leading-column-offset 0
:line-gap-size (com.jgoodies.forms.layout.Sizes/pixel 5)
:items [(title "JGoodies forms test")
(separator "General")
"Company" (span (text) 5)
"Contact" (span (text) 5)
"Click here" (next-column) (span (action :name "A button") 5)
(next-line)
(separator "Propeller")
"PTI/kW" (text :columns 10) "Power/kW" (text :columns 10)
"R/mm" (text :columns 10) "D/mm" (text :columns 10)
(separator)]
:default-dialog-border? true)]
(expect (instance? javax.swing.JPanel p)))))

0 comments on commit 1e4c10e

Please sign in to comment.