Adjust RMap to Luna

3 files changed, 12 insertions, 14 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
index ed2f453156..be2edb19ce 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.tests
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.tests.bundle.OM$Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
@@ -40,13 +40,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.dawn.tests;version="1.0.100";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.bugzillas;version="1.0.100";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.bundle;version="1.0.100";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.common;version="1.0.100";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui;version="1.0.100";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui.emf;version="1.0.100";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui.gmf;version="1.0.100";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui.util;version="1.0.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.dawn.tests;version="1.0.200";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.bugzillas;version="1.0.200";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.bundle;version="1.0.200";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.common;version="1.0.200";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui;version="1.0.200";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui.emf;version="1.0.200";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui.gmf;version="1.0.200";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui.util;version="1.0.200";x-internal:=true
 Import-Package: org.antlr.runtime;version="[3.0.0,4.0.0)"
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEMFEditorBot.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEMFEditorBot.java
index 397c5ce65e..09de562615 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEMFEditorBot.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEMFEditorBot.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.dawn.tests.ui.util;
 
 import static org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory.withPartName;
 import static org.eclipse.swtbot.eclipse.finder.waits.Conditions.waitForEditor;
-import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.core.AllOf.allOf;
 
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.eclipse.finder.waits.WaitForEditor;
@@ -32,7 +32,6 @@ public class DawnEMFEditorBot extends SWTWorkbenchBot
     return emfEditor(fileName, 0);
   }
 
-  @SuppressWarnings("unchecked")
   public DawnSWTBotEMFEditor emfEditor(String fileName, int index) throws WidgetNotFoundException
   {
     Matcher<IEditorReference> withPartName = withPartName(fileName);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
index 3f32aa09cb..102bfbbd30 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
@@ -11,8 +11,8 @@
 package org.eclipse.emf.cdo.dawn.tests.ui.util;
 
 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.core.AllOf.allOf;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
 
 import org.eclipse.emf.cdo.dawn.examples.acore.AClass;
 import org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AClassEditPart;
@@ -313,7 +313,6 @@ public class DawnSWTBotUtil
     return bot.activeView();
   }
 
-  @SuppressWarnings("unchecked")
   public static SWTBotMenu findContextMenu(final AbstractSWTBot<?> bot, final String... texts)
   {
     final Matcher<?>[] matchers = new Matcher<?>[texts.length];