Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-31 10:35:56 +01:00
Code Issues Packages Projects Releases Activity

Remove unnecessary interfaces

Browse Source
This commit is contained in:
René Pfeuffer
2020-05-14 23:30:26 +02:00
parent 7e945afc43
commit 77d6784386
10 changed files with 62 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactory.java
View File

@@ -25,8 +25,8 @@
package sonia.scm.repository.spi;
import sonia.scm.repository.SvnWorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyPool;
import sonia.scm.repository.work.SimpleWorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyPool;
import javax.inject.Inject;
import java.io.File;
@@ -39,13 +39,13 @@ public class SimpleSvnWorkingCopyFactory extends SimpleWorkingCopyFactory<File,
}
@Override
protected WorkingCopyInitializer<File, File> getInitializer(SvnContext context) {
return new SvnWorkingCopyInitializer(context);
protected ParentAndClone<File, File> initialize(SvnContext context, File workingCopy, String initialBranch) {
return new SvnWorkingCopyInitializer(context).initialize(workingCopy);
}
@Override
protected WorkingCopyReclaimer<File, File> getReclaimer(SvnContext context) {
return new SvnWorkingCopyReclaimer(context);
protected ParentAndClone<File, File> reclaim(SvnContext context, File target, String initialBranch) throws SimpleWorkingCopyFactory.ReclaimFailedException {
return new SvnWorkingCopyReclaimer(context).reclaim(target);
}
@Override

6
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnWorkingCopyInitializer.java
View File

@@ -30,20 +30,18 @@ import org.tmatesoft.svn.core.wc2.SvnCheckout;
import org.tmatesoft.svn.core.wc2.SvnOperationFactory;
import org.tmatesoft.svn.core.wc2.SvnTarget;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.work.SimpleWorkingCopyFactory;
import sonia.scm.repository.work.SimpleWorkingCopyFactory.ParentAndClone;
import java.io.File;
class SvnWorkingCopyInitializer implements SimpleWorkingCopyFactory.WorkingCopyInitializer<File, File> {
class SvnWorkingCopyInitializer {
private final SvnContext context;
public SvnWorkingCopyInitializer(SvnContext context) {
this.context = context;
}
@Override
public ParentAndClone<File, File> initialize(File workingCopy, String initialBranch) {
public ParentAndClone<File, File> initialize(File workingCopy) {
final SvnOperationFactory svnOperationFactory = new SvnOperationFactory();
SVNURL source;

5
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnWorkingCopyReclaimer.java
View File

@@ -34,15 +34,14 @@ import java.io.File;
import static org.tmatesoft.svn.core.SVNDepth.INFINITY;
class SvnWorkingCopyReclaimer implements SimpleWorkingCopyFactory.WorkingCopyReclaimer<File, File> {
class SvnWorkingCopyReclaimer {
private final SvnContext context;
public SvnWorkingCopyReclaimer(SvnContext context) {
this.context = context;
}
@Override
public ParentAndClone<File, File> reclaim(File target, String initialBranch) throws SimpleWorkingCopyFactory.ReclaimFailedException {
public ParentAndClone<File, File> reclaim(File target) throws SimpleWorkingCopyFactory.ReclaimFailedException {
SVNClientManager clientManager = SVNClientManager.newInstance();
try {
clientManager.getWCClient().doRevert(new File[] {target}, INFINITY, null);