FCL/sftools/dev/build: comparison buildframework/helium/sf/java/logging/src/com/nokia/helium/logger/ant/listener/StageSummaryHandler.java

equal deleted inserted replaced

-:c7c26511138f
+:7c4a911dc066
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.util.DateUtils;
-import com.nokia.helium.logger.ant.types.Stage;
+import com.nokia.helium.core.ant.types.Stage;
 import com.nokia.helium.logger.ant.types.StageSummary;
 import freemarker.cache.FileTemplateLoader;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 /**
 * {@inheritDoc}
 */
 public void handleBuildFinished(BuildEvent event) {
-if (summarize && currentStage != null)
+if (summarize && currentStage != null) {
 endCurrentStage();
+}
 if (summarize && !completedStages.isEmpty()) {
 generateSummary(event.getProject());
 log.debug("Stage Summary generation completed");
 }
 }
 }
 log.debug("Handling target - " + event.getTarget().getName());
 if (summarize && doRunTarget(event)) {
 StageWrapper stage = searchNewStage(event);
-if (stage != null)
+if (stage != null) {
 startNewStage(stage);
+}
 }
 }
 /**
 * {@inheritDoc}
 */
 public void handleTargetFinished(BuildEvent event) {
-if (summarize && isCurrentStageToEnd(event))
+if (summarize && isCurrentStageToEnd(event)) {
 endCurrentStage();
+}
 }
 /**
 * Indicates whether the current stage is ending or not.
 *
 boolean end = false;
 if (currentStage != null) {
 if (event.getException() != null) {
 currentStage.setError(getReason(event.getException()));
 end = true;
-} else
+} else {
 end = currentStage.stage.isEndTarget(event.getTarget()
 .getName());
+}
 }
 return end;
 }
 /**
 for (Enumeration<String> en = references.keys(); en.hasMoreElements();) {
 Object object = references.get(en.nextElement());
 if (object instanceof StageSummary) {
 count++;
 if (count > 1) {
-raiseException("Multiple entries of 'hlm:stagesummary' found in "
+throw new BuildException("Multiple entries of 'hlm:stagesummary' found in "
 + "stages_config.ant.xml.");
 }
 stageSummary = (StageSummary) object;
 }
 }
 return stageSummary;
 }
 /**
-* Raise a {@link BuildException} with the specified error message.
-*
-* @param message
-*            is the error message to display.
-*/
-private void raiseException(String message) {
-throw new BuildException(message);
-}
-/**
 * Start the given stage as a new build stage.
 *
 * @param newStage
 *            is the new build stage to start.
 */
 private void startNewStage(StageWrapper newStage) {
 endCurrentStage();
 Long currTime = getCurrentTime();
-if (!completedStages.containsKey(newStage.stageName))
+if (!completedStages.containsKey(newStage.stageName)) {
 newStage.setStageStartTime(getTimestamp(currTime));
+}
 newStage.setStartTime(currTime);
 this.currentStage = newStage;
 log.debug("New stage [" + newStage.stageName + "] started at "
 + getTimestamp(currTime));
 }

changeset 628	7c4a911dc066
parent 587	85df38eb4012
child 645	b8d81fa19e7d