From 9fd3a5aab6445ef281ed91dc3a6641970ed6b263 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 25 Feb 2007 17:47:05 +0000
Subject: [PATCH] [172361] WTP 2.0 build page didn't reflect compile error in
I200701311715 build
---
.../releng/tools/ResultsSummaryGenerator.java | 10 ++++--
.../templateFiles/compileResults.php.template | 31 +++++++++----------
.../templateFiles/index.html.template | 4 +--
.../testCompileResults.php.template | 27 ++++++++--------
4 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java b/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java
index 2ac52008c..75e9f656f 100644
--- a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java
+++ b/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java
@@ -261,12 +261,16 @@ public class ResultsSummaryGenerator extends Task {
rowtype = "errortable";
}
else if (totalWarnings > 0) {
- rowtype = "warntable";
+ rowtype = "warningtable";
+ if (totalWarnings > 200) {
+ rowtype = "extraWarningTable";
+ }
}
+ //
System.out.println("totalErrors: " + totalErrors); // ,
- // Project.MSG_INFO);
//log("totalErrors: " + totalErrors, Project.MSG_INFO);
- buffer.append("<tr CLASS=\"" + rowtype + "\">" + EOL + "<td>" + EOL)
+
+ buffer.append("<tr CLASS=\"" + rowtype + " " + "bold" + "\">" + EOL + "<td>" + EOL)
.append("TOTALS (" + rowCount + ")")
.append("</td><td CLASS=\"numeric\">")
.append(totalErrors)
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template
index 262f21b92..0c39570b7 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template
@@ -6,16 +6,20 @@
$parts2 = explode("-", $parts[count($parts) - 1]);
$buildName = $parts2[1];
- echo "<title>Test Results for $buildName </title>";
+ echo "<title>Compile Logs: Code Bundles for $buildName</title>";
?>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
<style>
+.bold, .bold TD, .bold TH, .bold TR
+{
+font-weight:bold;
+}
.numeric, .numeric TD
{
text-align:right;
-padding-right:2em;
+padding-right:2%;
}
.normaltable, .normaltable TD, .normaltable TH
{
@@ -30,6 +34,7 @@ font-family:Bitstream Vera Sans Mono, monospace;
font-size:0.9em;
color:Black;
background-color:Red;
+font-weight:bold;
}
.warningtable, .warningtable TD, .warningtable TH
{
@@ -49,23 +54,17 @@ background-color:Yellow;
</head>
<body>
-<p><b><font face="Verdana" size="+3">Code Compile Results</font></b> </p>
-
-
+<?php
+ echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
+?>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Code Bundles</font></b></td>
- </tr>
-</table>
-<table id=tabledata width="77%" border="1">
+<table id=tabledata align = "center" width="75%" border="1">
<tr>
- <td><b>Compile Logs (Jar Files)</b></td>
-
- <td><b>Compile Errors</b></td>
- <td><b>Access Violations</b></td>
- <td><b>Compiler Warnings</b></td>
+ <td class="bold" align="center">Compile Logs</td>
+ <td class="bold" align="center">Compile Errors</td>
+ <td class="bold" align="center">Access Violations/ Warnings</td>
+ <td class="bold" align="center">Compiler Warnings</td>
</tr>
%compilelogs%
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
index d2a12a50a..49eb428c5 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
@@ -51,14 +51,14 @@ echo "<img src=\"http://download.eclipse.org/webtools/downloads/junit_err.gif\"/
?>
-<br> <a href="compileResults.php">Code Bundles Compile logs</a>
+<br> <a href="compileResults.php">Compile logs: Code Bundles</a>
<?php
echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_err.gif\"/><font color=red>$compileErrors</font> ";
echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_warn.gif\"/><font color=orange>$compileAccessWarnings</font> ";
echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_warn.gif\"/><font color=orange>$compileOtherWarnings</font> ";
?>
-<br> <a href="testCompileResults.php">Test Bundles Compile logs</a>
+<br> <a href="testCompileResults.php">Compile logs: Test Bundles</a>
<?php
echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_err.gif\"/><font color=red>$testCompileErrors</font> ";
echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_warn.gif\"/><font color=orange>$testCompileAccessWarnings</font> ";
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
index 9db736126..da8bcb96c 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
@@ -6,12 +6,16 @@
$parts2 = explode("-", $parts[count($parts) - 1]);
$buildName = $parts2[1];
- echo "<title>Test Bundle Compile Results for $buildName </title>";
+ echo "<title>Compile Logs: Test Bundles for $buildName</title>";
?>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
<style>
+.bold, .bold TD, .bold TH, .bold TR
+{
+font-weight:bold;
+}
.numeric, .numeric TD
{
text-align:right;
@@ -30,6 +34,7 @@ font-family:Bitstream Vera Sans Mono, monospace;
font-size:0.9em;
color:Black;
background-color:Red;
+font-weight:Bold;
}
.warningtable, .warningtable TD, .warningtable TH
{
@@ -45,25 +50,21 @@ font-size:0.9em;
color:Black;
background-color:Yellow;
}
-
</style>
</head>
<body>
-<p><b><font face="Verdana" size="+3">Test Plugin Compile Results</font></b> </p>
+<?php
+ echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
+?>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Test Bundles</font></b></td>
- </tr>
-</table>
-<table id=tabledata width="77%" border="1">
+<table id=tabledata align = "center" width="75%" border="1">
<tr>
- <td><b>Compile Logs (Jar Files)</b></td>
- <td><b>Compile Errors</b></td>
- <td><b>Access Violations</b></td>
- <td><b>Compiler Warnings</b></td>
+ <td class="bold" align="center">Compile Logs</td>
+ <td class="bold" align="center">Compile Errors</td>
+ <td class="bold" align="center">Access Violations/ Warnings</td>
+ <td class="bold" align="center">Compiler Warnings</td>
</tr>
%compilelogs%
--
GitLab