Merge "logcat: Support searching through the message list."

2 files changed, 16 insertions, 0 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/LogCatView.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/LogCatView.java
index bf14de3..3514db0 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/LogCatView.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/LogCatView.java
@@ -81,6 +81,14 @@ public class LogCatView extends SelectionDependentViewPart {
                 mLogCatPanel.selectAll();
             }
         });
+
+        actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(),
+                new Action("Find") {
+            @Override
+            public void run() {
+                mLogCatPanel.showFindDialog();
+            }
+        });
     }
 
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/MonitorActionBarAdvisor.java b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/MonitorActionBarAdvisor.java
index 4cf7a94..e31e45e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/MonitorActionBarAdvisor.java
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/MonitorActionBarAdvisor.java
@@ -25,11 +25,14 @@ import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
+import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
+import org.eclipse.ui.internal.WorkbenchImages;
 
 public class MonitorActionBarAdvisor extends ActionBarAdvisor {
     private IWorkbenchAction mQuitAction;
     private IWorkbenchAction mCopyAction;
     private IWorkbenchAction mSelectAllAction;
+    private IWorkbenchAction mFindAction;
     private IWorkbenchAction mOpenPerspectiveAction;
     private IWorkbenchAction mResetPerspectiveAction;
     private IWorkbenchAction mPreferencesAction;
@@ -50,6 +53,10 @@ public class MonitorActionBarAdvisor extends ActionBarAdvisor {
         mSelectAllAction = ActionFactory.SELECT_ALL.create(window);
         register(mSelectAllAction);
 
+        mFindAction = ActionFactory.FIND.create(window);
+        mFindAction.setText("Find...");     // replace the default "Find and Replace..."
+        register(mFindAction);
+
         mOpenPerspectiveAction = ActionFactory.OPEN_PERSPECTIVE_DIALOG.create(window);
         register(mOpenPerspectiveAction);
 
@@ -83,6 +90,7 @@ public class MonitorActionBarAdvisor extends ActionBarAdvisor {
         // contents of Edit menu
         editMenu.add(mCopyAction);
         editMenu.add(mSelectAllAction);
+        editMenu.add(mFindAction);
 
         // contents of Window menu
         windowMenu.add(mOpenPerspectiveAction);