cleaned up quick search view

2 files changed, 25 insertions, 24 deletions

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java
index a56aec99259..b31b023bad7 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java
@@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Widget;
  * @author Roberto E. Escobar

  */

 public class SearchComposite extends Composite implements Listener {

-   private static final String CLEAR_HISTORY_TOOLTIP = "Clears search history";

    private static final String SEARCH_BUTTON_TOOLTIP = "Executes search";

    private static final String SEARCH_COMBO_TOOLTIP =

          "Enter word(s) to search for or select historical value from pull-down on the right.";

@@ -77,6 +76,8 @@ public class SearchComposite extends Composite implements Listener {
       group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

       group.setText("Enter Search String");

 

+      createButtonBar(group);

+

       this.searchArea = new Combo(group, SWT.BORDER);

       this.searchArea.setFont(getFont());

       this.searchArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

@@ -111,7 +112,6 @@ public class SearchComposite extends Composite implements Listener {
       });

 

       this.searchArea.setToolTipText(SEARCH_COMBO_TOOLTIP);

-      createButtonBar(group);

    }

 

    private void createButtonBar(Composite parent) {

@@ -131,29 +131,12 @@ public class SearchComposite extends Composite implements Listener {
       this.executeSearch.setEnabled(false);

       this.executeSearch.setFont(getFont());

       this.executeSearch.setToolTipText(SEARCH_BUTTON_TOOLTIP);

+   }

 

-      Composite composite = new Composite(parent, SWT.NONE);

-      GridLayout gL = new GridLayout();

-      gL.marginWidth = 0;

-      gL.marginHeight = 0;

-      composite.setLayout(gL);

-      composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

-

-      this.clear = new Button(composite, SWT.NONE);

-      this.clear.setText("Clear History");

-      this.clear.addSelectionListener(new SelectionAdapter() {

-         @Override

-         public void widgetSelected(SelectionEvent e) {

-            if (searchArea.getItemCount() > 0) {

-               searchArea.removeAll();

-            }

-         }

-      });

-      this.clear.addListener(SWT.Selection, this);

-      this.clear.setEnabled(false);

-      this.clear.setFont(getFont());

-      this.clear.setToolTipText(CLEAR_HISTORY_TOOLTIP);

-

+   public void clearHistory() {

+      if (searchArea.getItemCount() > 0) {

+         searchArea.removeAll();

+      }

    }

 

    private void updateFromSourceField() {

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
index 2f63198aeda..d1a8c79abd6 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
@@ -15,7 +15,10 @@ import java.net.URLDecoder;
 import java.net.URLEncoder;

 import java.util.ArrayList;

 import java.util.List;

+import org.eclipse.jface.action.Action;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.ui.skynet.FrameworkImage;

+import org.eclipse.osee.framework.ui.skynet.ImageManager;

 import org.eclipse.osee.framework.ui.skynet.OseeContributionItem;

 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;

 import org.eclipse.osee.framework.ui.skynet.ats.IActionable;

@@ -160,6 +163,21 @@ public class QuickSearchView extends ViewPart implements IActionable, Listener {
       branchLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

       branchLabel.setText("");

 

+      createClearHistoryAction();

+   }

+

+   private void createClearHistoryAction() {

+      Action action = new Action("Clear Search History") {

+         @Override

+         public void run() {

+            if (searchComposite != null) {

+               searchComposite.clearHistory();

+            }

+         }

+      };

+      action.setToolTipText("Clears search history");

+      action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.REMOVE));

+      getViewSite().getActionBars().getMenuManager().add(action);

    }

 

    private void createActions() {