From 4bb0a32b1cd1e8850ef6ed3cbf3792582d7db3c1 Mon Sep 17 00:00:00 2001
From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Tue, 8 Oct 2013 11:23:45 +0000
Subject: [PATCH]  - fixed org.hamcrest dependency error which occurs when
 doing a fresh set up of the editor workspace

---
 eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF  |  1 +
 .../etaxonomy/taxeditor/test/ContextMenuHelper.java | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 4bbfb9986..047cc98ec 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -245,6 +245,7 @@ Export-Package: com.google.api,
  org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
  org.apache.xerces.dom,
  org.h2.jdbc,
+ org.hamcrest,
  org.hibernate,
  org.hibernate.annotations.common.reflection,
  org.hibernate.cache.internal,
diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/ContextMenuHelper.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/ContextMenuHelper.java
index 8fe523c70..b6a7172ed 100644
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/ContextMenuHelper.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/ContextMenuHelper.java
@@ -1,8 +1,8 @@
 package eu.etaxonomy.taxeditor.test;
 
 import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withMnemonic;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.instanceOf;
 
 import java.util.Arrays;
 
@@ -34,7 +34,8 @@ public class ContextMenuHelper {
 		// show
 		final MenuItem menuItem = UIThreadRunnable
 		.syncExec(new WidgetResult<MenuItem>() {
-			public MenuItem run() {
+			@Override
+            public MenuItem run() {
 				MenuItem menuItem = null;
 				Control control = (Control) bot.widget;
 				Menu menu = control.getMenu();
@@ -63,7 +64,8 @@ public class ContextMenuHelper {
 
 		// hide
 		UIThreadRunnable.syncExec(new VoidResult() {
-			public void run() {
+			@Override
+            public void run() {
 				hide(menuItem.getParent());
 			}
 		});
@@ -91,7 +93,8 @@ public class ContextMenuHelper {
 		event.type = SWT.Selection;
 
 		UIThreadRunnable.asyncExec(menuItem.getDisplay(), new VoidResult() {
-			public void run() {
+			@Override
+            public void run() {
 				menuItem.notifyListeners(SWT.Selection, event);
 			}
 		});
-- 
2.34.1