Browse Source

Removed Stext Import class

Andreas Muelder 8 years ago
parent
commit
446b299d3c

+ 6 - 4
plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/StructureMapping.xtend

@@ -15,6 +15,9 @@ import java.util.ArrayList
 import org.eclipse.xtext.EcoreUtil2
 import org.eclipse.xtext.naming.IQualifiedNameProvider
 import org.yakindu.base.types.Declaration
+import org.yakindu.base.types.Operation
+import org.yakindu.base.types.Package
+import org.yakindu.base.types.Property
 import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sexec.ExecutionRegion
 import org.yakindu.sct.model.sexec.ExecutionScope
@@ -29,7 +32,6 @@ import org.yakindu.sct.model.sgraph.State
 import org.yakindu.sct.model.sgraph.Statechart
 import org.yakindu.sct.model.sgraph.Vertex
 import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.model.stext.stext.Import
 import org.yakindu.sct.model.stext.stext.ImportScope
 import org.yakindu.sct.model.stext.stext.OperationDefinition
 import org.yakindu.sct.model.stext.stext.VariableDefinition
@@ -71,12 +73,12 @@ class StructureMapping {
 	 */
 	def dispatch Scope mapScope(ImportScope scope) {
 		val _scope = scope.createScope
-		for (org.yakindu.base.types.Package imp : scope.imports) {
-			val props = resolver.getImportedElementsOfType(imp, org.yakindu.base.types.Property)
+		for (Package imp : scope.imports) {
+			val props = resolver.getImportedElementsOfType(imp, Property)
 			for (Declaration decl : props) {
 				_scope.declarations.add(decl.createImportDeclaration)
 			}
-			val operations = resolver.getImportedElementsOfType(imp, org.yakindu.base.types.Operation) 
+			val operations = resolver.getImportedElementsOfType(imp, Operation) 
 			for (Declaration decl : operations) {
 				_scope.declarations.add(decl.createImportDeclaration)
 			}

+ 0 - 50
plugins/org.yakindu.sct.model.stext/emf-gen/org/yakindu/sct/model/stext/stext/Import.java

@@ -1,50 +0,0 @@
-/**
- */
-package org.yakindu.sct.model.stext.stext;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Import</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.yakindu.sct.model.stext.stext.Import#getImportedNamespace <em>Imported Namespace</em>}</li>
- * </ul>
- *
- * @see org.yakindu.sct.model.stext.stext.StextPackage#getImport()
- * @model
- * @generated
- */
-public interface Import extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Imported Namespace</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Imported Namespace</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Imported Namespace</em>' attribute.
-	 * @see #setImportedNamespace(String)
-	 * @see org.yakindu.sct.model.stext.stext.StextPackage#getImport_ImportedNamespace()
-	 * @model
-	 * @generated
-	 */
-	String getImportedNamespace();
-
-	/**
-	 * Sets the value of the '{@link org.yakindu.sct.model.stext.stext.Import#getImportedNamespace <em>Imported Namespace</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Imported Namespace</em>' attribute.
-	 * @see #getImportedNamespace()
-	 * @generated
-	 */
-	void setImportedNamespace(String value);
-
-} // Import

+ 0 - 2
plugins/org.yakindu.sct.model.stext/emf-gen/org/yakindu/sct/model/stext/stext/impl/StextFactoryImpl.java

@@ -8,7 +8,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.yakindu.sct.model.stext.stext.*;
 import org.yakindu.sct.model.stext.stext.ActiveStateReferenceExpression;
 import org.yakindu.sct.model.stext.stext.AlwaysEvent;
 import org.yakindu.sct.model.stext.stext.BuiltinEventSpec;
@@ -23,7 +22,6 @@ import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression;
 import org.yakindu.sct.model.stext.stext.ExitEvent;
 import org.yakindu.sct.model.stext.stext.ExitPointSpec;
 import org.yakindu.sct.model.stext.stext.Guard;
-import org.yakindu.sct.model.stext.stext.Import;
 import org.yakindu.sct.model.stext.stext.ImportScope;
 import org.yakindu.sct.model.stext.stext.InterfaceScope;
 import org.yakindu.sct.model.stext.stext.InternalScope;

+ 0 - 1
plugins/org.yakindu.sct.model.stext/emf-gen/org/yakindu/sct/model/stext/stext/impl/StextPackageImpl.java

@@ -26,7 +26,6 @@ import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression;
 import org.yakindu.sct.model.stext.stext.ExitEvent;
 import org.yakindu.sct.model.stext.stext.ExitPointSpec;
 import org.yakindu.sct.model.stext.stext.Guard;
-import org.yakindu.sct.model.stext.stext.Import;
 import org.yakindu.sct.model.stext.stext.ImportScope;
 import org.yakindu.sct.model.stext.stext.InterfaceScope;
 import org.yakindu.sct.model.stext.stext.InternalScope;

+ 0 - 2
plugins/org.yakindu.sct.model.stext/emf-gen/org/yakindu/sct/model/stext/stext/util/StextAdapterFactory.java

@@ -23,7 +23,6 @@ import org.yakindu.sct.model.sgraph.ReactionProperty;
 import org.yakindu.sct.model.sgraph.Scope;
 import org.yakindu.sct.model.sgraph.ScopedElement;
 import org.yakindu.sct.model.sgraph.Trigger;
-import org.yakindu.sct.model.stext.stext.*;
 import org.yakindu.sct.model.stext.stext.ActiveStateReferenceExpression;
 import org.yakindu.sct.model.stext.stext.AlwaysEvent;
 import org.yakindu.sct.model.stext.stext.BuiltinEventSpec;
@@ -38,7 +37,6 @@ import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression;
 import org.yakindu.sct.model.stext.stext.ExitEvent;
 import org.yakindu.sct.model.stext.stext.ExitPointSpec;
 import org.yakindu.sct.model.stext.stext.Guard;
-import org.yakindu.sct.model.stext.stext.Import;
 import org.yakindu.sct.model.stext.stext.ImportScope;
 import org.yakindu.sct.model.stext.stext.InterfaceScope;
 import org.yakindu.sct.model.stext.stext.InternalScope;

+ 0 - 2
plugins/org.yakindu.sct.model.stext/emf-gen/org/yakindu/sct/model/stext/stext/util/StextSwitch.java

@@ -22,7 +22,6 @@ import org.yakindu.sct.model.sgraph.ReactionProperty;
 import org.yakindu.sct.model.sgraph.Scope;
 import org.yakindu.sct.model.sgraph.ScopedElement;
 import org.yakindu.sct.model.sgraph.Trigger;
-import org.yakindu.sct.model.stext.stext.*;
 import org.yakindu.sct.model.stext.stext.ActiveStateReferenceExpression;
 import org.yakindu.sct.model.stext.stext.AlwaysEvent;
 import org.yakindu.sct.model.stext.stext.BuiltinEventSpec;
@@ -37,7 +36,6 @@ import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression;
 import org.yakindu.sct.model.stext.stext.ExitEvent;
 import org.yakindu.sct.model.stext.stext.ExitPointSpec;
 import org.yakindu.sct.model.stext.stext.Guard;
-import org.yakindu.sct.model.stext.stext.Import;
 import org.yakindu.sct.model.stext.stext.ImportScope;
 import org.yakindu.sct.model.stext.stext.InterfaceScope;
 import org.yakindu.sct.model.stext.stext.InternalScope;

+ 0 - 6
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/util/ImportResolver.java

@@ -26,8 +26,6 @@ import org.eclipse.xtext.resource.IResourceDescriptions;
 import org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions;
 import org.yakindu.base.types.Package;
 import org.yakindu.base.types.TypesPackage;
-import org.yakindu.sct.model.stext.stext.Import;
-
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 
@@ -79,10 +77,6 @@ public class ImportResolver {
 	 */
 	public Package getPackageForNamespace(Resource contextResource, String namespace) {
 		initResourceDescriptions(contextResource);
-		// remove wildcard
-		if (namespace.endsWith(".*")) {
-			namespace = namespace.substring(0, namespace.length() - 2);
-		}
 		List<IEObjectDescription> allVisiblePackages = getAllVisiblePackagesDescriptions(contextResource.getURI());
 		for (IEObjectDescription pkgDesc : allVisiblePackages) {
 			if (pkgDesc.getName().toString().equals(namespace)) {

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

@@ -94,7 +94,6 @@ import org.yakindu.sct.model.stext.stext.ReactionTrigger;
 import org.yakindu.sct.model.stext.stext.StextPackage;
 import org.yakindu.sct.model.stext.stext.TimeEventSpec;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
-import org.yakindu.sct.model.stext.util.ImportResolver;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
@@ -122,8 +121,6 @@ public class STextJavaValidator extends AbstractSTextJavaValidator implements ST
 	@Inject
 	@Named(Constants.LANGUAGE_NAME)
 	private String languageName;
-	@Inject
-	private ImportResolver resolver;
 	@Inject(optional = true)
 	@Named(DomainRegistry.DOMAIN_ID)
 	private String domainID = BasePackage.Literals.DOMAIN_ELEMENT__DOMAIN_ID.getDefaultValueLiteral();