Commit c93a219f authored by Daniel Honsel's avatar Daniel Honsel
Browse files

removed warnings

parent bb5cc216

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/common/TTCN3ScopeHelper.xtend

+1 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import de.ugoe.cs.swe.tTCN3.ComponentDef 
import de.ugoe.cs.swe.tTCN3.ComponentDefList

import de.ugoe.cs.swe.tTCN3.ConstDef

import de.ugoe.cs.swe.tTCN3.ConstList

import de.ugoe.cs.swe.tTCN3.ControlStatementOrDefList

import de.ugoe.cs.swe.tTCN3.EnumDef

import de.ugoe.cs.swe.tTCN3.EnumDefNamed

import de.ugoe.cs.swe.tTCN3.Enumeration
@@ -54,6 +53,7 @@ import de.ugoe.cs.swe.tTCN3.TemplateOrValueFormalParList 
import de.ugoe.cs.swe.tTCN3.TestcaseDef

import de.ugoe.cs.swe.tTCN3.TypeDef

import de.ugoe.cs.swe.tTCN3.TypeReference

import de.ugoe.cs.swe.tTCN3.TypeReferenceTail

import de.ugoe.cs.swe.tTCN3.UnionDefNamed

import de.ugoe.cs.swe.tTCN3.VarInstance

import de.ugoe.cs.swe.tTCN3.VarList
@@ -63,8 +63,6 @@ import org.eclipse.emf.ecore.EObject 
import org.eclipse.xtext.scoping.IScope



import static org.eclipse.xtext.scoping.Scopes.*

import de.ugoe.cs.swe.tTCN3.TypeReferenceTail

import de.ugoe.cs.swe.tTCN3.BaseTemplate



class TTCN3ScopeHelper {

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/scoping/TTCN3ScopeProvider.xtend

+3 −12
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ import de.ugoe.cs.swe.tTCN3.CallStatement 
import de.ugoe.cs.swe.tTCN3.ComponentDef

import de.ugoe.cs.swe.tTCN3.ComponentDefList

import de.ugoe.cs.swe.tTCN3.ConstDef

import de.ugoe.cs.swe.tTCN3.ControlStatementOrDefList

import de.ugoe.cs.swe.tTCN3.FieldConstExpressionSpec

import de.ugoe.cs.swe.tTCN3.FieldExpressionSpec

import de.ugoe.cs.swe.tTCN3.FieldReference
@@ -50,6 +49,7 @@ import de.ugoe.cs.swe.tTCN3.StartTimerStatement 
import de.ugoe.cs.swe.tTCN3.StatementBlock

import de.ugoe.cs.swe.tTCN3.StructFieldDef

import de.ugoe.cs.swe.tTCN3.TTCN3Module

import de.ugoe.cs.swe.tTCN3.TTCN3Package

import de.ugoe.cs.swe.tTCN3.TemplateDef

import de.ugoe.cs.swe.tTCN3.TestcaseDef

import de.ugoe.cs.swe.tTCN3.TimerRefOrAny
@@ -66,19 +66,13 @@ import org.eclipse.emf.ecore.EReference 
import org.eclipse.xtext.scoping.IScope

import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider



import static de.ugoe.cs.swe.scoping.TTCN3GlobalScopeProvider.*

import static org.eclipse.xtext.scoping.Scopes.*

import static extension de.ugoe.cs.swe.scoping.TTCN3GlobalScopeProvider.*



import static extension de.ugoe.cs.swe.common.TTCN3ScopeHelper.*

import static extension org.eclipse.xtext.EcoreUtil2.*

import com.google.inject.Inject

import org.eclipse.xtext.scoping.IGlobalScopeProvider

import de.ugoe.cs.swe.tTCN3.TTCN3Package



class TTCN3ScopeProvider extends AbstractDeclarativeScopeProvider {

	@Inject

	private IGlobalScopeProvider globalScopeProvider;

		

	private final static Logger LOG = Logger.getLogger(TTCN3LocalScopeProvider);



	def IScope scope_FieldSpec_ref(FieldSpec spec, EReference ref) {
@@ -238,9 +232,6 @@ class TTCN3ScopeProvider extends AbstractDeclarativeScopeProvider { 
		

		list.addAll(module.eAllOfType(FieldReference))



		val scopeProvider = globalScopeProvider as TTCN3GlobalScopeProvider

		//val imported = scopeProvider.importedObjects(module.eResource)

		

		// TODO: figure out if this is really needed

		synchronized (IMPORTS) {

			if (IMPORTS.containsKey(module.eResource)) {