Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
Juri Timošin committed Jan 4, 2012
1 parent 9bf35cb commit 6204dbf
Showing 1 changed file with 21 additions and 26 deletions.
47 changes: 21 additions & 26 deletions src/main/java/htmlpublisher/HtmlPublisher.java
Expand Up @@ -27,39 +27,24 @@
import hudson.FilePath;
import hudson.Launcher;
import hudson.Util;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Action;
import hudson.model.BuildListener;
import hudson.model.Hudson;
import hudson.model.Result;
import hudson.matrix.MatrixConfiguration;
import hudson.matrix.MatrixProject;
import hudson.model.*;
import hudson.tasks.BuildStepDescriptor;
import hudson.tasks.BuildStepMonitor;
import hudson.tasks.Publisher;
import hudson.tasks.Recorder;
import hudson.util.FormValidation;

import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.Collection;
import java.util.Collections;
import java.util.ArrayList;
import java.util.List;

import javax.servlet.ServletException;

import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;

import htmlpublisher.HtmlPublisherTarget;
import javax.servlet.ServletException;
import java.io.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;

/**
* Saves HTML reports for the project and publishes them.
Expand Down Expand Up @@ -251,9 +236,19 @@ public Collection<? extends Action> getProjectActions(AbstractProject<?, ?> proj
if (this.reportTargets.isEmpty()) {
return Collections.emptyList();
} else {
ArrayList<Action> actions = new ArrayList<Action>();
ArrayList<Action> actions = new ArrayList<Action>();
for (HtmlPublisherTarget target : this.reportTargets) {
actions.add(target.getProjectAction(project));
actions.add(target.getProjectAction(project));
if (project instanceof MatrixProject && ((MatrixProject) project).getActiveConfigurations() != null){
for (MatrixConfiguration mc : ((MatrixProject) project).getActiveConfigurations()){
try {
mc.onLoad(mc.getParent(), mc.getName());
}
catch (IOException e){
//Could not reload the configuration.
}
}
}
}
return actions;
}
Expand Down

0 comments on commit 6204dbf

Please sign in to comment.