DiffUtil.java |
1 /** 2 * Copyright (c) 2000-2009 Liferay, Inc. All rights reserved. 3 * 4 * Permission is hereby granted, free of charge, to any person obtaining a copy 5 * of this software and associated documentation files (the "Software"), to deal 6 * in the Software without restriction, including without limitation the rights 7 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 8 * copies of the Software, and to permit persons to whom the Software is 9 * furnished to do so, subject to the following conditions: 10 * 11 * The above copyright notice and this permission notice shall be included in 12 * all copies or substantial portions 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 34 * the 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 * 43 * @see com.liferay.portal.kernel.util.DiffUtil 44 * 45 */ 46 public class DiffUtil { 47 48 public static List<DiffResult>[] diff(Reader source, Reader target) { 49 return getDiff().diff(source, target); 50 } 51 52 public static List<DiffResult>[] diff( 53 Reader source, Reader target, String addedMarkerStart, 54 String addedMarkerEnd, String deletedMarkerStart, 55 String deletedMarkerEnd, int margin) { 56 57 return getDiff().diff( 58 source, target, addedMarkerStart, addedMarkerEnd, 59 deletedMarkerStart, deletedMarkerEnd, margin); 60 } 61 62 public static Diff getDiff() { 63 return _diff; 64 } 65 66 public void setDiff(Diff diff) { 67 _diff = diff; 68 } 69 70 private static Diff _diff; 71 72 }