Fixing yet another bug with search backwards and the Find and Replace toolbars. Also making 'direction' panel keep its preferred size even with the new 'Wrap' checkbox

Author: bobbylight

RSTAUI/src/main/java/org/fife/rsta/ui/search/FindDialog.java

@@ -137,7 +137,9 @@ private void init(SearchListener listener) {
 		temp = new JPanel(new BorderLayout());
 		bottomPanel.setBorder(UIUtil.getEmpty5Border());
 		temp.add(searchConditionsPanel, BorderLayout.LINE_START);
-		temp.add(dirPanel);
+		JPanel temp2 = new JPanel(new BorderLayout());
+		temp2.add(dirPanel, BorderLayout.NORTH);
+		temp.add(temp2);
 		bottomPanel.add(temp, BorderLayout.LINE_START);
 
 		// Now, make a panel containing all the above stuff.

RSTAUI/src/main/java/org/fife/rsta/ui/search/FindToolBar.java

@@ -93,7 +93,6 @@ public FindToolBar(SearchListener listener) {
 
 		// Keep focus in this component when tabbing through search controls
 		setFocusCycleRoot(true);
-		installKeyboardShortcuts();
 
 		markAllTimer = new Timer(300, new MarkAllEventNotifier());
 		markAllTimer.setRepeats(false);
@@ -467,7 +466,7 @@ else if (regexCheckBox.isSelected()) {
 	 * called whenever a new search context is installed on this tool bar
 	 * (which should practically be never).
 	 */
-	protected void initUIFromContext() {
+	private void initUIFromContext() {
 		if (findCombo==null) { // First time through, stuff not initialized yet
 			return;
 		}
@@ -483,40 +482,6 @@ protected void initUIFromContext() {
 	}
 
 
-	private void installKeyboardShortcuts() {
-
-		InputMap im = getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-		ActionMap am = getActionMap();
-
-		KeyStroke ks = KeyStroke.getKeyStroke("ENTER");
-		im.put(ks, "searchForward");
-		am.put("searchForward", new AbstractAction() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				doSearch(true);
-			}
-		});
-
-		// Shift+Enter and Ctrl+Enter both do a backwards search
-		int shift = InputEvent.SHIFT_MASK;
-		int ctrl = InputEvent.CTRL_MASK;
-		if (System.getProperty("os.name").toLowerCase().contains("os x")) {
-			ctrl = InputEvent.META_MASK;
-		}
-		ks = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, shift);
-		im.put(ks, "searchBackward");
-		ks = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, ctrl);
-		im.put(ks, "searchBackward");
-		am.put("searchBackward", new AbstractAction() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				doSearch(false);
-			}
-		});
-
-	}
-
-
 	/**
 	 * Makes the Enter key activate the button.  In Swing, this is a
 	 * complicated thing.  It's LAF-dependent whether or not this works
@@ -745,7 +710,7 @@ else if (SearchContext.PROPERTY_REPLACE_WITH.equals(prop)) {
 				}
 			}
 			else if (SearchContext.PROPERTY_SEARCH_WRAP.equals(prop)) {
-				boolean newValue = ((Boolean)e.getNewValue()).booleanValue();
+				boolean newValue = (Boolean)e.getNewValue();
 				wrapCheckBox.setSelected(newValue);
 			}
 

RSTAUI/src/main/java/org/fife/rsta/ui/search/ReplaceDialog.java

@@ -335,7 +335,10 @@ private void init(SearchListener listener) {
 		temp = new JPanel(new BorderLayout());
 		bottomPanel.setBorder(UIUtil.getEmpty5Border());
 		temp.add(searchConditionsPanel, BorderLayout.LINE_START);
-		temp.add(dirPanel);
+		temp.add(searchConditionsPanel, BorderLayout.LINE_START);
+		temp2 = new JPanel(new BorderLayout());
+		temp2.add(dirPanel, BorderLayout.NORTH);
+		temp.add(temp2);
 		bottomPanel.add(temp, BorderLayout.LINE_START);
 
 		// Now, make a panel containing all the above stuff.

RSTAUIDemo/src/main/java/org/fife/rsta/ui/demo/RSTAUIDemoApp.java

@@ -1,6 +1,6 @@
 package org.fife.rsta.ui.demo;
 
-import java.awt.BorderLayout;
+import java.awt.*;
 import java.awt.event.*;
 
 import javax.swing.*;
@@ -168,13 +168,13 @@ public void searchEvent(SearchEvent e) {
 				break;
 			case FIND:
 				result = SearchEngine.find(textArea, context);
-				if (!result.wasFound()) {
+				if (!result.wasFound() || result.isWrapped()) {
 					UIManager.getLookAndFeel().provideErrorFeedback(textArea);
 				}
 				break;
 			case REPLACE:
 				result = SearchEngine.replace(textArea, context);
-				if (!result.wasFound()) {
+				if (!result.wasFound() || result.isWrapped()) {
 					UIManager.getLookAndFeel().provideErrorFeedback(textArea);
 				}
 				break;