Thomas Kutz пре 9 година
родитељ
комит
794399bd27

+ 11 - 3
plugins/org.yakindu.sct.domain.generic.editor/src/org/yakindu/sct/domain/generic/editor/EditorModuleProvider.java

@@ -58,9 +58,17 @@ public class EditorModuleProvider implements IModuleProvider {
 	}
 
 	protected Module getLanguageModule() {
-		Module uiModule = Modules.override(new STextRuntimeModule())
-				.with(new STextUiModule(STextActivator.getInstance()));
-		return Modules.override(uiModule).with(new SharedStateModule());
+		Module languageModule = Modules.override(getLanguageRuntimeModule())
+				.with(getLanguageUiModule());
+		return Modules.override(languageModule).with(new SharedStateModule());
+	}
+
+	protected Module getLanguageUiModule() {
+		return new STextUiModule(STextActivator.getInstance());
+	}
+
+	protected Module getLanguageRuntimeModule() {
+		return new STextRuntimeModule();
 	}
 
 }

+ 5 - 1
plugins/org.yakindu.sct.domain.generic/src/org/yakindu/sct/domain/generic/modules/ResourceModuleProvider.java

@@ -28,7 +28,7 @@ public class ResourceModuleProvider implements IModuleProvider {
 
 	@Override
 	public Module getModule(String... options) {
-		return Modules.combine(new STextRuntimeModule(), new Module() {
+		return Modules.combine(getLanguageRuntimeModule(), new Module() {
 			@Override
 			public void configure(Binder binder) {
 				binder.bind(Resource.class).to(StextResource.class);
@@ -36,4 +36,8 @@ public class ResourceModuleProvider implements IModuleProvider {
 		});
 	}
 
+	protected Module getLanguageRuntimeModule() {
+		return new STextRuntimeModule();
+	}
+
 }

+ 3 - 3
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/validation/STextJavaValidator.java

@@ -820,9 +820,9 @@ public class STextJavaValidator extends AbstractSTextJavaValidator implements ST
 
 	@Check(CheckType.FAST)
 	public void checkImportExists(Import importDef) {
-		String importedNamespace = importDef.getImportedNamespace();
-		if (resolver.getPackageForNamespace(getResource(importDef),importDef.getImportedNamespace()) == null) {
-			error("The import " + importedNamespace + " cannot be resolved.", importDef,
+		String namespace = importDef.getImportedNamespace();
+		if (resolver.getPackageForNamespace(getResource(importDef), namespace) == null) {
+			error("The import " + namespace + " cannot be resolved.", importDef,
 					StextPackage.Literals.IMPORT__IMPORTED_NAMESPACE, IMPORT_NOT_RESOLVED);
 		}
 	}