Browse Source

replaced outdated 'DataType' class be 'ComplexType' in stext scope provider.

terfloth@itemis.de 12 years ago
parent
commit
64b14088c4

+ 3 - 3
plugins/org.yakindu.sct.generator.c/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,3 @@
-eclipse.preferences.version=1
-encoding//.settings/org.eclipse.xtend.shared.ui.prefs=Cp1252
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding//.settings/org.eclipse.xtend.shared.ui.prefs=Cp1252
+encoding/<project>=UTF-8

+ 0 - 1
plugins/org.yakindu.sct.generator.cpp/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,3 @@
-#Mon Jan 02 09:42:11 CET 2012
 eclipse.preferences.version=1
 encoding//.settings/org.eclipse.xtend.shared.ui.prefs=Cp1252
 encoding/<project>=Cp1252

+ 3 - 3
plugins/org.yakindu.sct.generator.java/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,3 @@
-eclipse.preferences.version=1
-encoding//.settings/org.eclipse.xtend.shared.ui.prefs=Cp1252
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding//.settings/org.eclipse.xtend.shared.ui.prefs=Cp1252
+encoding/<project>=UTF-8

+ 2 - 2
plugins/org.yakindu.sct.model.sexec.interpreter/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,2 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

+ 0 - 1
plugins/org.yakindu.sct.model.sexec/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,3 @@
-#Tue Nov 29 17:11:14 CET 2011
 eclipse.preferences.version=1
 encoding//model/sexec.ecorediag=UTF-8
 encoding/<project>=UTF-8

+ 0 - 1
plugins/org.yakindu.sct.model.stext.ui/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,2 @@
-#Fri Jan 06 10:04:22 CET 2012
 eclipse.preferences.version=1
 encoding/<project>=UTF-8

+ 5 - 7
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/scoping/STextScopeProvider.java

@@ -12,7 +12,6 @@
 package org.yakindu.sct.model.stext.scoping;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -31,9 +30,8 @@ import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
 import org.eclipse.xtext.scoping.impl.FilteringScope;
 import org.eclipse.xtext.scoping.impl.SimpleScope;
 import org.eclipse.xtext.util.PolymorphicDispatcher.ErrorHandler;
-import org.yakindu.base.types.DataType;
+import org.yakindu.base.types.ComplexType;
 import org.yakindu.base.types.EnumerationType;
-import org.yakindu.base.types.Enumerator;
 import org.yakindu.base.types.Feature;
 import org.yakindu.base.types.ITypeSystem;
 import org.yakindu.base.types.Type;
@@ -146,7 +144,7 @@ public class STextScopeProvider extends AbstractDeclarativeScopeProvider {
 			scope = new FilteringScope(scope, predicate);
 		}
 
-		if (element instanceof DataType) {
+		if (element instanceof ComplexType) {
 			scope = Scopes.scopeFor(allFeatures((Type) element), scope);
 			scope = new FilteringScope(scope, predicate);
 		}
@@ -262,11 +260,11 @@ public class STextScopeProvider extends AbstractDeclarativeScopeProvider {
 			Set<Type> visited) {
 		if (type == null || visited.contains(type))
 			return;
-		if (type instanceof DataType) {
-			for (Type superType : ((DataType) type).getSuperTypes()) {
+		if (type instanceof ComplexType) {
+			for (Type superType : ((ComplexType) type).getSuperTypes()) {
 				collectFeatures(superType, features, visited);
 			}
-			features.addAll(((DataType) type).getFeatures());
+			features.addAll(((ComplexType) type).getFeatures());
 		}
 		visited.add(type);
 	}

+ 0 - 1
plugins/org.yakindu.sct.ui/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,2 @@
-#Fri Aug 05 15:07:43 CEST 2011
 eclipse.preferences.version=1
 encoding/<project>=UTF-8

+ 1 - 1
test-plugins/org.yakindu.sct.model.stext.test/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-encoding/<project>=UTF-8
 encoding//src/org/yakindu/sct/model/stext/test/TypeInferrerTest.java=UTF-8
+encoding/<project>=UTF-8