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=277ddc7b16cdb876d1bcef7760467a2e08519430;hp=28a53381e3ca5f2cdac83a5be2cc9181f79ccaf5;hb=248798f4fad0a235508902877cffd1b4298921f7;hpb=abe6893036ad75927f61cfd542562d62ef3c5edc

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 28a53381e..277ddc7b1 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
@@ -5,6 +5,7 @@ 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.query.Res;
 import org.simantics.graph.store.GraphStore;
 import org.simantics.graph.store.StatementCollision;
 import org.simantics.ltk.Problem;
@@ -22,6 +23,13 @@ public class ReportCollisions implements Runnable {
 		this.store = store;
 	}
 	
+	private static String abbreviateURI(Res res) {
+	    if(res == null)
+	        return "null";
+	    String uri = res.toString();
+	    return uri.replace("http://www.simantics.org/", "");
+	}
+	
 	@Override
 	public void run() {
 		LocationStore locations = store.getStore(LocationStore.class);
@@ -41,9 +49,10 @@ public class ReportCollisions implements Runnable {
 		    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)));
+		                "The same statement is defined " + collision.count + " times: " +
+		                        abbreviateURI(store.idToRes(collision.subject)) + ", " +
+		                        abbreviateURI(store.idToRes(collision.predicate)) + ", " +
+		                        abbreviateURI(store.idToRes(collision.object))));
 		    }
 	}