X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.graph.compiler%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Fcompiler%2Finternal%2Fvalidation%2FReportCollisions.java;fp=bundles%2Forg.simantics.graph.compiler%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Fcompiler%2Finternal%2Fvalidation%2FReportCollisions.java;h=28a53381e3ca5f2cdac83a5be2cc9181f79ccaf5;hp=e7346e94570c92edd76c0e46e4df56b2b87935d0;hb=55f09d0198f1431c19ffa62e0cad361c1a2787e4;hpb=6f4a838ed439ed3a5f5f51e1837e9adf45c98eef

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ReportCollisions.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ReportCollisions.java
index e7346e945..28a53381e 100644
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ReportCollisions.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/validation/ReportCollisions.java
@@ -2,18 +2,22 @@ package org.simantics.graph.compiler.internal.validation;
 
 import java.util.Collection;
 
+import org.simantics.graph.compiler.GraphCompilerPreferences;
 import org.simantics.graph.compiler.internal.store.LocationStore;
 import org.simantics.graph.compiler.internal.templates.TemplateDefinitionStore;
 import org.simantics.graph.store.GraphStore;
+import org.simantics.graph.store.StatementCollision;
 import org.simantics.ltk.Problem;
 
 public class ReportCollisions implements Runnable {
+    GraphCompilerPreferences preferences;
 	Collection<Problem> problems;
 	GraphStore store;
 
 	public ReportCollisions(
-			Collection<Problem> problems,
+			GraphCompilerPreferences preferences, Collection<Problem> problems,
 			GraphStore store) {
+	    this.preferences = preferences;
 		this.problems = problems;
 		this.store = store;
 	}
@@ -32,7 +36,15 @@ public class ReportCollisions implements Runnable {
 		for(int c : store.getStore(TemplateDefinitionStore.class).getCollisions().toArray())
 			problems.add(new Problem(
 					locations.getLocation(c), 
-					"Two tempalate definitions are given for the same resource."));
+					"Two template definitions are given for the same resource."));
+		if(preferences.validate)
+		    for(StatementCollision collision : store.statements.getCollisions()) {
+		        problems.add(new Problem(
+		                locations.getLocation(collision.subject), 
+		                "The same statement is defined twice: " +
+		                        store.idToRes(collision.predicate) + ", " +
+		                        store.idToRes(collision.object)));
+		    }
 	}
 	
 }