SwingSearchBar: rename search text field

ctrueden · ctrueden · commit aae915aa8b10 · 2017-12-21T13:21:18.000-06:00
The phrase "search term" typically implies a single token,
with a search query consisting of one or more terms.
diff --git a/src/main/java/org/scijava/ui/swing/search/SwingSearchBar.java b/src/main/java/org/scijava/ui/swing/search/SwingSearchBar.java
@@ -124,11 +124,12 @@ public class SwingSearchBar extends JTextField {
 
 	private final JButton closeButton;
 
+	/** Currently active text search. */
+	private String searchText;
+
 	/** The maximum number of results per search category. */
 	private int resultLimit = 8;
 
-	private String searchTerm;
-
 	public SwingSearchBar(final Context context) {
 		super(DEFAULT_MESSAGE, 12);
 		context.inject(this);
@@ -454,14 +455,14 @@ public void mouseMoved(final MouseEvent e) {
 				else {
 					// populate details pane
 					detailsTitle.setText("<html><h2>" + highlightSearchUnderline(
-						escapeHtml(result.name()), searchTerm) + "</h2>");
+						escapeHtml(result.name()), searchText) + "</h2>");
 					detailsProps.removeAll();
 					result.properties().forEach((k, v) -> {
 						if (v != "") {
 							if (k == null) {
 								final JTextPane textPane = new JTextPane();
 								textPane.setContentType("text/html");
-								textPane.setText(highlightSearchBold(v, searchTerm));
+								textPane.setText(highlightSearchBold(v, searchText));
 								final Font font = UIManager.getFont("Label.font");
 								final String bodyRule = "body { font-family: " + font
 									.getFamily() + "; " + "font-size: " + font.getSize() +
@@ -540,7 +541,7 @@ public void mouseMoved(final MouseEvent e) {
 
 		public void search(final String text) {
 			assertDispatchThread();
-			searchTerm = text;
+			searchText = text;
 			operation.search(text.toLowerCase());
 		}
 
@@ -639,7 +640,7 @@ private void rebuild() {
 			resultsList.setModel(listModel);
 
 			// TODO: Improve retainment of previous selection.
-			if (!searchTerm.isEmpty()) {
+			if (!searchText.isEmpty()) {
 				if (previous == null) {
 					if (listModel.getSize() > 0) {
 						resultsList.setSelectedIndex(firstResultIndex());
