Ver código fonte

Introduce headless option as part of a domain (#1129)

* replace technical call with 'scc'

* add simple call (.project)

* add simple call (.project)

* improve generator lookup (pass genEntry & genDescriptor)

* improve generator lookup (pass genEntry & genDescriptor)

* remove log output (shown during headless execution even if there isn't
any problem)

* revert context module API change, introduce constants for headless
Johannes Dicks 8 anos atrás
pai
commit
0c07597f35

+ 0 - 3
plugins/org.yakindu.base.types/src/org/yakindu/base/types/typesystem/AbstractTypeSystem.java

@@ -69,9 +69,6 @@ public abstract class AbstractTypeSystem implements ITypeSystem {
 
 	public Type getType(String type) {
 		Type result = typeRegistry.get(type);
-		if (result == null) {
-			System.err.println("Could not find type " + type);
-		}
 		return result;
 	}
 

+ 2 - 3
plugins/org.yakindu.sct.domain.generic.resource/src/org/yakindu/sct/domain/generic/resource/ResourceModuleProvider.java

@@ -12,6 +12,7 @@ package org.yakindu.sct.domain.generic.resource;
 
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.ui.shared.SharedStateModule;
+import org.yakindu.sct.domain.extension.IDomain;
 import org.yakindu.sct.domain.extension.IModuleProvider;
 import org.yakindu.sct.model.stext.STextRuntimeModule;
 import org.yakindu.sct.model.stext.resource.StextResource;
@@ -29,11 +30,9 @@ import com.google.inject.util.Modules;
  */
 public class ResourceModuleProvider implements IModuleProvider {
 
-	public static final String HEADLESS = "Headless";
-
 	@Override
 	public Module getModule(String... options) {
-		if (options.length == 1 && HEADLESS.equals(options[0])) {
+		if (options.length == 1 && IDomain.OPTION_HEADLESS.equals(options[0])) {
 			return getLanguageRuntimeModule();
 		}
 		Module module = Modules.override(getLanguageRuntimeModule())

+ 5 - 2
plugins/org.yakindu.sct.domain/src/org/yakindu/sct/domain/extension/IDomain.java

@@ -25,6 +25,8 @@ public interface IDomain {
 	public static final String FEATURE_SIMULATION = "org.yakindu.sct.simulation";
 	public static final String FEATURE_GENERATOR = "org.yakindu.sct.generator";
 	public static final String FEATURE_RESOURCE = "org.yakindu.sct.resource";
+	public static final String OPTION_HEADLESS = "org.yakindu.sct.headless";
+	public static final String FEATURE_RESOURCE_FILE_EXTENSION = "org.yakindu.sct.resource.file.ext";
 
 	String getDomainID();
 
@@ -35,10 +37,11 @@ public interface IDomain {
 	/**
 	 * Injector instances are cached for the features and the specified options
 	 * 
-	 * @param useCache specifies whether to use cached instances or not
+	 * @param useCache
+	 *            specifies whether to use cached instances or not
 	 */
 	Injector getInjector(String feature, boolean useCache, String... options);
-	
+
 	/**
 	 * Injector instances are cached for the features and the specified options
 	 */