improve order of columns

archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java

@@ -398,17 +398,12 @@ public class ResultsSummaryGenerator extends Task {
 		// log("totalErrors: " + totalErrors, Project.MSG_INFO);
 
 		buffer.append("<tr CLASS=\"" + rowtype + " " + "bold" + "\">" + EOL)
-		.append("<td>"	+ EOL)
-		.append("TOTALS  (" + rowCount + ")")
-		.append("</td><td CLASS=\"numeric\">")
-		.append(totalErrors)
-		.append("</td><td CLASS=\"numeric\">")
-		.append(totalforbiddenAccessWarningCount)
-		.append("</td><td CLASS=\"numeric\">")
-		.append(totaldiscouragedAccessWarningCount)
-		.append("</td><td CLASS=\"numeric\">")
-		.append(totalWarnings)
-		.append("</td>" + EOL + "</tr>" + EOL);
+		.append("<td>" + "TOTALS  (" + rowCount + ")" + "</td>")
+		.append("<td CLASS=\"numeric\">" + totalErrors + "</td>")
+		.append("<td CLASS=\"numeric\">" + totalWarnings + "</td>")
+		.append("<td CLASS=\"numeric\">" + totalforbiddenAccessWarningCount + "</td>")
+		.append("<td CLASS=\"numeric\">" + totaldiscouragedAccessWarningCount + "</td>")
+		.append(EOL + "</tr>" + EOL);
 
 	}
 
@@ -897,6 +892,12 @@ public class ResultsSummaryGenerator extends Task {
 				.append(errorCount)
 				.append("</a></td>")
 				.append(EOL)
+
+				.append("<td CLASS=\"numeric\">").append("<a href=\"")
+				.append(getHrefCompileLogsTargetPath()).append(shortName).append("#OTHER_WARNINGS")
+				.append("\" type='text/plain' >")
+				.append(warningCount)
+				.append("</a></td>")
 				
 				.append("<td CLASS=\"numeric\">").append("<a href=\"")
 				.append(getHrefCompileLogsTargetPath()).append(shortName)
@@ -914,13 +915,6 @@ public class ResultsSummaryGenerator extends Task {
 				.append("</a></td>")
 				.append(EOL)				
 				
-				
-				.append("<td CLASS=\"numeric\">").append("<a href=\"")
-				.append(getHrefCompileLogsTargetPath()).append(shortName).append("#OTHER_WARNINGS")
-				.append("\" type='text/plain' >")
-				.append(warningCount)
-				.append("</a></td>")
-
 				.append( EOL + "</tr>" + EOL);
 	}
 

releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template

@@ -63,9 +63,9 @@ background-color:Yellow;
   <tr>
     <td class="bold" align="center">Compile Logs</td>
     <td class="bold" align="center">Compile Errors</td>
+    <td class="bold" align="center">Compiler Warnings</td>
     <td class="bold" align="center">Access Violations</td>
     <td class="bold" align="center">Access Warnings</td>
-    <td class="bold" align="center">Compiler Warnings</td>
   </tr>
 
   %compilelogs%

releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template

@@ -63,9 +63,9 @@ background-color:Yellow;
   <tr>
     <td class="bold" align="center">Compile Logs</td>
     <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Access Violations</td>
-        <td class="bold" align="center">Access Warnings</td>
     <td class="bold" align="center">Compiler Warnings</td>
+    <td class="bold" align="center">Access Violations</td>
+    <td class="bold" align="center">Access Warnings</td>
   </tr>
 
   %compilelogs%