Commit 55330087 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* switched to global and local scope binding (double check no anomalies) 

- removed old scoping fragment
parent 7de77126

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/TTCN3RuntimeModule.java

+18 −1
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ 
package de.ugoe.cs.swe;



import org.apache.log4j.Logger;

import org.eclipse.xtext.scoping.IGlobalScopeProvider;

import org.eclipse.xtext.scoping.IScope;

import org.eclipse.xtext.scoping.IScopeProvider;

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

import org.eclipse.xtext.util.PolymorphicDispatcher;
@@ -12,6 +14,8 @@ import com.google.inject.Binder; 
import com.google.inject.TypeLiteral;

import com.google.inject.name.Names;



import de.ugoe.cs.swe.scoping.TTCN3GlobalScopeProvider;

import de.ugoe.cs.swe.scoping.TTCN3LocalScopeProvider;

import de.ugoe.cs.swe.scoping.TTCN3ScopeErrorHandler;
@@ -28,6 +32,19 @@ public class TTCN3RuntimeModule extends AbstractTTCN3RuntimeModule { 
		binder.bind(new TypeLiteral<PolymorphicDispatcher.ErrorHandler<IScope>>(){})

        	.annotatedWith(Names.named(AbstractDeclarativeScopeProvider.NAMED_ERROR_HANDLER))

        	.toInstance( handler );

		

	}

	

	@Override

	public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {

		// TODO Auto-generated method stub

		return TTCN3GlobalScopeProvider.class;

	}

	

	@Override

	public Class<? extends IScopeProvider> bindIScopeProvider() {

		// TODO Auto-generated method stub

		return TTCN3LocalScopeProvider.class;

	}

	

}

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/scoping/TTCN3ImportNamespaceScopingFragment.java

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
package de.ugoe.cs.swe.scoping;



import org.eclipse.xtext.generator.scoping.AbstractScopingFragment;

import org.eclipse.xtext.scoping.IGlobalScopeProvider;

import org.eclipse.xtext.scoping.IScopeProvider;



/**

 * @author Daniel Honsel

 */



public class TTCN3ImportNamespaceScopingFragment extends AbstractScopingFragment {



	@Override

	protected Class<? extends IScopeProvider> getLocalScopeProvider() {

		return TTCN3LocalScopeProvider.class;

	}



	@Override

	protected Class<? extends IGlobalScopeProvider> getGlobalScopeProvider() {

		return TTCN3GlobalScopeProvider.class;

	}



}