--- /dev/null	2018-01-17 13:52:03.000000000 -0800
+++ new/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByTooltipButtonLookup.java	2018-01-17 13:52:03.000000000 -0800
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.jemmy.swt.lookup;
+
+import org.eclipse.swt.widgets.Button;
+import org.jemmy.resources.StringComparePolicy;
+
+
+public class ByTooltipButtonLookup<T extends Button> extends ByStringQueueLookup<T> {
+	public ByTooltipButtonLookup(String text) {
+        super(text);
+    }
+
+    public ByTooltipButtonLookup(String text, StringComparePolicy policy) {
+        super(text, policy);
+    }
+    
+	@Override
+	public String getText(final T control) {
+		return control.getToolTipText();
+	}
+
+}