merge 1.2 branch to trunk

src/difflib/DeleteDelta.java

@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU General Public License
     along with Java Diff Utills Library.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 package difflib;
 
 import java.util.List;
@@ -26,48 +26,49 @@ import java.util.List;
  * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
  */
 public class DeleteDelta extends Delta {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public DeleteDelta(Chunk original, Chunk revised) {
-		super(original, revised);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @throws PatchFailedException 
-	 */
-	@Override
-	public void applyTo(List<Object> target) throws PatchFailedException {
-		verify(target);
-		int position = getOriginal().getPosition();
-		int size = getOriginal().getSize();
-		for (int i = 0; i < size; i++) {
-			target.remove(position);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void restore(List<Object> target) {
-		int position = this.getRevised().getPosition(); 
-		List<?> lines = this.getOriginal().getLines();
-		for (int i = 0; i < lines.size(); i++) {
-			target.add(position + i, lines.get(i));
-		}
-	}
-
-	@Override
-	public void verify(List<?> target) throws PatchFailedException {
-		getOriginal().verify(target);
-	}
-	
-	@Override
-	public String toString() {
-		return "[DeleteDelta, position: " + getOriginal().getPosition() + ", lines: " + 
-			getOriginal().getLines() + "]"; 
-	}
+    
+    /**
+     * {@inheritDoc}
+     */
+    public DeleteDelta(Chunk original, Chunk revised) {
+        super(original, revised);
+    }
+    
+    /**
+     * {@inheritDoc}
+     * 
+     * @throws PatchFailedException
+     */
+    @Override
+    public void applyTo(List<Object> target) throws PatchFailedException {
+        verify(target);
+        int position = getOriginal().getPosition();
+        int size = getOriginal().getSize();
+        for (int i = 0; i < size; i++) {
+            target.remove(position);
+        }
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void restore(List<Object> target) {
+        int position = this.getRevised().getPosition();
+        List<?> lines = this.getOriginal().getLines();
+        for (int i = 0; i < lines.size(); i++) {
+            target.add(position + i, lines.get(i));
+        }
+    }
+    
+    @Override
+    public void verify(List<?> target) throws PatchFailedException {
+        getOriginal().verify(target);
+    }
+    
+    @Override
+    public String toString() {
+        return "[DeleteDelta, position: " + getOriginal().getPosition() + ", lines: "
+                + getOriginal().getLines() + "]";
+    }
 }