Remove DiffResult

git-svn-id: https://svn.argeo.org/slc/trunk@5559 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/Diff.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/Diff.java
index 00c8d2a66ff6f919ca2a90557fffe0e5dd846d41..7e610cdf85793a0670616137978562f2a7380b97 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/Diff.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/Diff.java
@@ -18,7 +18,7 @@ package org.argeo.slc.diff;
 import org.springframework.core.io.Resource;\r
 \r
 /** A comparator providing structured information about the differences found. */\r
-public interface Diff {\r
+public interface Diff<T> {\r
        /** Performs the comparison. */\r
-       public DiffResult compare(Resource expected, Resource reached);\r
+       public T compare(Resource expected, Resource reached);\r
 }\r

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffResult.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffResult.java
deleted file mode 100644 (file)
index 485b771..0000000
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffResult.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*\r
- * Copyright (C) 2007-2012 Mathieu Baudier\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.argeo.slc.diff;\r
-\r
-import java.util.List;\r
-import java.util.Map;\r
-\r
-/**\r
- * The result of a diff. Can be subclassed to provided more structured\r
- * information.\r
- */\r
-public interface DiffResult {\r
-       /** Summary information, alphabetically ordered key/value pairs */\r
-       public Map<String, String> getSummary();\r
-\r
-       /** The list of issues, a zero size meaning that the diff succeeded. */\r
-       public List<DiffIssue> getIssues();\r
-}\r

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/SimpleDiffResult.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/SimpleDiffResult.java
deleted file mode 100644 (file)
index cc1facb..0000000
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/SimpleDiffResult.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*\r
- * Copyright (C) 2007-2012 Mathieu Baudier\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.argeo.slc.diff;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-import java.util.Map;\r
-import java.util.TreeMap;\r
-\r
-/** A basic implementation of <code>DiffResult</code>. */\r
-public class SimpleDiffResult implements DiffResult {\r
-       private final List<DiffIssue> issues;\r
-       private final Map<String, String> summary;\r
-\r
-       /** Empty constructor */\r
-       public SimpleDiffResult() {\r
-               this(new TreeMap<String, String>(), new ArrayList<DiffIssue>());\r
-       }\r
-\r
-       /** Initialize from existing data */\r
-       public SimpleDiffResult(Map<String, String> summary, List<DiffIssue> issues) {\r
-               this.summary = summary;\r
-               this.issues = issues;\r
-       }\r
-\r
-       /**\r
-        * Initialize from existing {@link DiffResult}, the collections are NOT\r
-        * cloned for performance purposes.\r
-        */\r
-       public SimpleDiffResult(DiffResult diffResult) {\r
-               this.summary = diffResult.getSummary();\r
-               this.issues = diffResult.getIssues();\r
-       }\r
-\r
-       /** Summary information, alphabetically ordered key/value pairs */\r
-       public Map<String, String> getSummary() {\r
-               return summary;\r
-       }\r
-\r
-       /** The diff issues. */\r
-       public List<DiffIssue> getIssues() {\r
-               return issues;\r
-       }\r
-\r
-}\r