From 922e8c084a0d453fae8d7f0cb8aa7cc12efd2ec6 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 13 May 2010 23:53:07 +0000 Subject: [PATCH] TAB->WS git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@31021 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/test/ExtractChangeLogParser.java | 229 +++++++++--------- 1 file changed, 108 insertions(+), 121 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/ExtractChangeLogParser.java b/test/src/main/java/org/jvnet/hudson/test/ExtractChangeLogParser.java index 17f94d4e57..5455efd2e7 100644 --- a/test/src/main/java/org/jvnet/hudson/test/ExtractChangeLogParser.java +++ b/test/src/main/java/org/jvnet/hudson/test/ExtractChangeLogParser.java @@ -24,149 +24,136 @@ package org.jvnet.hudson.test; import hudson.model.AbstractBuild; -import hudson.model.BuildListener; import hudson.model.User; -import hudson.scm.ChangeLogSet; - import hudson.scm.ChangeLogParser; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.io.FileOutputStream; - -import java.io.IOException; - -import java.util.List; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; - +import hudson.scm.ChangeLogSet; import org.apache.commons.digester.Digester; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; import org.xml.sax.SAXException; -import org.kohsuke.stapler.export.ExportedBean; -import org.kohsuke.stapler.export.Exported; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; /** * @author Andrew Bayer */ - - public class ExtractChangeLogParser extends ChangeLogParser { @Override public ExtractChangeLogSet parse(AbstractBuild build, File changeLogFile) throws IOException, SAXException { - if (changeLogFile.exists()) { - FileInputStream fis = new FileInputStream(changeLogFile); - ExtractChangeLogSet logSet = parse(build, fis); - fis.close(); - return logSet; - } - else { - return new ExtractChangeLogSet(build, new ArrayList()); - } + if (changeLogFile.exists()) { + FileInputStream fis = new FileInputStream(changeLogFile); + ExtractChangeLogSet logSet = parse(build, fis); + fis.close(); + return logSet; + } else { + return new ExtractChangeLogSet(build, new ArrayList()); + } } - - - + public ExtractChangeLogSet parse(AbstractBuild build, InputStream changeLogStream) throws IOException, SAXException { - - ArrayList changeLog = new ArrayList(); - - Digester digester = new Digester(); - digester.setClassLoader(ExtractChangeLogSet.class.getClassLoader()); - digester.push(changeLog); - digester.addObjectCreate("*/extractChanges/entry", ExtractChangeLogEntry.class); - - digester.addBeanPropertySetter("*/extractChanges/entry/zipFile"); - - digester.addObjectCreate("*/extractChanges/entry/file", - FileInZip.class); - digester.addBeanPropertySetter("*/extractChanges/entry/file/fileName"); - digester.addSetNext("*/extractChanges/entry/file", "addFile"); - digester.addSetNext("*/extractChanges/entry", "add"); - - digester.parse(changeLogStream); - - return new ExtractChangeLogSet(build, changeLog); + + ArrayList changeLog = new ArrayList(); + + Digester digester = new Digester(); + digester.setClassLoader(ExtractChangeLogSet.class.getClassLoader()); + digester.push(changeLog); + digester.addObjectCreate("*/extractChanges/entry", ExtractChangeLogEntry.class); + + digester.addBeanPropertySetter("*/extractChanges/entry/zipFile"); + + digester.addObjectCreate("*/extractChanges/entry/file", + FileInZip.class); + digester.addBeanPropertySetter("*/extractChanges/entry/file/fileName"); + digester.addSetNext("*/extractChanges/entry/file", "addFile"); + digester.addSetNext("*/extractChanges/entry", "add"); + + digester.parse(changeLogStream); + + return new ExtractChangeLogSet(build, changeLog); } - @ExportedBean(defaultVisibility=999) + @ExportedBean(defaultVisibility = 999) public static class ExtractChangeLogEntry extends ChangeLogSet.Entry { - private List files = new ArrayList(); - private String zipFile; + private List files = new ArrayList(); + private String zipFile; - public ExtractChangeLogEntry() { - } - - public ExtractChangeLogEntry(String zipFile) { - this.zipFile = zipFile; - } - - public void setZipFile(String zipFile) { - this.zipFile = zipFile; - } - - @Exported - public String getZipFile() { - return zipFile; - } - - @Override - public void setParent(ChangeLogSet parent) { - super.setParent(parent); - } - - @Override - public Collection getAffectedPaths() { - Collection paths = new ArrayList(files.size()); - for (FileInZip file : files) { - paths.add(file.getFileName()); - } - return paths; - } - - @Override - @Exported - public User getAuthor() { - return User.get("testuser"); - } - - @Override - @Exported - public String getMsg() { - return "Extracted from " + zipFile; - } - - public void addFile(FileInZip fileName) { - files.add(fileName); - } - - public void addFiles(Collection fileNames) { - this.files.addAll(fileNames); - } + public ExtractChangeLogEntry() { + } + + public ExtractChangeLogEntry(String zipFile) { + this.zipFile = zipFile; + } + + public void setZipFile(String zipFile) { + this.zipFile = zipFile; + } + + @Exported + public String getZipFile() { + return zipFile; + } + + @Override + public void setParent(ChangeLogSet parent) { + super.setParent(parent); + } + + @Override + public Collection getAffectedPaths() { + Collection paths = new ArrayList(files.size()); + for (FileInZip file : files) { + paths.add(file.getFileName()); + } + return paths; + } + + @Override + @Exported + public User getAuthor() { + return User.get("testuser"); + } + + @Override + @Exported + public String getMsg() { + return "Extracted from " + zipFile; + } + + public void addFile(FileInZip fileName) { + files.add(fileName); + } + + public void addFiles(Collection fileNames) { + this.files.addAll(fileNames); + } } - @ExportedBean(defaultVisibility=999) + @ExportedBean(defaultVisibility = 999) public static class FileInZip { - private String fileName = ""; - - public FileInZip() { - } - - public FileInZip(String fileName) { - this.fileName = fileName; - } - - @Exported - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } + private String fileName = ""; + + public FileInZip() { + } + + public FileInZip(String fileName) { + this.fileName = fileName; + } + + @Exported + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } } }