DiffUtil.java |
1 /** 2 * Copyright (c) 2000-2009 Liferay, Inc. All rights reserved. 3 * 4 * 5 * 6 * 7 * The contents of this file are subject to the terms of the Liferay Enterprise 8 * Subscription License ("License"). You may not use this file except in 9 * compliance with the License. You can obtain a copy of the License by 10 * contacting Liferay, Inc. See the License for the specific language governing 11 * permissions and limitations under the License, including but not limited to 12 * distribution rights of the Software. 13 * 14 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 15 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 16 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 17 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 18 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 19 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 20 * SOFTWARE. 21 */ 22 23 package com.liferay.portal.kernel.util; 24 25 import java.io.Reader; 26 27 import java.util.List; 28 29 /** 30 * <a href="DiffUtil.java.html"><b><i>View Source</i></b></a> 31 * 32 * <p> 33 * This class can compare two different versions of a text. Source refers to the 34 * earliest version of the text and target refers to a modified version of 35 * source. Changes are considered either as a removal from the source or as an 36 * addition to the target. This class detects changes to an entire line and also 37 * detects changes within lines, such as, removal or addition of characters. 38 * Take a look at <code>DiffTest</code> to see the expected inputs and outputs. 39 * </p> 40 * 41 * @author Bruno Farache 42 * @see com.liferay.portal.kernel.util.DiffUtil 43 */ 44 public class DiffUtil { 45 46 public static List<DiffResult>[] diff(Reader source, Reader target) { 47 return getDiff().diff(source, target); 48 } 49 50 public static List<DiffResult>[] diff( 51 Reader source, Reader target, String addedMarkerStart, 52 String addedMarkerEnd, String deletedMarkerStart, 53 String deletedMarkerEnd, int margin) { 54 55 return getDiff().diff( 56 source, target, addedMarkerStart, addedMarkerEnd, 57 deletedMarkerStart, deletedMarkerEnd, margin); 58 } 59 60 public static Diff getDiff() { 61 return _diff; 62 } 63 64 public void setDiff(Diff diff) { 65 _diff = diff; 66 } 67 68 private static Diff _diff; 69 70 }