From 9b60f49b855cd85d91f26ae6b507943cd533a630 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 26 Mar 2007 01:12:40 +0000 Subject: [PATCH] further touch up. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2665 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/scm/SubversionSCM.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/hudson/scm/SubversionSCM.java b/core/src/main/java/hudson/scm/SubversionSCM.java index 00b65f3e16..2c1fcfed46 100644 --- a/core/src/main/java/hudson/scm/SubversionSCM.java +++ b/core/src/main/java/hudson/scm/SubversionSCM.java @@ -53,7 +53,6 @@ import java.io.PrintWriter; import java.io.Serializable; import java.io.StringWriter; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.Hashtable; import java.util.List; @@ -119,13 +118,11 @@ public class SubversionSCM extends SCM implements Serializable { } /** - * this method is beeing kept for compatibility reasons with older hudson - * installations. All data is beeing stored in the {@link #locations} filed - * which is basically a list of {@link ModuleLocation}s + * @deprecated + * as of 1.91. Use {@link #getLocations()} instead. */ - @Deprecated public String getModules() { - return modules; + return null; } /** @@ -165,14 +162,6 @@ public class SubversionSCM extends SCM implements Serializable { return browser; } - private Collection getModuleDirNames() { - List dirs = new ArrayList(); - for (ModuleLocation l : getLocations()) { - dirs.add(l.local); - } - return dirs; - } - private boolean calcChangeLog(AbstractBuild build, File changelogFile, BuildListener listener) throws IOException { if(build.getPreviousBuild()==null) { // nothing to compare against @@ -390,9 +379,9 @@ public class SubversionSCM extends SCM implements Serializable { SVNWCClient svnWc = createSvnClientManager(authProvider).getWCClient(); // invoke the "svn info" - for( String module : getModuleDirNames() ) { + for( ModuleLocation module : getLocations() ) { try { - SvnInfo info = new SvnInfo(svnWc.doInfo(new File(ws,module),SVNRevision.WORKING)); + SvnInfo info = new SvnInfo(svnWc.doInfo(new File(ws,module.local),SVNRevision.WORKING)); revisions.put(info.url,info); } catch (SVNException e) { e.printStackTrace(listener.error("Failed to parse svn info for "+module));