feat: add IMainWindow#getSelectedText

- Introduce API IMainWindow#getSelectedText - MainWindow#getSelectedText calls MainWindowUI.getTrimmedSelectedTextInMainWindow as implementation - Menu handler use it - SearchWindowManager#createSearch use it Signed-off-by: Hiroshi Miura <[email protected]>
omegat-org · Jun 15, 2024 · 16e7c5e · 16e7c5e
1 parent 190cfae
commit 16e7c5e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/src/org/omegat/gui/main/IMainWindow.java b/src/org/omegat/gui/main/IMainWindow.java
@@ -195,6 +195,10 @@ public interface IMainWindow {
  */
  Cursor getCursor();
 
+ default String getSelectedText() {
+ return "";
+ }
+
  /**
  * Retrieve main manu instance.
  */

diff --git a/src/org/omegat/gui/main/MainWindow.java b/src/org/omegat/gui/main/MainWindow.java
@@ -295,6 +295,11 @@ public Cursor getCursor() {
  return applicationFrame.getCursor();
  }
 
+ @Override
+ public String getSelectedText() {
+ return MainWindowUI.getTrimmedSelectedTextInMainWindow(this);
+ }
+
  /**
  * Sets the title of the main window appropriately
  */

diff --git a/src/org/omegat/gui/main/MainWindowMenuHandler.java b/src/org/omegat/gui/main/MainWindowMenuHandler.java
@@ -446,7 +446,10 @@ void findInProjectReuseLastWindow() {
  if (!Core.getProject().isProjectLoaded()) {
  return;
  }
- String text = MainWindowUI.getTrimmedSelectedTextInMainWindow();
+ String text = Core.getMainWindow().getSelectedText();
+ if (text == null) {
+ return;
+ }
  if (!SearchWindowManager.reuseSearchWindow(text)) {
  SearchWindowManager.createSearchWindow(SearchMode.SEARCH, text);
  }

diff --git a/src/org/omegat/gui/main/MainWindowUI.java b/src/org/omegat/gui/main/MainWindowUI.java
@@ -262,9 +262,9 @@ public static void resetDesktopLayout(MainWindow mainWindow) {
  }
  }
 
- public static String getTrimmedSelectedTextInMainWindow() {
+ public static String getTrimmedSelectedTextInMainWindow(MainWindow mainWindow) {
  String selection = null;
- Component component = Core.getMainWindow().getApplicationFrame().getMostRecentFocusOwner();
+ Component component = mainWindow.getApplicationFrame().getMostRecentFocusOwner();
  if (component instanceof JTextComponent) {
  selection = ((JTextComponent) component).getSelectedText();
  if (!StringUtil.isEmpty(selection)) {

diff --git a/src/org/omegat/gui/search/SearchWindowManager.java b/src/org/omegat/gui/search/SearchWindowManager.java
@@ -25,8 +25,8 @@
 
 package org.omegat.gui.search;
 
+import org.omegat.core.Core;
 import org.omegat.core.search.SearchMode;
-import org.omegat.gui.main.MainWindowUI;
 
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -41,7 +41,8 @@ public final class SearchWindowManager {
  private static final List<SearchWindowController> searches = new ArrayList<>();
 
  public static void createSearchWindow(SearchMode mode) {
- createSearchWindow(mode, MainWindowUI.getTrimmedSelectedTextInMainWindow());
+ String text = Core.getMainWindow().getSelectedText();
+ createSearchWindow(mode, text);
  }
 
  public static void createSearchWindow(SearchMode mode, String query) {