From ddb07c7dfff5cf1562007ed51d45a8056395e1eb Mon Sep 17 00:00:00 2001
From: Wolf Posdorfer <mordredd666@gmail.com>
Date: Thu, 28 Apr 2011 16:09:05 +0000
Subject: [PATCH] SPARK-1300, removing notes and tasks buttons -> place them in
 "Actions" menu

dont start looking for provided strings in whole name unless more than 3 letters entered
on a huge roster it takes forever to check 500contacts if they contain "o"

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12296 b35dd754-fafc-0310-a699-88a17e54d16e
---
 .../spark/component/JContactItemField.java    |  4 +--
 .../plugin/scratchpad/ScratchPadPlugin.java   | 26 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/java/org/jivesoftware/spark/component/JContactItemField.java b/src/java/org/jivesoftware/spark/component/JContactItemField.java
index ecfc1a01..87b18edf 100644
--- a/src/java/org/jivesoftware/spark/component/JContactItemField.java
+++ b/src/java/org/jivesoftware/spark/component/JContactItemField.java
@@ -158,12 +158,12 @@ public class JContactItemField extends JPanel {
 
         String typedItem = textField.getText();
 
-        final List<ContactItem> validItems = new ArrayList<ContactItem>();
+	final List<ContactItem> validItems = new ArrayList<ContactItem>();
 	for (ContactItem contactItem : items) {
 	    String nickname = contactItem.getDisplayName().toLowerCase();
 	    if (nickname.startsWith(typedItem.toLowerCase())) {
 		validItems.add(contactItem);
-	    } else if (nickname.contains(typedItem.toLowerCase())) {
+	    } else if (typedItem.length() > 2 && nickname.contains(typedItem.toLowerCase())) {
 		validItems.add(contactItem);
 	    }
 	}
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/scratchpad/ScratchPadPlugin.java b/src/java/org/jivesoftware/sparkimpl/plugin/scratchpad/ScratchPadPlugin.java
index b43870e8..02254b6b 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/scratchpad/ScratchPadPlugin.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/scratchpad/ScratchPadPlugin.java
@@ -40,6 +40,9 @@ import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
@@ -124,29 +127,30 @@ public class ScratchPadPlugin implements Plugin {
             }
         }
 
-        RolloverButton taskButton = new RolloverButton(SparkRes.getImageIcon(SparkRes.DESKTOP_IMAGE));
-        RolloverButton notesButton = new RolloverButton(SparkRes.getImageIcon(SparkRes.DOCUMENT_16x16));
-        taskButton.setToolTipText(Res.getString("button.view.tasklist"));
-        notesButton.setToolTipText(Res.getString("button.view.notes"));
+        
+        JMenuItem taskMenu = new JMenuItem(Res.getString("button.view.tasklist"),
+        	SparkRes.getImageIcon(SparkRes.DESKTOP_IMAGE));
+        
+        JMenuItem notesMenu = new JMenuItem(Res.getString("button.view.notes"),
+        	SparkRes.getImageIcon(SparkRes.DOCUMENT_16x16));
 
-        taskButton.addActionListener(new ActionListener() {
+        taskMenu.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 showTaskList();
             }
         });
 
-        notesButton.addActionListener(new ActionListener() {
+        notesMenu.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 retrieveNotes();
             }
         });
 
         // Add To toolbar
-        SparkManager.getWorkspace().getCommandPanel().add(taskButton, index);
-        SparkManager.getWorkspace().getCommandPanel().add(notesButton, index);
-        SparkManager.getWorkspace().getCommandPanel().validate();
-        SparkManager.getWorkspace().getCommandPanel().invalidate();
-        SparkManager.getWorkspace().getCommandPanel().repaint();
+      JMenuBar menubar =  SparkManager.getMainWindow().getMenu();
+      JMenu menu =  menubar.getMenu(3);
+      menu.add(taskMenu);
+      menu.add(notesMenu);
 
         // Start notifications.
         new TaskNotification();