import java.util.Collection;\r
import java.util.Collections;\r
import java.util.Comparator;\r
+import java.util.HashSet;\r
import java.util.List;\r
+import java.util.Set;\r
import java.util.Stack;\r
\r
import org.simantics.db.ReadGraph;\r
import org.simantics.db.Resource;\r
import org.simantics.db.Statement;\r
+import org.simantics.db.common.utils.NameUtils;\r
+import org.simantics.db.exception.DatabaseException;\r
import org.simantics.db.exception.DoesNotContainValueException;\r
-import org.simantics.db.exception.ManyObjectsForFunctionalRelationException;\r
import org.simantics.db.exception.ServiceException;\r
import org.simantics.db.exception.ValidationException;\r
import org.simantics.layer0.Layer0;\r
-import org.simantics.layer0.utils.direct.GraphUtils;\r
import org.simantics.utils.datastructures.BijectionMap;\r
import org.simantics.utils.datastructures.MapList;\r
+import org.simantics.utils.datastructures.Pair;\r
\r
/**\r
* Compares two subgraphs and reports differences.\r
*/\r
public class GraphComparator {\r
\r
- \r
+ private Resource r1;\r
+ private Resource r2;\r
private List<Resource> traversed = new ArrayList<Resource>(); // list of relations that are traversed (and tested)\r
private List<Resource> tested = new ArrayList<Resource>(); // list of relations that are tested, but not traversed\r
- \r
+ private List<Resource> nonTraversed = new ArrayList<Resource>(); // list of relations that are not traversed\r
+ private List<Resource> nonTested = new ArrayList<Resource>(); // list of relations that are not tested\r
\r
private List<Statement> changes1 = new ArrayList<Statement>();\r
private List<Statement> changes2 = new ArrayList<Statement>();\r
- private BijectionMap<Statement, Statement> comparable = new BijectionMap<Statement, Statement>();\r
+ private List<Pair<Statement,Statement>> modifications = new ArrayList<Pair<Statement,Statement>>();\r
+ private Set<Statement> changes1Set = new HashSet<Statement>();\r
+ private Set<Statement> changes2Set = new HashSet<Statement>();\r
+ private Set<Pair<Statement,Statement>> modificationsSet = new HashSet<Pair<Statement,Statement>>();\r
+\r
+ private BijectionMap<Statement, Statement> comparableStatements = new BijectionMap<Statement, Statement>();\r
+ private BijectionMap<Resource, Resource> comparableResources = new BijectionMap<Resource, Resource>();\r
\r
\r
+ private ObjectComparator comparator;\r
+ \r
// runtime attributes\r
\r
private ReadGraph g;\r
private Layer0 b;\r
\r
- ArrayList<Resource> rs1 = new ArrayList<Resource>();\r
- ArrayList<Resource> rs2 = new ArrayList<Resource>();\r
+ public GraphComparator() {\r
+ comparator = new TypeComparator();\r
+ }\r
+ \r
+ public GraphComparator(ObjectComparator comparator) {\r
+ this.comparator = comparator;\r
+ }\r
+ \r
ArrayList<Statement> ss1 = new ArrayList<Statement>();\r
ArrayList<Statement> ss2 = new ArrayList<Statement>();\r
- Comparator<Statement> scomp = new StatementComparator();\r
+ \r
+ Comparator<Statement> scomp = new PredicateComparator();\r
Comparator<Resource> rcomp = new ResourceComparator();\r
\r
\r
traversed.addAll(rels);\r
}\r
\r
+ public void addNonTraversed(Resource rel) {\r
+ nonTraversed.add(rel);\r
+ }\r
+ \r
+ public void addNonTraversed(Collection<Resource> rels) {\r
+ nonTraversed.addAll(rels);\r
+ }\r
+ \r
public void addTested(Resource rel) {\r
tested.add(rel);\r
}\r
tested.addAll(rels);\r
}\r
\r
+ public void addNonTested(Resource rel) {\r
+ nonTested.add(rel);\r
+ }\r
+ \r
+ public void addNonTested(Collection<Resource> rels) {\r
+ nonTested.addAll(rels);\r
+ }\r
+ \r
public void clearRels() {\r
traversed.clear();\r
tested.clear();\r
}\r
\r
- public void test(ReadGraph g, Resource r1, Resource r2) throws ServiceException, DoesNotContainValueException, ValidationException {\r
+ public void test(ReadGraph g, Resource r1, Resource r2) throws DatabaseException {\r
this.g = g;\r
this.b = Layer0.getInstance(g);\r
\r
+ this.r1 = r1;\r
+ this.r2 = r2;\r
+ changes1Set.clear();\r
+ changes2Set.clear();\r
+ modificationsSet.clear();\r
changes1.clear();\r
changes2.clear();\r
+ modifications.clear();\r
+ comparableResources.clear();\r
\r
Stack<Resource> stack1 = new Stack<Resource>();\r
Stack<Resource> stack2 = new Stack<Resource>();\r
stack1.push(r1);\r
stack2.push(r2);\r
\r
- ArrayList<Statement> ss1 = new ArrayList<Statement>();\r
- ArrayList<Statement> ss2 = new ArrayList<Statement>();\r
+ \r
+ List<Statement> ss1 = new ArrayList<Statement>();\r
+ List<Statement> ss2 = new ArrayList<Statement>();\r
\r
while (!stack1.isEmpty()) {\r
r1 = stack1.pop();\r
r2 = stack2.pop();\r
+ \r
+ if (comparableResources.contains(r1, r2)) {\r
+ System.out.println("already tested " + NameUtils.getSafeName(g, r1) + " " + NameUtils.getSafeName(g, r2));\r
+ continue;\r
+ }\r
+ comparableResources.map(r1, r2);\r
\r
- System.out.println("test " + GraphUtils.getReadableName(g, r1) + " " + GraphUtils.getReadableName(g, r2));\r
+ System.out.println("test " + NameUtils.getSafeName(g, r1) + " " + NameUtils.getSafeName(g, r2));\r
compareProps(r1, r2);\r
\r
for (Resource rel : tested) {\r
- filterTraversed(g.getStatements(r1, rel), ss1);\r
- filterTraversed(g.getStatements(r2, rel), ss2);\r
+ ss1.addAll(g.getStatements(r1, rel));\r
+ ss2.addAll(g.getStatements(r2, rel));\r
+ ss1 = filterAsserted(r1, ss1);\r
+ ss2 = filterAsserted(r2, ss2);\r
+ ss1 = filterTraversed(ss1);\r
+ ss2 = filterTraversed(ss2);\r
+ ss1 = filterNonTested(ss1);\r
+ ss2 = filterNonTested(ss2);\r
\r
- compareStatement(ss1, ss2, null, null);\r
+ compareStatements(ss1, ss2, null, null);\r
ss1.clear();\r
ss2.clear();\r
}\r
for (Resource rel : traversed) {\r
ss1.addAll(g.getStatements(r1, rel));\r
ss2.addAll(g.getStatements(r2, rel));\r
- compareStatement(ss1, ss2, stack1, stack2);\r
+ ss1 = filterAsserted(r1, ss1);\r
+ ss2 = filterAsserted(r2, ss2);\r
+ compareStatements(ss1, ss2, stack1, stack2);\r
ss1.clear();\r
ss2.clear();\r
}\r
}\r
}\r
\r
- public Collection<Statement> getChanges1() {\r
- return changes1;\r
+ \r
+ \r
+ public BijectionMap<Statement, Statement> getComparableStatements() {\r
+ return comparableStatements;\r
+ }\r
+ \r
+ public GraphChanges getChanges() {\r
+ return new GraphChanges(r1,r2,changes1,changes2,modifications);\r
+ }\r
+ \r
+ private List<Statement> filterAsserted(Resource r, Collection<Statement> in) throws ServiceException {\r
+ List<Statement> out = new ArrayList<Statement>();\r
+ for (Statement s : in) {\r
+ if (!s.isAsserted(r))\r
+ out.add(s);\r
+ \r
+ }\r
+ return out;\r
+ }\r
+ \r
+ private String printStatement(ReadGraph graph, Statement s) throws ValidationException, ServiceException {\r
+ return NameUtils.getSafeName(graph, s.getSubject()) + " " + NameUtils.getSafeName(graph, s.getPredicate()) + " " + NameUtils.getSafeName(graph, s.getObject());\r
}\r
\r
- public Collection<Statement> getChanges2() {\r
- return changes2;\r
+ private List<Statement> filterTraversed(List<Statement> in) throws ServiceException {\r
+ return filter(traversed, in);\r
}\r
\r
- public BijectionMap<Statement, Statement> getComparable() {\r
- return comparable;\r
+ private List<Statement> filterNonTested(List<Statement> in) throws ServiceException {\r
+ return filter(nonTested, in);\r
}\r
\r
- private void filterTraversed(Collection<Statement> in, Collection<Statement> out) throws ServiceException {\r
+ private List<Statement> filter(Collection<Resource> toFilter, List<Statement> in) throws ServiceException {\r
+ if (toFilter.size() == 0)\r
+ return in;\r
+ List<Statement> out = new ArrayList<Statement>();\r
for (Statement s : in) {\r
boolean usable = true;\r
- for (Resource r : traversed) {\r
+ for (Resource r : toFilter) {\r
if (g.isSubrelationOf(s.getPredicate(),r)) {\r
usable = false;\r
break;\r
}\r
\r
}\r
+ return out;\r
}\r
\r
- private void compareStatement(List<Statement> ss1, List<Statement> ss2, Stack<Resource> stack1, Stack<Resource> stack2) throws ServiceException, DoesNotContainValueException, ValidationException {\r
+ \r
+ private void addDeletion(Statement s) {\r
+ if (!changes1Set.contains(s)) {\r
+ changes1Set.add(s);\r
+ changes1.add(s);\r
+ }\r
+ }\r
+ \r
+ private void addAddition(Statement s) {\r
+ if (!changes2Set.contains(s)) {\r
+ changes2Set.add(s);\r
+ changes2.add(s);\r
+ }\r
+ }\r
+ \r
+ private void addModification(Statement s1, Statement s2) {\r
+ Pair<Statement, Statement> mod = new Pair<Statement, Statement>(s1,s2);\r
+ if (!modificationsSet.contains(mod)) {\r
+ modificationsSet.add(mod);\r
+ modifications.add(mod);\r
+ }\r
+ }\r
+ \r
+ private void compareStatements(List<Statement> ss1, List<Statement> ss2, Stack<Resource> stack1, Stack<Resource> stack2) throws DatabaseException {\r
Collections.sort(ss1, scomp);\r
Collections.sort(ss2, scomp);\r
\r
break;\r
} else {\r
while (i2 < ss2.size()) {\r
- changes2.add(ss2.get(i2));\r
+ System.out.println("Compare Statement diff2 " + printStatement(g,ss2.get(i2)));\r
+ \r
+ addAddition(ss2.get(i2));\r
i2++;\r
}\r
break;\r
}\r
} else if (i2 >= ss2.size()) {\r
while (i1 < ss1.size()) {\r
- changes1.add(ss1.get(i1));\r
+ System.out.println("Compare Statement diff1 " + printStatement(g,ss1.get(i1)));\r
+ addDeletion(ss1.get(i1));\r
i1++;\r
}\r
break;\r
int same2 = sameRel(ss2, i2);\r
int c = rcomp.compare(ss1.get(i1).getPredicate(),ss2.get(i2).getPredicate());\r
if (c == 0) {\r
- compareObject(ss1, i1, same1, ss2, i2, same2,stack1,stack2);\r
+ compareStatements(ss1, i1, same1, ss2, i2, same2,stack1,stack2);\r
i1+=same1;\r
i2+=same2;\r
} else if (c < 0) {\r
for (int i = 0; i < same1; i++) {\r
- changes1.add(ss1.get(i+i1));\r
+ System.out.println("Compare Statement diff1 " + printStatement(g,ss1.get(i+i1)));\r
+ addDeletion(ss1.get(i+i1));\r
}\r
i1 += same1;\r
- } else {\r
- for (int i = 0; i < same2; i++) {\r
- changes2.add(ss2.get(i+i2));\r
+ } else {\r
+ for (int i = 0; i < same2; i++) {\r
+ System.out.println("Compare Statement diff2 " + printStatement(g,ss2.get(i+i2)));\r
+ addAddition(ss2.get(i+i2));\r
}\r
+ \r
i2 += same2;\r
}\r
\r
\r
}\r
\r
+ private int compareObject(Resource o1, Resource o2) throws DatabaseException {\r
+ if (comparableResources.contains(o1, o2))\r
+ return (-1);\r
+ return comparator.compare(g, o1, o2);\r
+ }\r
\r
- private void compareObject(List<Statement> ss1, int off1, int len1, List<Statement> ss2, int off2, int len2, Stack<Resource> stack1, Stack<Resource> stack2) throws ServiceException, DoesNotContainValueException, ValidationException {\r
+ private void compareStatements(List<Statement> ss1, int off1, int len1, List<Statement> ss2, int off2, int len2, Stack<Resource> stack1, Stack<Resource> stack2) throws DatabaseException {\r
boolean[] used1 = new boolean[len1];\r
for (int i = 0; i < used1.length; i++) {\r
used1[i] = false;\r
List<List<Integer>> differences = new ArrayList<List<Integer>>();\r
for (int i1 = off1; i1 < off1 + len1; i1++) {\r
Statement s1 = ss1.get(i1);\r
- //Map<Integer,Integer> differences = new HashMap<Integer, Integer>();\r
List<Integer> diff = new ArrayList<Integer>();\r
for (int i2 = off2; i2 < off2 + len2; i2++) {\r
Statement s2 = ss2.get(i2);\r
- if (!compareType(s1.getObject(), s2.getObject())) {\r
- diff.add(Integer.MAX_VALUE);\r
- continue;\r
- }\r
- diff.add(propsDiffCount(s1.getObject(), s2.getObject()));\r
+ diff.add(compareObject(s1.getObject(), s2.getObject()));\r
}\r
differences.add(diff);\r
}\r
for (int i2 = 0; i2 < i2diff.size(); i2++) {\r
if (i2diff.get(i2) == pri) {\r
if (used2[i2])\r
- break;\r
+ continue;\r
used1[i1] = true;\r
used2[i2] = true;\r
+ Statement s1 = ss1.get(i1+off1);\r
+ Statement s2 = ss2.get(i2+off2);\r
+ \r
if (stack1 != null) {\r
- stack1.add(ss1.get(i1+off1).getObject());\r
- stack2.add(ss2.get(i2+off2).getObject());\r
+ \r
+ stack1.add(s1.getObject());\r
+ stack2.add(s2.getObject());\r
+ \r
} else {\r
// TODO : how should we report non traversed differences\r
// using compareProps assumes that referenced objects are the same (references are not different)\r
// using propsDiffCount assumes that objects are different, and cannot report changes in referred object.\r
\r
- //compareProps(ss1.get(i1+off1).getObject(), ss2.get(i2+off2).getObject());\r
- int diff = propsDiffCount(ss1.get(i1+off1).getObject(), ss2.get(i2+off2).getObject());\r
- if (diff != 0) {\r
- changes1.add(ss1.get(i1+off1));\r
- changes2.add(ss2.get(i2+off2));\r
- }\r
+ \r
+// int diff = propsDiffCount(ss1.get(i1+off1).getObject(), ss2.get(i2+off2).getObject());\r
+// if (diff != 0) {\r
+// //changes1.add(ss1.get(i1+off1));\r
+// //changes2.add(ss2.get(i2+off2));\r
+// modifies.add(new Pair<Statement, Statement>(ss1.get(i1+off1), ss2.get(i2+off2)));\r
+// }\r
}\r
+ comparableStatements.map(s1, s2);\r
+ //comparableResources.map(s1.getObject(), s2.getObject());\r
+ break;\r
}\r
}\r
}\r
}\r
for (int i1 = off1; i1 < off1 + len1; i1++) {\r
- if (!used1[i1-off1])\r
- changes1.add(ss1.get(i1));\r
+ if (!used1[i1-off1]) {\r
+ System.out.println("Compare Object diff1 " + printStatement(g,ss1.get(i1)));\r
+ addDeletion(ss1.get(i1));\r
+ }\r
}\r
for (int i2 = off2; i2 < off2 + len2; i2++) {\r
- if (!used2[i2-off2])\r
- changes2.add(ss2.get(i2));\r
- }\r
- }\r
- \r
- private boolean compareType(Resource r1, Resource r2) throws ServiceException, ManyObjectsForFunctionalRelationException {\r
- rs1.addAll(g.getObjects(r1, b.InstanceOf));\r
- rs2.addAll(g.getObjects(r2, b.InstanceOf));\r
- if (rs1.size() != rs2.size()) {\r
- rs1.clear();\r
- rs2.clear();\r
- return false;\r
- }\r
- Collections.sort(rs1, rcomp);\r
- Collections.sort(rs2, rcomp);\r
- for (int i = 0; i < rs1.size(); i++) {\r
- int c = rcomp.compare(rs1.get(i), rs2.get(i));\r
- if (c != 0) {\r
- rs1.clear();\r
- rs2.clear();\r
- return false;\r
+ if (!used2[i2-off2]) {\r
+ System.out.println("Compare Object diff2 " + printStatement(g,ss2.get(i2)));\r
+ addAddition(ss2.get(i2));\r
}\r
}\r
- \r
- rs1.clear();\r
- rs2.clear();\r
- \r
- return true;\r
}\r
\r
+ \r
+ \r
/**\r
* compares properties, assumes functional relations\r
* @param r1\r
* @param r2\r
- * @throws ManyObjectsForFunctionalRelationException\r
* @throws ServiceException\r
* @throws DoesNotContainValueException\r
+ * @throws ValidationException \r
*/\r
- private void compareProps(Resource r1, Resource r2) throws ManyObjectsForFunctionalRelationException, ServiceException, DoesNotContainValueException {\r
+ private void compareProps(Resource r1, Resource r2) throws ServiceException, DoesNotContainValueException, ValidationException {\r
ArrayList<Statement> ss1 = new ArrayList<Statement>();\r
ArrayList<Statement> ss2 = new ArrayList<Statement>();\r
ss1.addAll(g.getStatements(r1, b.HasProperty));\r
break;\r
else {\r
while (i2 < ss2.size()) {\r
- changes2.add(ss2.get(i2));\r
+ System.out.println("Compare Prop diff2 " + printStatement(g,ss2.get(i2)));\r
+ addAddition(ss2.get(i2));\r
i2++;\r
}\r
break;\r
}\r
} else if (i2 >= ss2.size()) {\r
while (i1 < ss1.size()) {\r
- changes1.add(ss1.get(i1));\r
+ System.out.println("Compare Prop diff1 " + printStatement(g,ss1.get(i1)));\r
+ addDeletion(ss1.get(i1));\r
i1++;\r
}\r
break;\r
if (b1) {\r
Object v1 = g.getValue(s1.getObject());\r
Object v2 = g.getValue(s2.getObject());\r
- boolean eq = false;\r
- if (v1 instanceof Object[] && v2 instanceof Object[])\r
- eq = Arrays.deepEquals((Object[])v1, (Object[])v2);\r
- else\r
- eq = v1.equals(v2);\r
+ boolean eq = compareValue(v1, v2);\r
if (!eq) {\r
- changes1.add(s1);\r
- changes2.add(s2);\r
- comparable.map(s1, s2);\r
+ addModification(s1, s2);\r
+ comparableStatements.map(s1, s2);\r
+ comparableResources.map(s1.getObject(),s2.getObject());\r
}\r
} else {\r
compareProps(s1.getObject(), s2.getObject());\r
}\r
} else {\r
- changes1.add(s1);\r
- changes2.add(s2);\r
- comparable.map(s1, s2);\r
+ addModification(s1, s2);\r
+ comparableStatements.map(s1, s2);\r
+ comparableResources.map(s1.getObject(),s2.getObject());\r
}\r
i1++;\r
i2++;\r
break;\r
}\r
case -1:{\r
- changes1.add(s1);\r
+ System.out.println("Compare Prop diff1s " + printStatement(g,s1));\r
+ addDeletion(s1);\r
i1++;\r
break;\r
}\r
\r
case 1:{\r
- changes2.add(s2);\r
+ System.out.println("Compare Prop diff2s " + printStatement(g,s2));\r
+ addAddition(s2);\r
i2++;\r
break;\r
}\r
\r
}\r
\r
- private int propsDiffCount(Resource r1, Resource r2) throws ServiceException, DoesNotContainValueException, ValidationException {\r
- ArrayList<Statement> ss1 = new ArrayList<Statement>();\r
- ArrayList<Statement> ss2 = new ArrayList<Statement>();\r
- ss1.addAll(g.getStatements(r1, b.HasProperty));\r
- ss2.addAll(g.getStatements(r2, b.HasProperty));\r
- //System.out.println("Props count " + GraphUtils.getReadableName(g, r1) + " " + GraphUtils.getReadableName(g, r2));\r
- Collections.sort(ss1, scomp);\r
- Collections.sort(ss2, scomp);\r
- \r
- int count = 0;\r
- \r
- int i1 = 0; \r
- int i2 = 0;\r
- \r
- while (true) {\r
- if (i1 >= ss1.size()) {\r
- if (i2 >= ss2.size())\r
- break;\r
- else {\r
- while (i2 < ss2.size()) {\r
- count++;\r
- i2++;\r
- }\r
- break;\r
- }\r
- } else if (i2 >= ss2.size()) {\r
- while (i1 < ss1.size()) {\r
- count++;\r
- i1++;\r
- }\r
- break;\r
- }\r
- Statement s1 = ss1.get(i1);\r
- Statement s2 = ss2.get(i2);\r
- int c = scomp.compare(s1, s2);\r
- switch (c) {\r
- case 0:{\r
- boolean b1 = g.hasValue(s1.getObject());\r
- boolean b2 = g.hasValue(s2.getObject());\r
- if (b1 == b2) {\r
- if (b1) {\r
- Object v1 = g.getValue(s1.getObject());\r
- Object v2 = g.getValue(s2.getObject());\r
- boolean eq = false;\r
- if (v1 instanceof Object[] && v2 instanceof Object[])\r
- eq = Arrays.deepEquals((Object[])v1, (Object[])v2);\r
- else\r
- eq = v1.equals(v2);\r
- if (!eq) {\r
- count++;\r
- }\r
- //System.out.println("Prop count values " + v1 + " " + v2);\r
- } else {\r
- count += propsDiffCount(s1.getObject(), s2.getObject());\r
- }\r
- } else {\r
- //System.out.println("Props count structural vs literal");\r
- count++;\r
- }\r
- i1++;\r
- i2++;\r
- break;\r
- }\r
- case -1:{\r
- count++;\r
- i1++;\r
- break;\r
- }\r
- \r
- case 1:{\r
- count++;\r
- i2++;\r
- break;\r
- }\r
- }\r
- \r
-\r
- }\r
- \r
- ss1.clear();\r
- ss2.clear();\r
- return count;\r
+ \r
+ public static boolean compareValue(Object v1, Object v2) {\r
+ if (v1 instanceof Object[] && v2 instanceof Object[])\r
+ return Arrays.deepEquals((Object[])v1, (Object[])v2);\r
+ else if (v1 instanceof int[] && v2 instanceof int[]) \r
+ return Arrays.equals((int[])v1, (int[])v2);\r
+ else if (v1 instanceof float[] && v2 instanceof float[]) \r
+ return Arrays.equals((float[])v1, (float[])v2);\r
+ else if (v1 instanceof double[] && v2 instanceof double[]) \r
+ return Arrays.equals((double[])v1, (double[])v2);\r
+ else if (v1 instanceof long[] && v2 instanceof long[]) \r
+ return Arrays.equals((long[])v1, (long[])v2);\r
+ else if (v1 instanceof byte[] && v2 instanceof byte[]) \r
+ return Arrays.equals((byte[])v1, (byte[])v2);\r
+ else if (v1 instanceof boolean[] && v2 instanceof boolean[]) \r
+ return Arrays.equals((boolean[])v1, (boolean[])v2);\r
+ else\r
+ return v1.equals(v2);\r
}\r
\r
\r
\r
- public class StatementComparator implements Comparator<Statement> {\r
+ public static class PredicateComparator implements Comparator<Statement> {\r
+ @Override\r
+ public int compare(Statement o1, Statement o2) {\r
+ if (o1.getPredicate().getResourceId() < o2.getPredicate().getResourceId())\r
+ return -1;\r
+ if (o1.getPredicate().getResourceId() > o2.getPredicate().getResourceId())\r
+ return 1;\r
+ return 0;\r
+ }\r
+ }\r
+ \r
+ public static class FullStatementComparator implements Comparator<Statement> {\r
@Override\r
public int compare(Statement o1, Statement o2) {\r
+ if (o1.getSubject().getResourceId() < o2.getSubject().getResourceId())\r
+ return -1;\r
+ if (o1.getSubject().getResourceId() > o2.getSubject().getResourceId())\r
+ return 1;\r
if (o1.getPredicate().getResourceId() < o2.getPredicate().getResourceId())\r
return -1;\r
if (o1.getPredicate().getResourceId() > o2.getPredicate().getResourceId())\r
return 1;\r
+ if (o1.getObject().getResourceId() < o2.getObject().getResourceId())\r
+ return -1;\r
+ if (o1.getObject().getResourceId() > o2.getObject().getResourceId())\r
+ return 1;\r
return 0;\r
}\r
}\r
\r
\r
\r
- public class ResourceComparator implements Comparator<Resource> {\r
+ public static class ResourceComparator implements Comparator<Resource> {\r
@Override\r
public int compare(Resource o1, Resource o2) {\r
if (o1.getResourceId() < o2.getResourceId())\r
return -1;\r
- if (o2.getResourceId() > o2.getResourceId())\r
+ if (o1.getResourceId() > o2.getResourceId())\r
return 1;\r
return 0;\r
}\r
}\r
+ \r
+ \r
}\r
Code Review / simantics / interop.git / blobdiff