- fixed org.hamcrest dependency error which occurs when doing a fresh set up of...

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 4bbfb99869ccec5811b826f348510d298a330511..047cc98ec3188a6a3aef880a7ffbaebca0ac1286 100644 (file)
--- 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 8fe523c707fe7aea274ea6b68fbdf176a2fefaf7..b6a7172ed84c91ebf64ae47a52ed285192972ce7 100644 (file)
--- 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;\r
 \r
 import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withMnemonic;\r
-import static org.hamcrest.Matchers.allOf;\r
-import static org.hamcrest.Matchers.instanceOf;\r
+import static org.hamcrest.CoreMatchers.allOf;\r
+import static org.hamcrest.CoreMatchers.instanceOf;\r
 \r
 import java.util.Arrays;\r
 \r
@@ -34,7 +34,8 @@ public class ContextMenuHelper {
                // show\r
                final MenuItem menuItem = UIThreadRunnable\r
                .syncExec(new WidgetResult<MenuItem>() {\r
-                       public MenuItem run() {\r
+                       @Override\r
+            public MenuItem run() {\r
                                MenuItem menuItem = null;\r
                                Control control = (Control) bot.widget;\r
                                Menu menu = control.getMenu();\r
@@ -63,7 +64,8 @@ public class ContextMenuHelper {
 \r
                // hide\r
                UIThreadRunnable.syncExec(new VoidResult() {\r
-                       public void run() {\r
+                       @Override\r
+            public void run() {\r
                                hide(menuItem.getParent());\r
                        }\r
                });\r
@@ -91,7 +93,8 @@ public class ContextMenuHelper {
                event.type = SWT.Selection;\r
 \r
                UIThreadRunnable.asyncExec(menuItem.getDisplay(), new VoidResult() {\r
-                       public void run() {\r
+                       @Override\r
+            public void run() {\r
                                menuItem.notifyListeners(SWT.Selection, event);\r
                        }\r
                });\r