Refactor up() and down() methods to be less messy

Author: ctrueden

src/main/java/org/scijava/ui/swing/search/SwingSearchBar.java

@@ -391,31 +391,29 @@ private void update(final SearchEvent event) {
 		}
 
 		private void up() {
-			assertDispatchThread();
-			final int rowCount = resultsList.getModel().getSize();
-			if (rowCount == 0) return;
-			// Move upward in the list one element at a time, skipping headers.
-			int index = resultsList.getSelectedIndex();
-			do {
-				index = (index + rowCount - 1) % rowCount;
-			}
-			while (isHeader(result(index)));
-			select(index);
+			select(index -> (index + rowCount() - 1) % rowCount());
 		}
 
 		private void down() {
+			select(index -> (index + 1) % rowCount());
+		}
+
+		private void select(final Function<Integer, Integer> stepper) {
 			assertDispatchThread();
-			final int rowCount = resultsList.getModel().getSize();
-			if (rowCount == 0) return;
-			// Move downward in the list one element at a time, skipping headers.
+			if (rowCount() == 0) return;
+			// Step through the list, skipping headers.
 			int index = resultsList.getSelectedIndex();
 			do {
-				index = (index + 1) % rowCount;
+				index = stepper.apply(index);
 			}
 			while (isHeader(result(index)));
 			select(index);
 		}
 
+		private int rowCount() {
+			return resultsList.getModel().getSize();
+		}
+
 		/** Executes the default search action. */
 		private void execute() {
 			assertDispatchThread();
@@ -491,7 +489,7 @@ private SearchResult result(final int index) {
 
 		private int firstResultIndex() {
 			assertDispatchThread();
-			for (int i = 0; i < resultsList.getModel().getSize(); i++) {
+			for (int i = 0; i < rowCount(); i++) {
 				if (!isHeader(result(i))) return i;
 			}
 			return -1;