Merge pull request #164 from eclipse/task_159-Remove_PDETargetPlatf

159: Remove PDETargetPlatformUtils.setTargetPlatform()

features/org.eclipse.xsemantics.feature/feature.xml

@@ -48,6 +48,7 @@ Contributors:
    <requires>
       <import feature="org.eclipse.xtext.xbase" version="2.27.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.xtext.ui" version="2.27.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.pde.ui"/>
    </requires>
 
    <plugin

features/org.eclipse.xsemantics.tests.feature/feature.xml

@@ -44,78 +44,6 @@ Contributors:
          id="org.eclipse.xsemantics.implemented.examples.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.swtbot.eclipse"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.swtbot.ide"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rcp"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jdt"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.xsemantics.dsl.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xsemantics.example.fj"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xsemantics.example.fj.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xsemantics.ui.examples"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xsemantics.example.expressions.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xsemantics.example.fj.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xsemantics.dsl.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.emf.mwe2.lib"
          download-size="0"

releng/org.eclipse.xsemantics.releng/pom.xml

@@ -72,7 +72,6 @@ Contributors:
 		<module>../../features/org.eclipse.xsemantics.feature</module>
 		<module>../../features/org.eclipse.xsemantics.sdk</module>
 
-		<module>../../tests/org.eclipse.xsemantics.tests.pde.utils</module>
 		<module>../../features/org.eclipse.xsemantics.tests.feature</module>
 		<module>../../tests/org.eclipse.xsemantics.tests.swtbot</module>
 

tests/org.eclipse.xsemantics.dsl.ui.tests/META-INF/MANIFEST.MF

@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.xsemantics.dsl.ui,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit,
- org.eclipse.xsemantics.tests.pde.utils,
  org.eclipse.jdt.core;bundle-version="3.12.2",
  org.eclipse.xtext.common.types.ui,
  org.eclipse.xtext.testing,

tests/org.eclipse.xsemantics.dsl.ui.tests/pom.xml

@@ -63,6 +63,13 @@ Contributors:
 							<id>org.eclipse.jdt</id>
 							<versionRange>0.0.0</versionRange>
 						</requirement>
+						<!-- We specify our feature so that we're sure we're using also all the 
+							required software -->
+						<requirement>
+							<type>eclipse-feature</type>
+							<id>org.eclipse.xsemantics.feature</id>
+							<versionRange>0.0.0</versionRange>
+						</requirement>
 					</extraRequirements>
 				</dependency-resolution>
 			</configuration>

tests/org.eclipse.xsemantics.dsl.ui.tests/src/org/eclipse/xsemantics/dsl/tests/ui/contentassist/XsemanticsProposalProviderTest.xtend

@@ -11,14 +11,13 @@
 
 package org.eclipse.xsemantics.dsl.tests.ui.contentassist
 
+import org.eclipse.core.runtime.NullProgressMonitor
+import org.eclipse.emf.ecore.resource.ResourceSet
+import org.eclipse.jdt.core.IJavaProject
 import org.eclipse.xsemantics.dsl.tests.utils.ui.PluginProjectHelper
 import org.eclipse.xsemantics.dsl.ui.internal.DslActivator
 import org.eclipse.xsemantics.dsl.ui.tests.XsemanticsUiInjectorProvider
 import org.eclipse.xsemantics.runtime.XsemanticsRuntimeSystem
-import org.eclipse.xsemantics.tests.pde.utils.PDETargetPlatformUtils
-import org.eclipse.core.runtime.NullProgressMonitor
-import org.eclipse.emf.ecore.resource.ResourceSet
-import org.eclipse.jdt.core.IJavaProject
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.ui.testing.AbstractContentAssistTest
@@ -46,8 +45,6 @@ class XsemanticsProposalProviderTest extends
 
 	@BeforeClass
 	def static void setUp() {
-		PDETargetPlatformUtils.setTargetPlatform();
-
 		val injector = DslActivator.getInstance().getInjector(DslActivator.ORG_ECLIPSE_XSEMANTICS_DSL_XSEMANTICS);
 
 		val projectHelper = injector.getInstance(PluginProjectHelper)

tests/org.eclipse.xsemantics.dsl.ui.tests/src/org/eclipse/xsemantics/dsl/tests/ui/outline/XsemanticsOutlineTest.xtend

@@ -11,16 +11,14 @@
 
 package org.eclipse.xsemantics.dsl.tests.ui.outline
 
+import org.eclipse.core.runtime.CoreException
 import org.eclipse.xsemantics.dsl.tests.utils.ui.PluginProjectHelper
 import org.eclipse.xsemantics.dsl.ui.internal.DslActivator
 import org.eclipse.xsemantics.dsl.ui.tests.XsemanticsUiInjectorProvider
-import org.eclipse.xsemantics.tests.pde.utils.PDETargetPlatformUtils
-import org.eclipse.core.runtime.CoreException
 import org.eclipse.xtext.testing.Flaky
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.ui.tests.editor.outline.AbstractOutlineWorkbenchTest
-import org.junit.BeforeClass
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
@@ -35,11 +33,6 @@ class XsemanticsOutlineTest extends AbstractOutlineWorkbenchTest {
 	@Rule
 	public Flaky.Rule flakyRule = new Flaky.Rule();
 
-	@BeforeClass
-	def static void setupTargetPlatform() {
-		PDETargetPlatformUtils.setTargetPlatform();
-	}
-
 	override protected getEditorId() {
 		DslActivator.ORG_ECLIPSE_XSEMANTICS_DSL_XSEMANTICS
 	}