Generalization of IssueAcceptor

plugins/org.yakindu.base.expressions/src/org/yakindu/base/expressions/validation/ExpressionsJavaValidator.java

@@ -24,7 +24,7 @@ import org.yakindu.base.types.TypeParameter;
 import org.yakindu.base.types.TypedElement;
 import org.yakindu.base.types.TypesPackage;
 import org.yakindu.base.types.inferrer.ITypeSystemInferrer;
-import org.yakindu.base.types.inferrer.ITypeSystemInferrer.ITypeTraceAcceptor;
+import org.yakindu.base.types.validation.IValidationIssueAcceptor;
 
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
@@ -35,7 +35,7 @@ import com.google.inject.Inject;
  * 
  */
 public class ExpressionsJavaValidator extends org.yakindu.base.expressions.validation.AbstractExpressionsJavaValidator
-		implements ITypeTraceAcceptor {
+		implements IValidationIssueAcceptor {
 
 	public static final String WARNING_IS_RAW_CODE = "WarningRaw";
 	public static final String WARNING_IS_RAW_MSG = "%s is a raw type. References to generic type %s should be parameterized";
@@ -68,13 +68,13 @@ public class ExpressionsJavaValidator extends org.yakindu.base.expressions.valid
 		typeInferrer.inferType(expression, this);
 	}
 
-	public void accept(TypeTrace trace) {
-		switch (trace.getSeverity()) {
+	public void accept(ValidationIssue issue) {
+		switch (issue.getSeverity()) {
 		case ERROR:
-			error(trace.getMessage(), null);
+			error(issue.getMessage(), null);
 			break;
 		case WARNING:
-			warning(trace.getMessage(), null);
+			warning(issue.getMessage(), null);
 			break;
 		case INFO:
 			break;

plugins/org.yakindu.base.types/META-INF/MANIFEST.MF

@@ -15,7 +15,8 @@ Export-Package: org.yakindu.base.base,
  org.yakindu.base.types.inferrer,
  org.yakindu.base.types.interpreter,
  org.yakindu.base.types.typesystem,
- org.yakindu.base.types.util
+ org.yakindu.base.types.util,
+ org.yakindu.base.types.validation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.yakindu.base.types;visibility:=reexport,

plugins/org.yakindu.base.types/src/org/yakindu/base/types/inferrer/AbstractTypeSystemInferrer.java

@@ -18,8 +18,10 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.util.PolymorphicDispatcher;
 import org.yakindu.base.types.ITypeSystemRegistry;
 import org.yakindu.base.types.Type;
-import org.yakindu.base.types.inferrer.ITypeSystemInferrer.ITypeTraceAcceptor.TypeTrace;
-import org.yakindu.base.types.inferrer.ITypeSystemInferrer.ITypeTraceAcceptor.TypeTrace.Severity;
+import org.yakindu.base.types.validation.IValidationIssueAcceptor;
+import org.yakindu.base.types.validation.IValidationIssueAcceptor.ListBasedValidationIssueAcceptor;
+import org.yakindu.base.types.validation.IValidationIssueAcceptor.ValidationIssue;
+import org.yakindu.base.types.validation.IValidationIssueAcceptor.ValidationIssue.Severity;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -43,7 +45,7 @@ public abstract class AbstractTypeSystemInferrer implements ITypeSystemInferrer
 	@Inject
 	private ITypeSystemRegistry registry;
 
-	private ITypeTraceAcceptor acceptor;
+	private IValidationIssueAcceptor acceptor;
 
 	private PolymorphicDispatcher<Object> dispatcher;
 
@@ -63,8 +65,8 @@ public abstract class AbstractTypeSystemInferrer implements ITypeSystemInferrer
 	}
 
 	@Override
-	public final Type inferType(EObject object, ITypeTraceAcceptor acceptor) {
-		this.acceptor = (acceptor != null ? acceptor : new ListBasedTypeTraceAcceptor());
+	public final Type inferType(EObject object, IValidationIssueAcceptor acceptor) {
+		this.acceptor = (acceptor != null ? acceptor : new ListBasedValidationIssueAcceptor());
 		info("infering type for object " + object);
 		Type result = inferTypeDispatch(object);
 		typeCache.invalidateAll();
@@ -72,12 +74,12 @@ public abstract class AbstractTypeSystemInferrer implements ITypeSystemInferrer
 	}
 
 	protected Type inferTypeDispatch(EObject object) {
-		if(object.eIsProxy())
+		if (object.eIsProxy())
 			return null;
 		try {
 			return typeCache.get(object);
 		} catch (Exception e) {
-			//Ignore invalid expressions and recursions
+			// Ignore invalid expressions and recursions
 		}
 		return null;
 	}
@@ -161,14 +163,14 @@ public abstract class AbstractTypeSystemInferrer implements ITypeSystemInferrer
 	}
 
 	protected void info(String msg) {
-		acceptor.accept(new TypeTrace(Severity.INFO, msg));
+		acceptor.accept(new ValidationIssue(Severity.INFO, msg));
 	}
 
 	protected void warning(String msg) {
-		acceptor.accept(new TypeTrace(Severity.WARNING, msg));
+		acceptor.accept(new ValidationIssue(Severity.WARNING, msg));
 	}
 
 	protected void error(String msg) {
-		acceptor.accept(new TypeTrace(Severity.ERROR, msg));
+		acceptor.accept(new ValidationIssue(Severity.ERROR, msg));
 	}
 }

plugins/org.yakindu.base.types/src/org/yakindu/base/types/inferrer/ITypeSystemInferrer.java

@@ -10,15 +10,9 @@
  */
 package org.yakindu.base.types.inferrer;
 
-import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
 import org.yakindu.base.types.Type;
-import org.yakindu.base.types.inferrer.ITypeSystemInferrer.ITypeTraceAcceptor.TypeTrace.Severity;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import org.yakindu.base.types.validation.IValidationIssueAcceptor;
 
 /**
  * @author andreas muelder - Initial contribution and API
@@ -26,70 +20,6 @@ import com.google.common.collect.Lists;
  */
 public interface ITypeSystemInferrer {
 
-	public Type inferType(EObject object, ITypeTraceAcceptor acceptor);
+	public Type inferType(EObject object, IValidationIssueAcceptor acceptor);
 	
-	public interface ITypeTraceAcceptor {
-
-		public static class TypeTrace {
-			public static enum Severity {
-				ERROR, WARNING, INFO
-			}
-
-			public TypeTrace(Severity severity, String message) {
-				super();
-				this.severity = severity;
-				this.message = message;
-			}
-
-			private Severity severity;
-			private String message;
-
-			public Severity getSeverity() {
-				return severity;
-			}
-
-			public void setSeverity(Severity severity) {
-				this.severity = severity;
-			}
-
-			public String getMessage() {
-				return message;
-			}
-
-			public void setMessage(String message) {
-				this.message = message;
-			}
-
-			@Override
-			public String toString() {
-				return "TypeTrace [" + severity + ", message=" + message + "]";
-			}
-		}
-
-		public void accept(TypeTrace trace);
-	}
-
-	public static final class ListBasedTypeTraceAcceptor implements ITypeTraceAcceptor {
-
-		private List<TypeTrace> traces = Lists.newArrayList();
-
-		@Override
-		public void accept(TypeTrace trace) {
-			traces.add(trace);
-		}
-
-		public List<TypeTrace> getTraces() {
-			return traces;
-		}
-
-		public List<TypeTrace> getTraces(final Severity severity) {
-			return Lists.newArrayList(Iterables.filter(traces, new Predicate<TypeTrace>() {
-				@Override
-				public boolean apply(TypeTrace input) {
-					return input.getSeverity() == severity;
-				}
-			}));
-		}
-
-	}
 }

plugins/org.yakindu.base.types/src/org/yakindu/base/types/typesystem/AbstractTypeSystem.java

@@ -19,6 +19,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -42,7 +43,11 @@ public abstract class AbstractTypeSystem implements ITypeSystem {
 	private Map<Type, Type> extendsRegistry = new HashMap<Type, Type>();
 
 	// Types must be contained in a resource to avoid dangling reference errors
-	private Resource resource = new ResourceImpl();
+	private Resource resource;
+	
+	public AbstractTypeSystem() {
+		 resource = new ResourceImpl(URI.createURI("types"));
+	}
 
 	@Inject
 	private ITypeSystemRegistry registry;

plugins/org.yakindu.base.types/src/org/yakindu/base/types/validation/IValidationIssueAcceptor.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2015 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ * 	committers of YAKINDU - initial API and implementation
+ * 
+ */
+package org.yakindu.base.types.validation;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.yakindu.base.types.validation.IValidationIssueAcceptor.ValidationIssue.Severity;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
+/**
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+public interface IValidationIssueAcceptor {
+
+	public static class ValidationIssue {
+		public static enum Severity {
+			ERROR, WARNING, INFO
+		}
+
+		private Severity severity;
+		private String message;
+		private EObject target;
+
+		public ValidationIssue(Severity severity, String message) {
+			super();
+			this.severity = severity;
+			this.message = message;
+		}
+
+		public ValidationIssue(Severity severity, String message, EObject target) {
+			super();
+			this.severity = severity;
+			this.message = message;
+			this.target = target;
+		}
+
+		public Severity getSeverity() {
+			return severity;
+		}
+
+		public void setSeverity(Severity severity) {
+			this.severity = severity;
+		}
+
+		public String getMessage() {
+			return message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
+
+		public EObject getTarget() {
+			return target;
+		}
+
+		public void setTarget(EObject target) {
+			this.target = target;
+		}
+
+		@Override
+		public String toString() {
+			return "ValidationIssue [severity=" + severity + ", message=" + message + ", target=" + target + "]";
+		}
+
+	}
+
+	public void accept(ValidationIssue trace);
+
+	public static final class ListBasedValidationIssueAcceptor implements IValidationIssueAcceptor {
+
+		private List<ValidationIssue> traces = Lists.newArrayList();
+
+		@Override
+		public void accept(ValidationIssue trace) {
+			traces.add(trace);
+		}
+
+		public List<ValidationIssue> getTraces() {
+			return traces;
+		}
+
+		public List<ValidationIssue> getTraces(final Severity severity) {
+			return Lists.newArrayList(Iterables.filter(traces, new Predicate<ValidationIssue>() {
+				@Override
+				public boolean apply(ValidationIssue input) {
+					return input.getSeverity() == severity;
+				}
+			}));
+		}
+
+	}
+
+}