--- a/tool/run/plugins/spdx/show.java
+++ b/tool/run/plugins/spdx/show.java
@@ -21,6 +21,7 @@
import java.io.File;
import www.Table;
import java.util.ArrayList;
+import main.Graphs;
import script.Plugin;
import spdxlib.tools;
import spdxlib.FileInfo;
@@ -77,15 +78,14 @@
}
// calculate percentage of files with a license declared
- String percentage =
- " ("
- + (counterLicensesDeclared * 100)/counterFiles
- + "% in total)" + html.br;
+// String percentage =
+// " ("
+// + (counterLicensesDeclared * 100)/counterFiles
+// + "% in total)" + html.br;
- String result =
- html.div()
- + "<h2>"
+ String summary =
+ "<h2>"
//+ html.getCommonFolderIcon("wooden-box-label.png")
+ "SPDX documents"
+ "</h2>"
@@ -97,10 +97,29 @@
+ html.br
//+ html.getCommonFolderIcon("calculator.png")
+ counterLicensesDeclared + " files with declared licenses"
- + percentage
+ //+ percentage
//+ html.getCommonFolderIcon("stickman.png")
+ counterCreators + " SPDX creators" + html.br
+ html.br
+ ;
+
+ // generate the nice graph
+ String[] titles = new String[]{"No license declared", "License declared"};
+ int noLicenses = counterFiles - counterLicensesDeclared;
+ int[] values = new int[]{noLicenses, counterLicensesDeclared};
+ // do the graph file
+ File graphFile = Graphs.generate(thisFolder, titles, values);
+
+ String[] header = new String[]{summary,
+ html.br
+ + html.getIcon("chart.png", request)};
+ values = new int[]{270, 200};
+
+ summary = Table.alignedTable(header, values);
+
+ String result =
+ html.div(20)
+ + summary
+ listFilesSPDX(request)
//+ html.br
+ html._div
@@ -171,7 +190,7 @@
+ filteredPath
+ "");
- System.err.println("MSG SH23 - " + fileLink);
+ //System.err.println("MSG SH23 - " + fileLink);
result += Table.alignedTable(new String[]{
html.getIcon("document-text.png", request),