Merge

scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java

@@ -1,19 +1,19 @@
-/**
+/*
  * Copyright (c) 2010, Sebastian Sdorra
  * All rights reserved.
- *
+ * <p>
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- *
+ * <p>
  * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
  * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * <p>
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -24,13 +24,11 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ * <p>
  * http://bitbucket.org/sdorra/scm-manager
- *
  */
 
 
-
 package sonia.scm.repository.spi;
 
 //~--- non-JDK imports --------------------------------------------------------
@@ -41,8 +39,7 @@ import org.slf4j.LoggerFactory;
 import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.wc.DefaultSVNDiffGenerator;
-import org.tmatesoft.svn.core.wc.ISVNDiffGenerator;
+import org.tmatesoft.svn.core.internal.wc2.ng.SvnNewDiffGenerator;
 import org.tmatesoft.svn.core.wc.SVNClientManager;
 import org.tmatesoft.svn.core.wc.SVNDiffClient;
 import org.tmatesoft.svn.core.wc.SVNRevision;
@@ -60,8 +57,7 @@ import java.io.OutputStream;
  *
  * @author Sebastian Sdorra
  */
-public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
-{
+public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand {
 
   /**
    * the logger for SvnDiffCommand
@@ -69,46 +65,26 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
   private static final Logger logger =
     LoggerFactory.getLogger(SvnDiffCommand.class);
 
-  public SvnDiffCommand(SvnContext context, Repository repository)
-  {
+  public SvnDiffCommand(SvnContext context, Repository repository) {
     super(context, repository);
   }
 
   @Override
   public void getDiffResult(DiffCommandRequest request, OutputStream output) {
-    if (logger.isDebugEnabled())
-    {
-      logger.debug("create diff for {}", request);
-    }
-
+    logger.debug("create diff for {}", request);
     Preconditions.checkNotNull(request, "request is required");
     Preconditions.checkNotNull(output, "outputstream is required");
 
     String path = request.getPath();
     SVNClientManager clientManager = null;
-
-    try
-    {
+    try {
       SVNURL svnurl = context.createUrl();
-
-      if (Util.isNotEmpty(path))
-      {
+      if (Util.isNotEmpty(path)) {
         svnurl = svnurl.appendPath(path, true);
       }
-
       clientManager = SVNClientManager.newInstance();
-
       SVNDiffClient diffClient = clientManager.getDiffClient();
-      ISVNDiffGenerator diffGenerator = diffClient.getDiffGenerator();
-
-      if (diffGenerator == null)
-      {
-        diffGenerator = new DefaultSVNDiffGenerator();
-      }
-
-      diffGenerator.setDiffAdded(true);
-      diffGenerator.setDiffDeleted(true);
-      diffClient.setDiffGenerator(diffGenerator);
+      diffClient.setDiffGenerator(new SvnNewDiffGenerator(new SCMSvnDiffGenerator()));
 
       long currentRev = SvnUtil.getRevisionNumber(request.getRevision(), repository);
 
@@ -117,13 +93,9 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
       diffClient.doDiff(svnurl, SVNRevision.HEAD,
         SVNRevision.create(currentRev - 1), SVNRevision.create(currentRev),
         SVNDepth.INFINITY, false, output);
-    }
-    catch (SVNException ex)
-    {
+    } catch (SVNException ex) {
       throw new InternalRepositoryException(repository, "could not create diff", ex);
-    }
-    finally
-    {
+    } finally {
       SvnUtil.dispose(clientManager);
     }
   }