Browse Source

fixed a number of deprecated imports which made the code fail with xtext 2.11

Kenneth Lausdahl 4 years ago
parent
commit
133f9dd805

+ 2 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.ide/META-INF/MANIFEST.MF

@@ -7,7 +7,8 @@ Bundle-SymbolicName: be.uantwerpen.ansymo.semanticadaptation.ide; singleton:=tru
 Bundle-ActivationPolicy: lazy
 Require-Bundle: be.uantwerpen.ansymo.semanticadaptation,
  org.eclipse.xtext.ide,
- org.eclipse.xtext.xbase.ide
+ org.eclipse.xtext.xbase.ide,
+ org.antlr.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: be.uantwerpen.ansymo.semanticadaptation.ide.contentassist.antlr.internal,
  be.uantwerpen.ansymo.semanticadaptation.ide.contentassist.antlr

+ 4 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/META-INF/MANIFEST.MF

@@ -10,9 +10,11 @@ Require-Bundle: be.uantwerpen.ansymo.semanticadaptation,
  org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.jdt.core
+ org.eclipse.jdt.core,
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.xbase.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: be.uantwerpen.ansymo.semanticadaptation.tests
+Export-Package: be.uantwerpen.ansymo.semanticadaptation.tests;x-internal=true
 Import-Package: org.hamcrest.core,
  org.junit;version="4.5.0",
  org.junit.runners.model;version="4.5.0",

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/AbstractSemanticAdaptationParserTest.xtend

@@ -11,7 +11,7 @@ import org.eclipse.xtext.junit4.util.ParseHelper
 import org.junit.runner.RunWith
 
 @RunWith(XtextRunner)
-@InjectWith(SemanticAdaptationInjectorProvider)
+@org.eclipse.xtext.testing.InjectWith(SemanticAdaptationInjectorProvider)
 abstract class AbstractSemanticAdaptationParserTest extends AbstractSemanticAdaptationTest {
 
 	@Inject extension ParseHelper<SemanticAdaptation>

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/AbstractSemanticAdaptationTest.xtend

@@ -20,7 +20,7 @@ import java.io.File
 import org.eclipse.emf.ecore.resource.ResourceSet
 
 @RunWith(XtextRunner)
-@InjectWith(SemanticAdaptationInjectorProvider)
+@org.eclipse.xtext.testing.InjectWith(SemanticAdaptationInjectorProvider)
 abstract class AbstractSemanticAdaptationTest {
 	
 	ArrayList<Integer> visited = new ArrayList<Integer>

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/SemanticAdaptationGeneratorTest.xtend

@@ -12,7 +12,7 @@ import org.eclipse.xtext.junit4.XtextRunner
 import java.io.File
 
 @RunWith(XtextRunner)
-@InjectWith(SemanticAdaptationInjectorProvider)
+@org.eclipse.xtext.testing.InjectWith(SemanticAdaptationInjectorProvider)
 class SemanticAdaptationGeneratorTest extends AbstractSemanticAdaptationTest{
 	
 	@Inject extension CompilationTestHelper

+ 4 - 4
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/SemanticAdaptationParsingTest.xtend

@@ -3,12 +3,12 @@
  */
 package be.uantwerpen.ansymo.semanticadaptation.tests
 
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.eclipse.xtext.junit4.util.ParseHelper
+import org.eclipse.xtext.testing.util.ParseHelper
 import com.google.inject.Inject
 import org.eclipse.xtext.junit4.validation.ValidationTestHelper
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.*
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject
 import java.util.regex.Pattern
 
 @RunWith(XtextRunner)
-@InjectWith(SemanticAdaptationInjectorProvider)
+@org.eclipse.xtext.testing.InjectWith(SemanticAdaptationInjectorProvider)
 class SemanticAdaptationParsingTest extends AbstractSemanticAdaptationTest{
 	
 	@Inject extension ParseHelper<SemanticAdaptation>

+ 4 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.ui.tests/META-INF/MANIFEST.MF

@@ -10,9 +10,11 @@ Require-Bundle: be.uantwerpen.ansymo.semanticadaptation.ui,
  org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit,
  org.eclipse.core.runtime,
- org.eclipse.ui.workbench;resolution:=optional
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.xbase.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: be.uantwerpen.ansymo.semanticadaptation.ui.tests
+Export-Package: be.uantwerpen.ansymo.semanticadaptation.ui.tests;x-internal=true
 Import-Package: org.hamcrest.core,
  org.junit;version="4.5.0",
  org.junit.runners.model;version="4.5.0",

+ 8 - 8
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.ui/plugin.xml_gen

@@ -58,20 +58,20 @@
 			<and>
 				<reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
 				<with variable="activeEditor">
-					<test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
-						value="be.uantwerpen.ansymo.semanticadaptation.SemanticAdaptation" 
+					<test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+						value="be.uantwerpen.ansymo.semanticadaptation.SemanticAdaptation"
 						forcePluginActivation="true"/>
-				</with>		
+				</with>
 			</and>
 		</definition>
 		<definition id="be.uantwerpen.ansymo.semanticadaptation.SemanticAdaptation.XtextEditor.opened">
 			<and>
 				<reference definitionId="isXtextEditorActive"/>
 				<with variable="activeEditor">
-					<test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
-						value="be.uantwerpen.ansymo.semanticadaptation.SemanticAdaptation" 
+					<test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+						value="be.uantwerpen.ansymo.semanticadaptation.SemanticAdaptation"
 						forcePluginActivation="true"/>
-				</with>		
+				</with>
 			</and>
 		</definition>
 	</extension>
@@ -154,7 +154,7 @@
 		</menuContribution>
 		<!-- copy qualified name -->
 		<menuContribution locationURI="popup:#TextEditorContext?after=copy">
-			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" 
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
 				style="push" tooltip="Copy Qualified Name">
 				<visibleWhen checkEnabled="false">
 					<reference definitionId="be.uantwerpen.ansymo.semanticadaptation.SemanticAdaptation.Editor.opened" />
@@ -170,7 +170,7 @@
 			</command>
 		</menuContribution>
 		<menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
-			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" 
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
 				style="push" tooltip="Copy Qualified Name">
 				<visibleWhen checkEnabled="false">
 					<and>