Mercurial > cgi-bin > hgweb.cgi > ClipMan
comparison src/name/blackcap/clipman/SearchDialog.kt @ 47:19d9da731c43
Recoded; cleaned up root namespace, removed race conditions.
author | David Barts <n5jrn@me.com> |
---|---|
date | Sun, 12 Apr 2020 14:31:06 -0700 |
parents | 08eaae2aaf76 |
children |
comparison
equal
deleted
inserted
replaced
46:88066346f129 | 47:19d9da731c43 |
---|---|
9 import java.awt.event.ActionListener | 9 import java.awt.event.ActionListener |
10 import javax.swing.* | 10 import javax.swing.* |
11 import javax.swing.event.DocumentEvent | 11 import javax.swing.event.DocumentEvent |
12 import javax.swing.event.DocumentListener | 12 import javax.swing.event.DocumentListener |
13 | 13 |
14 class SearchDialog: JDialog(frame.v), ActionListener, DocumentListener { | 14 class SearchDialog: JDialog(Application.frame), ActionListener, DocumentListener { |
15 /* the search term */ | 15 /* the search term */ |
16 private val _searchFor = JTextField(25).also { | 16 private val _searchFor = JTextField(25).also { |
17 it.border = BorderFactory.createLineBorder(Color.GRAY, 1) | 17 it.border = BorderFactory.createLineBorder(Color.GRAY, 1) |
18 it.horizontalAlignment = JTextField.LEFT | 18 it.horizontalAlignment = JTextField.LEFT |
19 it.alignmentX = JTextField.LEFT_ALIGNMENT | 19 it.alignmentX = JTextField.LEFT_ALIGNMENT |
153 if (searchFor.isEmpty()) { | 153 if (searchFor.isEmpty()) { |
154 Toolkit.getDefaultToolkit().beep() | 154 Toolkit.getDefaultToolkit().beep() |
155 origin = null | 155 origin = null |
156 return | 156 return |
157 } | 157 } |
158 fun doFind(o: PasteboardQueue.Offset?) = queue.v.find(searchFor, | 158 fun doFind(o: PasteboardQueue.Offset?) = Application.queue.find(searchFor, |
159 direction = direction, foldCase = ignoreCase, origin = o) | 159 direction = direction, foldCase = ignoreCase, origin = o) |
160 var result = doFind(origin) | 160 var result = doFind(origin) |
161 if (result == null && origin != null && autoWrap) { | 161 if (result == null && origin != null && autoWrap) { |
162 result = doFind(null) | 162 result = doFind(null) |
163 } | 163 } |
185 } | 185 } |
186 } | 186 } |
187 override fun insertUpdate(e: DocumentEvent) = changedUpdate(e) | 187 override fun insertUpdate(e: DocumentEvent) = changedUpdate(e) |
188 override fun removeUpdate(e: DocumentEvent) = changedUpdate(e) | 188 override fun removeUpdate(e: DocumentEvent) = changedUpdate(e) |
189 } | 189 } |
190 | |
191 val searchDialog = SearchDialog() |