From 5e0439f7d96c6bd6f15640a267524e811ad63e98 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 5 Sep 2012 21:31:25 +0000
Subject: [PATCH] Remove DiffResult

git-svn-id: https://svn.argeo.org/slc/trunk@5559 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../main/java/org/argeo/slc/diff/Diff.java    |  4 +-
 .../java/org/argeo/slc/diff/DiffResult.java   | 31 ----------
 .../org/argeo/slc/diff/SimpleDiffResult.java  | 58 -------------------
 3 files changed, 2 insertions(+), 91 deletions(-)
 delete mode 100644 runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffResult.java
 delete mode 100644 runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/SimpleDiffResult.java

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 00c8d2a66..7e610cdf8 100644
--- 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;
 
 /** A comparator providing structured information about the differences found. */
-public interface Diff {
+public interface Diff<T> {
 	/** Performs the comparison. */
-	public DiffResult compare(Resource expected, Resource reached);
+	public T compare(Resource expected, Resource reached);
 }
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
index 485b7712e..000000000
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffResult.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Mathieu Baudier
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.slc.diff;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * The result of a diff. Can be subclassed to provided more structured
- * information.
- */
-public interface DiffResult {
-	/** Summary information, alphabetically ordered key/value pairs */
-	public Map<String, String> getSummary();
-
-	/** The list of issues, a zero size meaning that the diff succeeded. */
-	public List<DiffIssue> getIssues();
-}
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
index cc1facb66..000000000
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/SimpleDiffResult.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Mathieu Baudier
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.slc.diff;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-/** A basic implementation of <code>DiffResult</code>. */
-public class SimpleDiffResult implements DiffResult {
-	private final List<DiffIssue> issues;
-	private final Map<String, String> summary;
-
-	/** Empty constructor */
-	public SimpleDiffResult() {
-		this(new TreeMap<String, String>(), new ArrayList<DiffIssue>());
-	}
-
-	/** Initialize from existing data */
-	public SimpleDiffResult(Map<String, String> summary, List<DiffIssue> issues) {
-		this.summary = summary;
-		this.issues = issues;
-	}
-
-	/**
-	 * Initialize from existing {@link DiffResult}, the collections are NOT
-	 * cloned for performance purposes.
-	 */
-	public SimpleDiffResult(DiffResult diffResult) {
-		this.summary = diffResult.getSummary();
-		this.issues = diffResult.getIssues();
-	}
-
-	/** Summary information, alphabetically ordered key/value pairs */
-	public Map<String, String> getSummary() {
-		return summary;
-	}
-
-	/** The diff issues. */
-	public List<DiffIssue> getIssues() {
-		return issues;
-	}
-
-}
-- 
2.39.2