Rename Error to BuilderError to avoid clash with java.lang.Error

diverse-project · Sep 7, 2015 · aff0592 · aff0592
1 parent 750933f
commit aff0592
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/AbstractBuilder.xtend b/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/AbstractBuilder.xtend
@@ -5,7 +5,7 @@ import org.eclipse.emf.ecore.EPackage
 
 abstract class AbstractBuilder implements Builder {
 	protected EPackage model
-	protected List<Error> errors
+	protected List<BuilderError> errors
 
 	override preBuild() {
 		model = null

diff --git a/...ins/fr.inria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/Builder.xtend b/...ins/fr.inria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/Builder.xtend
@@ -6,5 +6,5 @@ interface Builder {
 	def void preBuild()
 	def void make()
 	def void postBuild()
-	def List<Error> getErrors()
+	def List<BuilderError> getErrors()
 }
diff --git a/...inria/diverse/melange/builder/Error.xtend → ...iverse/melange/builder/BuilderError.xtend b/...inria/diverse/melange/builder/Error.xtend → ...iverse/melange/builder/BuilderError.xtend
@@ -1,13 +1,10 @@
 package fr.inria.diverse.melange.builder
 
 import org.eclipse.emf.ecore.EObject
+import org.eclipse.xtend.lib.annotations.Data
 
-class Error {
+@Data
+class BuilderError {
 	String message
 	EObject location
-
-	new(String m, EObject o) {
-		this.message = m
-		this.location = o
-	}
 }
diff --git a/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/LanguageBuilder.xtend b/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/LanguageBuilder.xtend
@@ -11,6 +11,7 @@ import fr.inria.diverse.melange.metamodel.melange.Merge
 import fr.inria.diverse.melange.metamodel.melange.Operator
 import fr.inria.diverse.melange.metamodel.melange.Slice
 import fr.inria.diverse.melange.metamodel.melange.Weave
+import fr.inria.diverse.melange.utils.ErrorHelper
 import java.util.List
 import org.eclipse.emf.ecore.EClass
 import org.eclipse.emf.ecore.EPackage
@@ -61,7 +62,7 @@ class LanguageBuilder extends AbstractBuilder {
 		]
 
 		if (base === null) {
-			errors.add(new Error("Can't build " + source.name, source))
+			errors.add(new BuilderError("Can't build " + source.name, source))
 		}
 
 		model = base
@@ -70,7 +71,7 @@ class LanguageBuilder extends AbstractBuilder {
 	/*
 	 * Add @merged into @base (-> both can be null)
 	 */
-	def List<Error> merge(EPackage base, EPackage merged) {
+	def List<BuilderError> merge(EPackage base, EPackage merged) {
 		// TODO: Custom merge
 		algebra.merge(merged, base)
 

diff --git a/...erse.melange/src/main/java/fr/inria/diverse/melange/builder/LanguageOperatorBuilder.xtend b/...erse.melange/src/main/java/fr/inria/diverse/melange/builder/LanguageOperatorBuilder.xtend
@@ -19,7 +19,7 @@ abstract class LanguageOperatorBuilder<T extends LanguageOperator> extends Opera
 
 		if (langBuilder.isBuilding) {
 			errors.add(
-				new Error(
+				new BuilderError(
 					'''Cyclic dependency between «source.targetLanguage.name» and «source.owningLanguage.name»''',
 					source)
 			)
@@ -31,7 +31,7 @@ abstract class LanguageOperatorBuilder<T extends LanguageOperator> extends Opera
 
 			if (!langBuilder.errors.isEmpty) {
 				errors.add(
-					new Error('''Language «source.targetLanguage.name» has errors in its definition''', source)
+					new BuilderError('''Language «source.targetLanguage.name» has errors in its definition''', source)
 				)
 			}