This program is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any later version; or,
+ * at your choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License and the Mozilla Public License for more details.
+ *
+ * @author Adria Llorens
+ * @version 1.0
+ * @since 23/7/2015
+ */
+
+package dpfmanager.shell.core.messages;
+
+import dpfmanager.shell.modules.report.util.ReportGui;
+
+/**
+ * Created by Adria Llorens on 04/03/2016.
+ */
+public class NavMessage extends DpfMessage {
+
+ public enum Selected {
+ TABLE,
+ REPORT,
+ SPECIFIC,
+ TEXT,
+ PDF,
+ RELOAD
+ }
+
+ private Selected selected;
+ private String text;
+ private Integer count;
+ private Integer max;
+
+ public NavMessage(Selected s) {
+ selected = s;
+ }
+
+ public NavMessage(String s) {
+ selected = Selected.TEXT;
+ text = s;
+ }
+
+ public NavMessage(Integer c, Integer m) {
+ selected = Selected.PDF;
+ count = c;
+ max = m;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public boolean isTable() {
+ return selected.equals(Selected.TABLE);
+ }
+
+ public boolean isReport() {
+ return selected.equals(Selected.REPORT);
+ }
+
+ public boolean isSpecific() {
+ return selected.equals(Selected.SPECIFIC);
+ }
+
+ public boolean isText() {
+ return selected.equals(Selected.TEXT);
+ }
+
+ public boolean isPdf() {
+ return selected.equals(Selected.PDF);
+ }
+
+ public boolean isReload() {
+ return selected.equals(Selected.RELOAD);
+ }
+
+ public Integer getCount() {
+ return count;
+ }
+
+ public Integer getMax() {
+ return max;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/dpfmanager/shell/core/messages/ReportsMessage.java b/src/main/java/dpfmanager/shell/core/messages/ReportsMessage.java
index fc5c0b51..d77c8b9b 100644
--- a/src/main/java/dpfmanager/shell/core/messages/ReportsMessage.java
+++ b/src/main/java/dpfmanager/shell/core/messages/ReportsMessage.java
@@ -30,15 +30,17 @@ public enum Type {
READ,
DELETE,
ADD,
- SIZE
+ SIZE,
+ SORT
}
private Type type;
private String uuid;
private ReportGui report;
private Long size;
+ private String vboxId;
- // READ & RELOAD
+ // READ & RELOAD & SORT
public ReportsMessage(Type t) {
type = t;
}
@@ -50,8 +52,9 @@ public ReportsMessage(Type t, String u) {
}
// ADD
- public ReportsMessage(Type t, ReportGui r) {
+ public ReportsMessage(Type t, String i, ReportGui r) {
type = t;
+ vboxId = i;
report = r;
}
@@ -86,6 +89,10 @@ public boolean isSize() {
return type.equals(Type.SIZE);
}
+ public boolean isSort() {
+ return type.equals(Type.SORT);
+ }
+
public String getUuid() {
return uuid;
}
@@ -97,4 +104,8 @@ public ReportGui getReportGui() {
public Long getSize() {
return size;
}
+
+ public String getVboxId() {
+ return vboxId;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/dpfmanager/shell/core/messages/ShowMessage.java b/src/main/java/dpfmanager/shell/core/messages/ShowMessage.java
index 362b955a..df16670a 100644
--- a/src/main/java/dpfmanager/shell/core/messages/ShowMessage.java
+++ b/src/main/java/dpfmanager/shell/core/messages/ShowMessage.java
@@ -19,8 +19,12 @@
package dpfmanager.shell.core.messages;
+import dpfmanager.conformancechecker.configuration.Configuration;
import dpfmanager.shell.modules.report.core.GlobalReport;
import dpfmanager.shell.modules.report.runnable.MakeReportRunnable;
+import dpfmanager.shell.modules.report.util.ReportGui;
+
+import java.util.List;
/**
* Created by Adria Llorens on 04/03/2016.
@@ -28,11 +32,12 @@
public class ShowMessage extends DpfMessage {
public enum Type {
- SHOW, GENERATE, UPDATE, INIT
+ SHOW, GENERATE, UPDATE, INIT, INDIVIDUAL, LOAD
}
private Type internalType;
private String type;
+ private List types = null;
private String path;
private GlobalReport globalReport;
private int number;
@@ -40,6 +45,14 @@ public enum Type {
private MakeReportRunnable makeReportRunnable;
private Long uuid;
private String internal;
+ private boolean onlyGlobal;
+ private Configuration config;
+ private ReportGui info;
+
+ // Load
+ public ShowMessage(Type internalType) {
+ this.internalType = internalType;
+ }
// Show
public ShowMessage(Long u, String t, String p) {
@@ -48,6 +61,8 @@ public ShowMessage(Long u, String t, String p) {
path = p;
internalType = Type.SHOW;
}
+
+ // Show
public ShowMessage(String t, String p) {
type = t;
uuid = null;
@@ -55,15 +70,43 @@ public ShowMessage(String t, String p) {
internalType = Type.SHOW;
}
+ // Show
+ public ShowMessage(Long u, ReportGui i) {
+ uuid = u;
+ info = i;
+ internalType = Type.SHOW;
+ }
+
// Generate
- public ShowMessage(Long u, String t, GlobalReport gr, String i) {
+ public ShowMessage(Long u, String t, ReportGui info, boolean o) {
+ this.info = info;
type = t;
uuid = u;
- internal = i;
- globalReport = gr;
+ internal = info.getInternalReportFolder();
+ globalReport = info.getGlobalReport();
+ onlyGlobal = o;
+ internalType = Type.GENERATE;
+ }
+
+ // Generate
+ public ShowMessage(Long u, List t, ReportGui info, boolean o) {
+ this.info = info;
+ types = t;
+ uuid = u;
+ internal = info.getInternalReportFolder();
+ globalReport = info.getGlobalReport();
+ onlyGlobal = o;
internalType = Type.GENERATE;
}
+ // Individual
+ public ShowMessage(String t, String p, Configuration c) {
+ type = t;
+ path = p;
+ config = c;
+ internalType = Type.INDIVIDUAL;
+ }
+
// Init
public ShowMessage(Long u, int m, int v, MakeReportRunnable mrr) {
uuid = u;
@@ -112,6 +155,10 @@ public boolean isShow() {
return internalType.equals(Type.SHOW);
}
+ public boolean isIndividual() {
+ return internalType.equals(Type.INDIVIDUAL);
+ }
+
public boolean isUpdate() {
return internalType.equals(Type.UPDATE);
}
@@ -127,4 +174,24 @@ public Long getUuid() {
public String getInternal() {
return internal;
}
+
+ public boolean isOnlyGlobal() {
+ return onlyGlobal;
+ }
+
+ public Configuration getConfig() {
+ return config;
+ }
+
+ public ReportGui getInfo() {
+ return info;
+ }
+
+ public List getTypes() {
+ return types;
+ }
+
+ public boolean isLoad(){
+ return internalType.equals(Type.LOAD);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/dpfmanager/shell/interfaces/gui/component/dessign/DessignView.java b/src/main/java/dpfmanager/shell/interfaces/gui/component/dessign/DessignView.java
index 1f0464d4..7b893028 100644
--- a/src/main/java/dpfmanager/shell/interfaces/gui/component/dessign/DessignView.java
+++ b/src/main/java/dpfmanager/shell/interfaces/gui/component/dessign/DessignView.java
@@ -192,6 +192,7 @@ public void onPostConstructComponent(FXComponentLayout layout, ResourceBundle re
Class.forName("com.easyinnova.policy_checker" + "." + className);
}
} catch (Exception e) {
+ //e.printStackTrace();
}
// Set model and controller
diff --git a/src/main/java/dpfmanager/shell/interfaces/gui/component/global/GlobalController.java b/src/main/java/dpfmanager/shell/interfaces/gui/component/global/GlobalController.java
new file mode 100644
index 00000000..41c2cb3e
--- /dev/null
+++ b/src/main/java/dpfmanager/shell/interfaces/gui/component/global/GlobalController.java
@@ -0,0 +1,272 @@
+/**
+ *
ReportsController.java
This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version; or, at your
+ * choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the Mozilla Public License for more details.
+ *
+ * @author Adria Llorens
+ * @version 1.0
+ * @since 23/7/2015
+ */
+
+package dpfmanager.shell.interfaces.gui.component.global;
+
+import dpfmanager.conformancechecker.configuration.Configuration;
+import dpfmanager.shell.core.DPFManagerProperties;
+import dpfmanager.shell.core.config.BasicConfig;
+import dpfmanager.shell.core.config.GuiConfig;
+import dpfmanager.shell.core.mvc.DpfController;
+import dpfmanager.shell.interfaces.gui.component.global.comparators.IndividualComparator;
+import dpfmanager.shell.interfaces.gui.component.global.messages.GuiGlobalMessage;
+import dpfmanager.shell.interfaces.gui.workbench.GuiWorkbench;
+import dpfmanager.shell.modules.conformancechecker.messages.ConformanceMessage;
+import dpfmanager.shell.modules.messages.messages.AlertMessage;
+import dpfmanager.shell.modules.report.core.GlobalReport;
+import dpfmanager.shell.modules.report.core.SmallIndividualReport;
+import dpfmanager.shell.modules.report.util.ReportGui;
+import dpfmanager.shell.modules.report.util.ReportIndividualGui;
+import javafx.stage.FileChooser;
+
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by Adria Llorens on 07/03/2016.
+ */
+public class GlobalController extends DpfController {
+
+ public static Integer itemsPerPage = 12;
+
+ private List individuals;
+
+ public GlobalController() {
+ }
+
+ public void readIndividualReports(ReportGui reportGui){
+ individuals = new ArrayList<>();
+ GlobalReport global = reportGui.getGlobalReport();
+ if (global == null) {
+ // Old report format, read from dir
+ Integer count = 0;
+ List idsFound = new ArrayList<>();
+ File reportDir = new File(reportGui.getInternalReportFolder());
+ File htmlDir = new File(reportGui.getInternalReportFolder() + "/html");
+ // Search in report dir
+ if (reportDir.exists() && reportDir.isDirectory()) {
+ for (File individualReport : reportDir.listFiles()) {
+ String name = individualReport.getName();
+ if (individualReport.exists() && individualReport.isFile() && !name.startsWith("summary") && !name.startsWith("report")) {
+ String id = name.substring(0, name.indexOf("-"));
+ if (!idsFound.contains(id)) {
+ individuals.add(new ReportIndividualGui(individualReport.getAbsolutePath(), count));
+ idsFound.add(id);
+ count++;
+ }
+ }
+ }
+ }
+ // Search in html dir if no reports found
+ if (count == 0 && htmlDir.exists() && htmlDir.isDirectory()) {
+ for (File individualReport : htmlDir.listFiles()) {
+ String name = individualReport.getName();
+ if (individualReport.exists() && individualReport.isFile() && !name.startsWith("summary") && !name.startsWith("report")) {
+ String id = name.substring(0, name.indexOf("-"));
+ if (!idsFound.contains(id)) {
+ individuals.add(new ReportIndividualGui(individualReport.getAbsolutePath(), count));
+ idsFound.add(id);
+ count++;
+ }
+ }
+ }
+ }
+ return;
+ }
+ Configuration config = global.getConfig();
+ String internal = reportGui.getInternalReportFolder();
+ if (global.getVersion() >= 3) {
+ Integer count = 0;
+ for (SmallIndividualReport sir : global.getIndividualReports()) {
+ String serPath = sir.getSerPath();
+ if (serPath == null || serPath.isEmpty()){
+ String filenameNorm = sir.getFileName().replaceAll("\\\\", "/");
+ String serFileName = sir.getIdReport() + "-" +filenameNorm.substring(filenameNorm.lastIndexOf("/") + 1) + ".ser";
+ serPath = internal + "/serialized/" + serFileName;
+ }
+ File individualSer = new File(serPath);
+ if (individualSer.exists() && individualSer.isFile() && individualSer.getName().endsWith(".ser")){
+ individuals.add(new ReportIndividualGui(global, sir, config, count));
+ count++;
+ }
+ }
+ } else {
+ Integer count = 0;
+ File serializedDirectory = new File(internal + "/serialized");
+ if (serializedDirectory.exists() && serializedDirectory.isDirectory()) {
+ for (File individualSer : serializedDirectory.listFiles()) {
+ if (individualSer.exists() && individualSer.isFile() && individualSer.getName().endsWith(".ser")) {
+ individuals.add(new ReportIndividualGui(individualSer.getAbsolutePath(), global, count));
+ count++;
+ }
+ }
+ }
+ }
+ sortIndividuals();
+ }
+
+ public void sortIndividuals(){
+ individuals.sort(new IndividualComparator(getView().getCurrentMode(), getView().getCurrentOrder()));
+ }
+
+ public void loadAndPrintIndividuals(String vboxId, int page){
+ int init = page * itemsPerPage;
+ int end = init + itemsPerPage;
+ int i = init;
+ while (i < individuals.size() && i < end) {
+ ReportIndividualGui rig = individuals.get(i);
+ rig.setLast(i == individuals.size() - 1 || i == end - 1);
+ getContext().send(GuiConfig.COMPONENT_GLOBAL, new GuiGlobalMessage(GuiGlobalMessage.Type.ADD_INDIVIDUAL, vboxId, rig));
+ i++;
+ }
+ }
+
+ public List getIndividualReports(){
+ return individuals;
+ }
+
+ public Integer getPagesCount(){
+ int size = individuals.size();
+ int pages = size / itemsPerPage;
+ if (size % itemsPerPage > 0) pages++;
+ return pages;
+ }
+
+ /**
+ * Starts a new full check based on this quick check.
+ */
+ public boolean transformReport(){
+ GlobalReport global = getView().getInfo().getGlobalReport();
+ Configuration config = new Configuration(global.getConfig());
+ if (config.isQuick()){
+ config.setQuick(false);
+ config.setFormats(new ArrayList<>(Arrays.asList("HTML")));
+ List inputFiles = getInputFiles(getView().isErrors(), getView().isCorrect(), true);
+ List inputNotFound = getInputFiles(getView().isErrors(), getView().isCorrect(), false);
+ if (inputFiles.size() == 0) {
+ getContext().send(BasicConfig.MODULE_MESSAGE, new AlertMessage(AlertMessage.Type.INFO, getBundle().getString("filesEmpty")));
+ } else {
+ getContext().send(BasicConfig.MODULE_CONFORMANCE, new ConformanceMessage(String.join(";", inputFiles), config, 100, false, false));
+ return true;
+ }
+ if (inputNotFound.size() > 0) {
+ getContext().send(BasicConfig.MODULE_MESSAGE, new AlertMessage(AlertMessage.Type.ALERT, getBundle().getString("filesNotFound"), String.join("\n", inputNotFound)));
+ }
+ }
+ return false;
+ }
+
+ private List getInputFiles(boolean err, boolean pas, boolean found){
+ List inputFiles = new ArrayList<>();
+ GlobalReport global = getView().getInfo().getGlobalReport();
+ for (SmallIndividualReport individual : global.getIndividualReports()){
+ int errors = 0;
+ int warnings = 0;
+ for (String iso : global.getSelectedIsos()){
+ if (err && individual.getNErrors(iso) > 0) errors++;
+ else if (individual.getNWarnings(iso) > 0) warnings++;
+ }
+ if ((err && errors > 0) || (pas && errors == 0 && warnings == 0)) {
+ String filePath = readZipOrFilePath(global, individual.getFilePath());
+ if (new File(filePath).exists() == found){
+ if (!inputFiles.contains(filePath)){
+ inputFiles.add(filePath);
+ }
+ }
+ }
+ }
+ return inputFiles;
+ }
+
+ private String readZipOrFilePath(GlobalReport global, String filePath){
+ for (String key : global.getZipsPaths().keySet()){
+ if (filePath.contains("/" + key + "/") || filePath.contains("\\" + key + "\\")) {
+ return global.getZipsPaths().get(key);
+ }
+ }
+ return filePath;
+ }
+
+ public void downloadReport(String path){
+ File src = new File(path);
+ if (!src.exists() || !src.isFile()) return;
+
+ String name = src.getName().substring(0, src.getName().indexOf("."));
+ String extension = src.getName().substring(src.getName().indexOf("."));
+
+ FileChooser fileChooser = new FileChooser();
+
+ //Set extension filter
+ FileChooser.ExtensionFilter extFilter = new FileChooser.ExtensionFilter(extension.toLowerCase().substring(1, extension.length() -1) + " files (*"+extension+")", "*" + extension);
+ fileChooser.getExtensionFilters().add(extFilter);
+ fileChooser.setInitialFileName(name);
+
+ //Show save file dialog
+ File dest = fileChooser.showSaveDialog(GuiWorkbench.getMyStage());
+
+ if(dest != null){
+ try {
+ FileUtils.copyFile(src, dest);
+ } catch (Exception e) {
+ getContext().send(BasicConfig.MODULE_MESSAGE, new AlertMessage(AlertMessage.Type.ERROR, getBundle().getString("errorSavingReport")));
+ }
+ }
+ }
+
+ public boolean allReportsDone(GlobalReport global, String internal, String format){
+ if (global.getConfig().getFormats().contains(format.toUpperCase())) {
+ return true;
+ }
+ File htmlGlobal = new File(internal + File.separator + "report.html");
+ String search = format.equals("mets") ? ".mets.xml" : "." + format;
+ File dir = format.equals("html") ? new File(internal + File.separator + "html") : new File(internal);
+ Integer expectedSize = global.getIndividualReports().size();
+ if (!format.equals("mets") && !format.equals("html")) {
+ expectedSize += 1;
+ }
+ File[] files = dir.listFiles(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return name.toLowerCase().endsWith(search);
+ }
+ });
+ if (files == null) return false;
+ int files_size = files.length;
+ if (format.equals("xml")){
+ File[] filesMets = dir.listFiles(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return name.toLowerCase().endsWith(".mets.xml");
+ }
+ });
+ files_size -= filesMets.length;
+ }
+ return (format.equals("html") && files_size == expectedSize && htmlGlobal.exists()) || (!format.equals("html") && files_size == expectedSize);
+ }
+
+ public boolean allReportsDone(GlobalReport global, String internal){
+ return allReportsDone(global, internal, "html") && allReportsDone(global, internal, "xml")
+ && allReportsDone(global, internal, "pdf") && allReportsDone(global, internal, "mets")
+ && allReportsDone(global, internal, "json");
+ }
+
+}
diff --git a/src/main/java/dpfmanager/shell/interfaces/gui/component/global/GlobalModel.java b/src/main/java/dpfmanager/shell/interfaces/gui/component/global/GlobalModel.java
new file mode 100644
index 00000000..bc8a0dff
--- /dev/null
+++ b/src/main/java/dpfmanager/shell/interfaces/gui/component/global/GlobalModel.java
@@ -0,0 +1,45 @@
+/**
+ *
ReportsModel.java
This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version; or, at your
+ * choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the Mozilla Public License for more details.
This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version; or, at your
+ * choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the Mozilla Public License for more details.
This program is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any later version; or,
+ * at your choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License and the Mozilla Public License for more details.
This program is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any later version; or,
+ * at your choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License and the Mozilla Public License for more details.
This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version; or, at your
+ * choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the Mozilla Public License for more details.
This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version; or, at your
+ * choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the Mozilla Public License for more details.
This program is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any later version; or,
+ * at your choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License and the Mozilla Public License for more details.
+ *
+ * @author Adria Llorens
+ * @version 1.0
+ * @since 23/7/2015
+ */
+
+package dpfmanager.shell.interfaces.gui.perspective;
+
+import dpfmanager.shell.core.adapter.DpfAbstractPerspective;
+import dpfmanager.shell.core.config.BasicConfig;
+import dpfmanager.shell.core.config.GuiConfig;
+import dpfmanager.shell.core.messages.DpfMessage;
+import dpfmanager.shell.core.messages.NavMessage;
+import dpfmanager.shell.core.messages.UiMessage;
+import javafx.geometry.Pos;
+import javafx.scene.layout.StackPane;
+
+import org.jacpfx.api.annotations.Resource;
+import org.jacpfx.api.annotations.lifecycle.PostConstruct;
+import org.jacpfx.api.annotations.perspective.Perspective;
+import org.jacpfx.rcp.componentLayout.FXComponentLayout;
+import org.jacpfx.rcp.componentLayout.PerspectiveLayout;
+import org.jacpfx.rcp.context.Context;
+
+import java.util.ResourceBundle;
+
+/**
+ * Created by Adria Llorens on 25/02/2016.
+ */
+@Perspective(id = GuiConfig.PERSPECTIVE_GLOBAL,
+ name = GuiConfig.PERSPECTIVE_GLOBAL,
+ active = false,
+ components = {
+ GuiConfig.COMPONENT_TOP,
+ GuiConfig.COMPONENT_NAV,
+ GuiConfig.COMPONENT_GLOBAL,
+ GuiConfig.COMPONENT_PANE,
+ GuiConfig.COMPONENT_BAR,
+ BasicConfig.MODULE_MESSAGE,
+ BasicConfig.MODULE_CONFORMANCE,
+ BasicConfig.MODULE_THREADING,
+ BasicConfig.MODULE_REPORT
+ }
+)
+public class GlobalPerspective extends DpfAbstractPerspective {
+
+ @Resource
+ public Context context;
+
+ @Override
+ public void handleMessage(DpfMessage dpfMessage, PerspectiveLayout layout) {
+ }
+
+ @Override
+ public void onShowCustom() {
+ context.send(GuiConfig.PERSPECTIVE_GLOBAL + "." + GuiConfig.COMPONENT_NAV, new NavMessage(NavMessage.Selected.REPORT));
+ }
+
+ @Override
+ public void onReloadCustom() {
+ context.send(GuiConfig.PERSPECTIVE_GLOBAL + "." + GuiConfig.COMPONENT_NAV, new NavMessage(NavMessage.Selected.REPORT));
+ context.send(GuiConfig.PERSPECTIVE_GLOBAL + "." + GuiConfig.COMPONENT_GLOBAL, new UiMessage(UiMessage.Type.RELOAD));
+ }
+
+ @PostConstruct
+ public void onStartPerspective(PerspectiveLayout perspectiveLayout, FXComponentLayout layout, ResourceBundle resourceBundle) {
+ // Top Buttons component
+ StackPane topPane = new StackPane();
+
+ // Center Component
+ StackPane centerPane = new StackPane();
+ centerPane.setAlignment(Pos.TOP_CENTER);
+
+ // Bottom Component
+ bottomPane = new StackPane();
+ bottomPane.setAlignment(Pos.BOTTOM_CENTER);
+
+ // Bottom Bar Component
+ bottomBar = new StackPane();
+ bottomBar.setAlignment(Pos.BOTTOM_CENTER);
+
+ // Navigation Bar
+ StackPane navPane = new StackPane();
+ centerPane.setAlignment(Pos.TOP_CENTER);
+
+ // Attach to PERSPECTIVE
+ mainSplit = constructSplitPane(constructScrollPane(centerPane), bottomPane);
+ mainPane = constructMainPaneWithBread(mainSplit, navPane, bottomBar);
+ perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_TOP, topPane);
+ perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_NAV, navPane);
+ perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_GLOBAL, centerPane);
+ perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_PANE, bottomPane);
+ perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_BAR, bottomBar);
+
+ // Define main pane
+ borderPane = constructBorderPane(perspectiveLayout, topPane, mainPane);
+ }
+
+ @Override
+ public Context getContext() {
+ return context;
+ }
+}
diff --git a/src/main/java/dpfmanager/shell/interfaces/gui/perspective/ReportsPerspective.java b/src/main/java/dpfmanager/shell/interfaces/gui/perspective/ReportsPerspective.java
index 717846c0..e8370965 100644
--- a/src/main/java/dpfmanager/shell/interfaces/gui/perspective/ReportsPerspective.java
+++ b/src/main/java/dpfmanager/shell/interfaces/gui/perspective/ReportsPerspective.java
@@ -23,22 +23,10 @@
import dpfmanager.shell.core.config.BasicConfig;
import dpfmanager.shell.core.config.GuiConfig;
import dpfmanager.shell.core.messages.DpfMessage;
+import dpfmanager.shell.core.messages.NavMessage;
import dpfmanager.shell.core.messages.ReportsMessage;
-import dpfmanager.shell.core.messages.UiMessage;
-import dpfmanager.shell.core.util.NodeUtil;
-import dpfmanager.shell.modules.statistics.messages.StatisticsMessage;
-import dpfmanager.shell.modules.threading.messages.GlobalStatusMessage;
-import dpfmanager.shell.modules.threading.messages.RunnableMessage;
-import javafx.event.EventHandler;
import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.BorderPane;
import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.stage.Stage;
import org.jacpfx.api.annotations.Resource;
import org.jacpfx.api.annotations.lifecycle.PostConstruct;
@@ -57,6 +45,7 @@
active = false,
components = {
GuiConfig.COMPONENT_TOP,
+ GuiConfig.COMPONENT_NAV,
GuiConfig.COMPONENT_REPORTS,
GuiConfig.COMPONENT_PANE,
GuiConfig.COMPONENT_BAR,
@@ -76,6 +65,12 @@ public void handleMessage(DpfMessage dpfMessage, PerspectiveLayout layout) {
@Override
public void onShowCustom() {
+ context.send(GuiConfig.PERSPECTIVE_REPORTS + "." + GuiConfig.COMPONENT_NAV, new NavMessage(NavMessage.Selected.TABLE));
+ }
+
+ @Override
+ public void onReloadCustom() {
+ context.send(GuiConfig.PERSPECTIVE_REPORTS + "." + GuiConfig.COMPONENT_NAV, new NavMessage(NavMessage.Selected.TABLE));
context.send(GuiConfig.PERSPECTIVE_REPORTS + "." + GuiConfig.COMPONENT_REPORTS, new ReportsMessage(ReportsMessage.Type.RELOAD));
}
@@ -96,10 +91,15 @@ public void onStartPerspective(PerspectiveLayout perspectiveLayout, FXComponentL
bottomBar = new StackPane();
bottomBar.setAlignment(Pos.BOTTOM_CENTER);
+ // Navigation Bar
+ StackPane navPane = new StackPane();
+ centerPane.setAlignment(Pos.TOP_CENTER);
+
// Attach to PERSPECTIVE
mainSplit = constructSplitPane(constructScrollPane(centerPane), bottomPane);
- mainPane = constructMainPane(mainSplit, bottomBar);
+ mainPane = constructMainPaneWithBread(mainSplit, navPane, bottomBar);
perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_TOP, topPane);
+ perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_NAV, navPane);
perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_REPORTS, centerPane);
perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_PANE, bottomPane);
perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_BAR, bottomBar);
diff --git a/src/main/java/dpfmanager/shell/interfaces/gui/perspective/ShowReportPerspective.java b/src/main/java/dpfmanager/shell/interfaces/gui/perspective/ShowReportPerspective.java
index eb1b67ef..3e4b6525 100644
--- a/src/main/java/dpfmanager/shell/interfaces/gui/perspective/ShowReportPerspective.java
+++ b/src/main/java/dpfmanager/shell/interfaces/gui/perspective/ShowReportPerspective.java
@@ -23,6 +23,7 @@
import dpfmanager.shell.core.config.BasicConfig;
import dpfmanager.shell.core.config.GuiConfig;
import dpfmanager.shell.core.messages.DpfMessage;
+import dpfmanager.shell.core.messages.NavMessage;
import javafx.geometry.Pos;
import javafx.scene.layout.StackPane;
@@ -43,6 +44,7 @@
active = false,
components = {
GuiConfig.COMPONENT_TOP,
+ GuiConfig.COMPONENT_NAV,
GuiConfig.COMPONENT_SHOW,
GuiConfig.COMPONENT_PANE,
GuiConfig.COMPONENT_BAR,
@@ -60,6 +62,11 @@ public class ShowReportPerspective extends DpfAbstractPerspective {
public void handleMessage(DpfMessage dpfMessage, PerspectiveLayout layout) {
}
+ @Override
+ public void onShowCustom() {
+ context.send(GuiConfig.PERSPECTIVE_SHOW + "." + GuiConfig.COMPONENT_NAV, new NavMessage(NavMessage.Selected.SPECIFIC));
+ }
+
@PostConstruct
public void onStartPerspective(PerspectiveLayout perspectiveLayout, FXComponentLayout layout, ResourceBundle resourceBundle) {
// Top Buttons component
@@ -77,10 +84,15 @@ public void onStartPerspective(PerspectiveLayout perspectiveLayout, FXComponentL
bottomBar = new StackPane();
bottomBar.setAlignment(Pos.BOTTOM_CENTER);
+ // Navigation Bar
+ StackPane navPane = new StackPane();
+ centerPane.setAlignment(Pos.TOP_CENTER);
+
// Attach to PERSPECTIVE
mainSplit = constructSplitPane(centerPane, bottomPane);
- mainPane = constructMainPane(mainSplit, bottomBar);
+ mainPane = constructMainPaneWithBread(mainSplit, navPane, bottomBar);
perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_TOP, topPane);
+ perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_NAV, navPane);
perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_SHOW, centerPane);
perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_PANE, bottomPane);
perspectiveLayout.registerTargetLayoutComponent(GuiConfig.TARGET_CONTAINER_BAR, bottomBar);
diff --git a/src/main/java/dpfmanager/shell/interfaces/gui/workbench/GuiWorkbench.java b/src/main/java/dpfmanager/shell/interfaces/gui/workbench/GuiWorkbench.java
index 52dd259e..cf4f931c 100644
--- a/src/main/java/dpfmanager/shell/interfaces/gui/workbench/GuiWorkbench.java
+++ b/src/main/java/dpfmanager/shell/interfaces/gui/workbench/GuiWorkbench.java
@@ -57,7 +57,8 @@
GuiConfig.PERSPECTIVE_SHOW,
GuiConfig.PERSPECTIVE_PERIODICAL,
GuiConfig.PERSPECTIVE_INTEROPERABILITY,
- GuiConfig.PERSPECTIVE_STATISTICS
+ GuiConfig.PERSPECTIVE_STATISTICS,
+ GuiConfig.PERSPECTIVE_GLOBAL
}
)
public class GuiWorkbench implements FXWorkbench {
diff --git a/src/main/java/dpfmanager/shell/modules/conformancechecker/ConformanceCheckerModule.java b/src/main/java/dpfmanager/shell/modules/conformancechecker/ConformanceCheckerModule.java
index 9debf069..fa2a8b92 100644
--- a/src/main/java/dpfmanager/shell/modules/conformancechecker/ConformanceCheckerModule.java
+++ b/src/main/java/dpfmanager/shell/modules/conformancechecker/ConformanceCheckerModule.java
@@ -67,19 +67,20 @@ public void handleMessage(DpfMessage dpfMessage) {
} else if (cm.isGui()) {
String path = cm.getPath();
String input = cm.getInput();
- Configuration config = null;
- if (!path.isEmpty()) {
- config = service.readConfig(path);
- if (config == null) {
- getContext().send(BasicConfig.MODULE_MESSAGE, new AlertMessage(AlertMessage.Type.ERROR, DPFManagerProperties.getBundle().getString("errorReadingConfFile")));
- return;
+ Configuration config = cm.getConfig();
+ if (config == null) {
+ if (!path.isEmpty()) {
+ config = service.readConfig(path);
+ if (config == null) {
+ getContext().send(BasicConfig.MODULE_MESSAGE, new AlertMessage(AlertMessage.Type.ERROR, DPFManagerProperties.getBundle().getString("errorReadingConfFile")));
+ return;
+ }
+ } else {
+ config = new Configuration();
+ config.setDefault();
}
- config.setQuick(cm.isQuick());
- } else {
- config = new Configuration();
- config.setDefault();
- config.setQuick(cm.isQuick());
}
+ config.setQuick(cm.isQuick());
service.initProcessInputRun(input, config, cm.getRecursive());
}
} else if (dpfMessage.isTypeOf(ProcessInputMessage.class)) {
diff --git a/src/main/java/dpfmanager/shell/modules/conformancechecker/core/ConformanceCheckerService.java b/src/main/java/dpfmanager/shell/modules/conformancechecker/core/ConformanceCheckerService.java
index d12b9264..a537d726 100644
--- a/src/main/java/dpfmanager/shell/modules/conformancechecker/core/ConformanceCheckerService.java
+++ b/src/main/java/dpfmanager/shell/modules/conformancechecker/core/ConformanceCheckerService.java
@@ -169,6 +169,7 @@ synchronized public void tractProcessInputMessage(ProcessInputMessage pim){
} else if (pim.isFile()){
if (filesToCheck.containsKey(pim.getUuid())){
filesToCheck.get(pim.getUuid()).add(pim.getFiles());
+ filesToCheck.get(pim.getUuid()).addZipsPath(pim.getZipsPath());
}
}
@@ -190,10 +191,10 @@ synchronized public void tractProcessInputMessage(ProcessInputMessage pim){
public void startCheck(Long uuid, ProcessInputParameters pip) {
// Init
- context.send(BasicConfig.MODULE_THREADING, new GlobalStatusMessage(GlobalStatusMessage.Type.INIT, uuid, pip.getFiles().size(), pip.getConfig(), pip.getInternalReportFolder(), pip.getInputStr()));
+ context.send(BasicConfig.MODULE_THREADING, new GlobalStatusMessage(GlobalStatusMessage.Type.INIT, uuid, pip.getFiles().size(), pip.getConfig(), pip.getInternalReportFolder(), pip.getInputStr(), pip.getZipsPath()));
// Now process files
- ProcessFiles(uuid, pip.getFiles(), pip.getConfig(), pip.getInternalReportFolder());
+ ProcessFiles(uuid, pip.getFiles(), pip.getConfig(), pip.getInternalReportFolder(), pip.getInputStr());
}
public void emptyCheck(Long uuid, String internal) {
@@ -209,13 +210,13 @@ public void emptyCheck(Long uuid, String internal) {
* @param config the config
* @return the path to the internal report folder
*/
- private String ProcessFiles(Long uuid, List files, Configuration config, String internalReportFolder) {
+ private String ProcessFiles(Long uuid, List files, Configuration config, String internalReportFolder, String inputStr) {
// Process each input of the list
int idReport = 1;
List list = interService.getConformanceCheckers();
for (final String filename : files) {
ConformanceRunnable run = new ConformanceRunnable(list, generator);
- run.setParameters(filename, idReport, internalReportFolder, config, uuid);
+ run.setParameters(filename, idReport, internalReportFolder, config, uuid, inputStr);
context.send(BasicConfig.MODULE_THREADING, new RunnableMessage(uuid, run));
idReport++;
}
diff --git a/src/main/java/dpfmanager/shell/modules/conformancechecker/core/ProcessInputParameters.java b/src/main/java/dpfmanager/shell/modules/conformancechecker/core/ProcessInputParameters.java
index dd127d3b..2b6a3452 100644
--- a/src/main/java/dpfmanager/shell/modules/conformancechecker/core/ProcessInputParameters.java
+++ b/src/main/java/dpfmanager/shell/modules/conformancechecker/core/ProcessInputParameters.java
@@ -21,7 +21,9 @@
import dpfmanager.conformancechecker.configuration.Configuration;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Created by Adria Llorens on 10/05/2016.
@@ -33,6 +35,7 @@ public class ProcessInputParameters {
private Configuration config;
private int toWait;
private List files;
+ private Map zipsPath;
public ProcessInputParameters(String internalReportFolder, String inputStr, Configuration config, int toWait, List files) {
this.internalReportFolder = internalReportFolder;
@@ -40,6 +43,7 @@ public ProcessInputParameters(String internalReportFolder, String inputStr, Conf
this.config = config;
this.toWait = toWait;
this.files = files;
+ this.zipsPath = new HashMap<>();
}
public String getInternalReportFolder() {
@@ -66,4 +70,17 @@ public void add(List files2){
files.addAll(files2);
toWait--;
}
+
+ public void addZipsPath(Map zipsPath2) {
+ for (String key : zipsPath2.keySet()) {
+ if (!zipsPath.containsKey(key)) {
+ zipsPath.put(key, zipsPath2.get(key));
+ }
+ }
+ }
+
+ public Map getZipsPath() {
+ return zipsPath;
+ }
+
}
diff --git a/src/main/java/dpfmanager/shell/modules/conformancechecker/messages/ConformanceMessage.java b/src/main/java/dpfmanager/shell/modules/conformancechecker/messages/ConformanceMessage.java
index 62315896..e31718f8 100644
--- a/src/main/java/dpfmanager/shell/modules/conformancechecker/messages/ConformanceMessage.java
+++ b/src/main/java/dpfmanager/shell/modules/conformancechecker/messages/ConformanceMessage.java
@@ -50,6 +50,17 @@ public ConformanceMessage(String i, String p, int r, boolean ao, boolean q) {
gui = true;
askOverwrite = ao;
quick = q;
+ config = null;
+ }
+
+ public ConformanceMessage(String i, Configuration c, int r, boolean ao, boolean q) {
+ // Gui
+ input = i;
+ config = c;
+ recursive = r;
+ gui = true;
+ askOverwrite = ao;
+ quick = q;
}
public ConformanceMessage(Long u, String i, String p) {
diff --git a/src/main/java/dpfmanager/shell/modules/conformancechecker/messages/ProcessInputMessage.java b/src/main/java/dpfmanager/shell/modules/conformancechecker/messages/ProcessInputMessage.java
index a0fda67f..ce814595 100644
--- a/src/main/java/dpfmanager/shell/modules/conformancechecker/messages/ProcessInputMessage.java
+++ b/src/main/java/dpfmanager/shell/modules/conformancechecker/messages/ProcessInputMessage.java
@@ -24,6 +24,7 @@
import java.io.File;
import java.util.List;
+import java.util.Map;
/**
* Created by Adria Llorens on 09/05/2016.
@@ -37,6 +38,7 @@ public class ProcessInputMessage extends DpfMessage {
private String internalReportFolder;
private String inputStr;
private Integer toWait;
+ private Map zipsPath;
public enum Type {
WAIT, FILE
@@ -53,11 +55,12 @@ public ProcessInputMessage(Type type, Long uuid, List files, Configurati
this.toWait = toWait;
}
- public ProcessInputMessage(Type type, Long uuid, List files){
+ public ProcessInputMessage(Type type, Long uuid, List files, Map zipsPath){
// File
this.type = type;
this.uuid = uuid;
this.files = files;
+ this.zipsPath = zipsPath;
}
public boolean isWait(){
@@ -91,4 +94,8 @@ public String getInputStr() {
public Integer getToWait() {
return toWait;
}
+
+ public Map getZipsPath() {
+ return zipsPath;
+ }
}
diff --git a/src/main/java/dpfmanager/shell/modules/conformancechecker/runnable/ConformanceRunnable.java b/src/main/java/dpfmanager/shell/modules/conformancechecker/runnable/ConformanceRunnable.java
index 6df88573..b5cda839 100644
--- a/src/main/java/dpfmanager/shell/modules/conformancechecker/runnable/ConformanceRunnable.java
+++ b/src/main/java/dpfmanager/shell/modules/conformancechecker/runnable/ConformanceRunnable.java
@@ -44,6 +44,7 @@ public class ConformanceRunnable extends DpfRunnable {
private int id;
private long uuid;
private ReportGenerator generator;
+ private String inputStr;
public ConformanceRunnable(List list, ReportGenerator gen) {
// No context yet
@@ -56,12 +57,13 @@ public void handleContext(DpfContext context) {
pi.setContext(context);
}
- public void setParameters(String name, int i, String internal, Configuration conf, long u) {
+ public void setParameters(String name, int i, String internal, Configuration conf, long u, String in) {
filename = name;
id = i;
internalReportFolder = internal;
config = conf;
uuid = u;
+ inputStr = in;
}
@Override
@@ -91,6 +93,7 @@ public void runTask() {
// Process the input and get a list of individual reports
IndividualReport ir = pi.processFile(filename, internalReportFolder, config, id);
if (ir != null && !ir.isError()) {
+ ir.setInputStr(inputStr);
ir.setIdReport(id);
ir.setInternalReportFolder(internalReportFolder);
ir.setUuid(uuid);
@@ -98,6 +101,7 @@ public void runTask() {
// Serialize it
String filenameNorm = filename.replaceAll("\\\\", "/");
String serFileName = ir.getReportId() + "-" +filenameNorm.substring(filenameNorm.lastIndexOf("/") + 1) + ".ser";
+ ir.setSerPath(internalReportFolder + "/serialized/" + serFileName);
ir.filter();
ir.write(internalReportFolder + "/serialized", serFileName);
ir.defilter();
diff --git a/src/main/java/dpfmanager/shell/modules/conformancechecker/runnable/GetInputRunnable.java b/src/main/java/dpfmanager/shell/modules/conformancechecker/runnable/GetInputRunnable.java
index 83c24ad3..a9ace635 100644
--- a/src/main/java/dpfmanager/shell/modules/conformancechecker/runnable/GetInputRunnable.java
+++ b/src/main/java/dpfmanager/shell/modules/conformancechecker/runnable/GetInputRunnable.java
@@ -35,7 +35,9 @@
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -46,6 +48,7 @@ public class GetInputRunnable extends DpfRunnable {
private Long uuid;
private List files;
+ private Map zipsPath;
private String internalReportFolder;
private File fileZip;
@@ -55,6 +58,7 @@ public class GetInputRunnable extends DpfRunnable {
@Override
public void handleContext(DpfContext context) {
files = new ArrayList<>();
+ zipsPath = new HashMap<>();
error = false;
}
@@ -83,7 +87,7 @@ public void runTask() {
}
// Notify
- context.send(BasicConfig.MODULE_CONFORMANCE, new ProcessInputMessage(ProcessInputMessage.Type.FILE, getUuid(), files));
+ context.send(BasicConfig.MODULE_CONFORMANCE, new ProcessInputMessage(ProcessInputMessage.Type.FILE, getUuid(), files, zipsPath));
}
/**
@@ -92,10 +96,8 @@ public void runTask() {
private void runZip(){
try {
// Create zip folder
- File zipFolder = new File(internalReportFolder + "zip/");
- if (!zipFolder.exists()) {
- zipFolder.mkdirs();
- }
+ File zipFolder = getNExtZipFolder();
+ zipsPath.put(zipFolder.getName(), fileZip.getAbsolutePath());
// Extract it
ZipFile zipFile = new ZipFile(fileZip);
@@ -104,7 +106,7 @@ private void runZip(){
// Process each file contained in the compressed file
ZipEntry entry = entries.nextElement();
String name = entry.getName();
- File targetFile = new File(internalReportFolder + "zip/" + name);
+ File targetFile = new File(zipFolder.getPath() + File.separator + name);
if (name.endsWith("/")) {
// Directory
targetFile.mkdirs();
@@ -178,4 +180,17 @@ private String createTempFile(String internal, String name, InputStream stream)
return filename;
}
+ synchronized private File getNExtZipFolder(){
+ int count = 0;
+ File zipFolder = new File(internalReportFolder + GetInputRunnable.zipFolderPrefix);
+ while (zipFolder.exists()){
+ count++;
+ zipFolder = new File(internalReportFolder + GetInputRunnable.zipFolderPrefix + count);
+ }
+ zipFolder.mkdirs();
+ return zipFolder;
+ }
+
+ public static String zipFolderPrefix = "zipTmpDpfManager";
+
}
diff --git a/src/main/java/dpfmanager/shell/modules/report/ReportModule.java b/src/main/java/dpfmanager/shell/modules/report/ReportModule.java
index 77fd09c4..4276b269 100644
--- a/src/main/java/dpfmanager/shell/modules/report/ReportModule.java
+++ b/src/main/java/dpfmanager/shell/modules/report/ReportModule.java
@@ -24,6 +24,7 @@
import dpfmanager.shell.core.context.GuiContext;
import dpfmanager.shell.core.messages.DpfMessage;
import dpfmanager.shell.modules.report.core.ReportService;
+import dpfmanager.shell.modules.report.messages.GenerateIndividualMessage;
import dpfmanager.shell.modules.report.messages.GenerateMessage;
import dpfmanager.shell.modules.report.messages.GlobalReportMessage;
import dpfmanager.shell.modules.report.messages.IndividualReportMessage;
@@ -58,6 +59,8 @@ public void handleMessage(DpfMessage dpfMessage) {
service.tractGlobalMessage(dpfMessage.getTypedMessage(GlobalReportMessage.class));
} else if (dpfMessage.isTypeOf(GenerateMessage.class)) {
service.tractGenerateMessage(dpfMessage.getTypedMessage(GenerateMessage.class));
+ } else if (dpfMessage.isTypeOf(GenerateIndividualMessage.class)) {
+ service.tractGenerateIndividualMessage(dpfMessage.getTypedMessage(GenerateIndividualMessage.class));
}
}
diff --git a/src/main/java/dpfmanager/shell/modules/report/core/GlobalReport.java b/src/main/java/dpfmanager/shell/modules/report/core/GlobalReport.java
index ee5763da..1550a7cb 100644
--- a/src/main/java/dpfmanager/shell/modules/report/core/GlobalReport.java
+++ b/src/main/java/dpfmanager/shell/modules/report/core/GlobalReport.java
@@ -90,6 +90,16 @@ public class GlobalReport extends ReportSerializable {
*/
private Configuration config;
+ /**
+ * The input string
+ */
+ private String inputStr;
+
+ /**
+ * The paths where each zip was unzipped
+ */
+ private Map zipsPaths;
+
/**
* Instantiates a new global report.
*/
@@ -102,7 +112,7 @@ public GlobalReport() {
errVal = 0;
}
- public void init(Configuration c, List ci) {
+ public void init(Configuration c, List ci, Map z) {
this.modifiedIsos = c.getModifiedIsos();
this.selectedIsos = c.getIsos();
if (c.hasRules()) {
@@ -110,6 +120,10 @@ public void init(Configuration c, List ci) {
}
this.checkedIsos = ci;
this.config = c;
+ this.zipsPaths = z;
+ if (zipsPaths == null) {
+ zipsPaths = new HashMap<>();
+ }
}
/**
@@ -159,6 +173,7 @@ public void generate(Date start) {
List toDelete = new ArrayList<>();
Collections.sort(reports);
for (SmallIndividualReport ir : reports) {
+ if (inputStr == null) inputStr = ir.getInputStr();
if (ir.isError()) {
toDelete.add(ir);
} else {
@@ -226,12 +241,18 @@ public int getAllReportsOk() {
public int getAllReportsWarnings() {
int n = 0;
for (SmallIndividualReport rep : reports) {
+ boolean warn = false;
for (String iso : getSelectedIsos()) {
- if (rep.getNWarnings(iso) > 0) {
- n++;
+ if (rep.getNErrors(iso) == 0){
+ if (rep.getNWarnings(iso) > 0) {
+ warn = true;
+ }
+ } else {
+ warn = false;
break;
}
}
+ if (warn) n++;
}
return n;
}
@@ -263,7 +284,6 @@ public boolean hasModificationIso(String iso) {
* @return the individual reports
*/
public List getIndividualReports() {
- Collections.sort(reports);
return reports;
}
@@ -313,6 +333,7 @@ public Long getDurationMillis() {
}
public String getInputString(){
+ if (inputStr != null && !inputStr.isEmpty()) return inputStr;
String name = "";
int index = 0;
Iterator it = reports.iterator();
@@ -320,7 +341,12 @@ public String getInputString(){
SmallIndividualReport individual = it.next();
name = (name.length() > 0) ? name + ", " + individual.getFileName() : individual.getFileName();
}
- return name;
+ inputStr = name;
+ return inputStr;
+ }
+
+ public Map getZipsPaths() {
+ return zipsPaths;
}
public Configuration getConfig() {
diff --git a/src/main/java/dpfmanager/shell/modules/report/core/IndividualReport.java b/src/main/java/dpfmanager/shell/modules/report/core/IndividualReport.java
index b2724c3f..2b51dc74 100644
--- a/src/main/java/dpfmanager/shell/modules/report/core/IndividualReport.java
+++ b/src/main/java/dpfmanager/shell/modules/report/core/IndividualReport.java
@@ -148,6 +148,10 @@ public class IndividualReport extends ReportSerializable {
private boolean isOriginal = true;
+ private String inputStr;
+
+ private String serPath;
+
/**
* Error constructor
*/
@@ -246,6 +250,14 @@ public void setIsosCheck(List isosCheck) {
this.checkedIsos = isosCheck;
}
+ public String getInputStr() {
+ return inputStr;
+ }
+
+ public void setInputStr(String inputStr) {
+ this.inputStr = inputStr;
+ }
+
public List getSelectedIsos() {
if (checkedIsos == null) return new ArrayList<>();
return checkedIsos;
@@ -265,6 +277,14 @@ public void setConformanceCheckerReport(String report) {
precomputedOutput = true;
}
+ public String getSerPath() {
+ return serPath;
+ }
+
+ public void setSerPath(String serPath) {
+ this.serPath = serPath;
+ }
+
public boolean hasPrecomputedOutput() {
return precomputedOutput;
}
diff --git a/src/main/java/dpfmanager/shell/modules/report/core/ReportGenerator.java b/src/main/java/dpfmanager/shell/modules/report/core/ReportGenerator.java
index 00e4bae2..0fb1767b 100644
--- a/src/main/java/dpfmanager/shell/modules/report/core/ReportGenerator.java
+++ b/src/main/java/dpfmanager/shell/modules/report/core/ReportGenerator.java
@@ -34,6 +34,7 @@
import dpfmanager.shell.modules.report.util.ReportJson;
import dpfmanager.shell.modules.report.util.ReportPDF;
import dpfmanager.shell.modules.report.util.ReportXml;
+import edu.emory.mathcs.backport.java.util.Arrays;
import org.apache.commons.lang.time.FastDateFormat;
import org.apache.logging.log4j.Level;
@@ -431,7 +432,7 @@ private void extractFile(ZipInputStream zipIn, String filePath) throws IOExcepti
*
* @param name the name
*/
- private void copyHtmlFolder(String name) {
+ synchronized private void copyHtmlFolder(String name) {
// Get the target folder
File nameFile = new File(name);
String absolutePath = nameFile.getAbsolutePath();
@@ -441,6 +442,10 @@ private void copyHtmlFolder(String name) {
target.mkdirs();
}
+ // Already copied
+ File testFile = new File(target.getPath() + "/js/bootstrap.min.js");
+ if (testFile.exists()) return;
+
// Copy the html folder to target
String pathStr = "./src/main/resources/html";
Path path = Paths.get(pathStr);
@@ -627,6 +632,7 @@ private void writeIndividualReport(IndividualReport ir, List formats, Co
}
if (formats.contains("HTML")) {
String htmlFileStr = reportName + ".html";
+ copyHtmlFolder(htmlFileStr);
HtmlReport htmlReport = new HtmlReport();
String htmlOutput = htmlReport.parseIndividual(ir, ir.getReportId(), ir.getInternalReportFodler());
String name = htmlFileStr.substring(htmlFileStr.lastIndexOf("/") + 1, htmlFileStr.length());
@@ -642,6 +648,7 @@ private void writeIndividualReport(IndividualReport ir, List formats, Co
PDDocument pdfDocument = pdfReport.parseIndividual(ir, ir.getReportId(), ir.getInternalReportFodler());
if (pdfDocument != null) {
pdfDocument.save(pdfFileStr);
+ pdfDocument.close();
}
} catch (Exception e) {
context.send(BasicConfig.MODULE_MESSAGE, new ExceptionMessage("Exception in ReportPDF", e));
@@ -652,34 +659,36 @@ private void writeIndividualReport(IndividualReport ir, List formats, Co
public String transformGlobalReport(String internalReportFolder, String format, GlobalReport gr) {
String xmlFileStr = internalReportFolder + "summary.xml";
+ String xmlTempFileStr = internalReportFolder + "summary.temp.xml";
String jsonFileStr = internalReportFolder + "summary.json";
String htmlFileStr = internalReportFolder + "report.html";
String pdfFileStr = internalReportFolder + "report.pdf";
+ List reports = new ArrayList<>();
+ reports.addAll(gr.getIndividualReports());
if (format.equals("xml")) {
- reportXml.parseGlobal(xmlFileStr, gr, gr.getIndividualReports());
+ reportXml.parseGlobal(xmlFileStr, gr, reports);
return xmlFileStr;
}
if (format.equals("json")) {
- boolean toDelete = false;
File xmlFile = new File(xmlFileStr);
- if (!xmlFile.exists()){
- reportXml.parseGlobal(xmlFileStr, gr, gr.getIndividualReports());
- toDelete = true;
- }
- reportJson.xmlToJsonFile(xmlFileStr, jsonFileStr, this);
- if (toDelete && xmlFile.exists()){
- xmlFile.delete();
+ File xmlTempFile = new File(xmlTempFileStr);
+ if (xmlFile.exists()){
+ reportJson.xmlToJsonFile(xmlFileStr, jsonFileStr, this);
+ } else {
+ reportXml.parseGlobal(xmlTempFileStr, gr, reports);
+ reportJson.xmlToJsonFile(xmlTempFileStr, jsonFileStr, this);
+ xmlTempFile.delete();
}
return jsonFileStr;
}
if (format.equals("html")) {
copyHtmlFolder(htmlFileStr);
- reportHtml.parseGlobal(htmlFileStr, gr, gr.getIndividualReports(), this);
+ reportHtml.parseGlobal(htmlFileStr, gr, reports, this);
return htmlFileStr;
}
if (format.equals("pdf")) {
- reportPdf.parseGlobal(pdfFileStr, gr, gr.getIndividualReports());
+ reportPdf.parseGlobal(pdfFileStr, gr, reports);
return pdfFileStr;
}
@@ -701,7 +710,10 @@ public String makeSummaryReport(String internalReportFolder,
String htmlFileStr = internalReportFolder + "report.html";
String pdfFileStr = internalReportFolder + "report.pdf";
+ SmallGlobalReport sgr = new SmallGlobalReport(gr, internalReportFolder + "/summary.ser");
+
gr.write(internalReportFolder, "summary.ser");
+ sgr.write(internalReportFolder, "summary.min.ser");
// gr = (GlobalReport) GlobalReport.read(internalReportFolder + "/summary.ser");
if (config.getFormats().contains("XML")) {
diff --git a/src/main/java/dpfmanager/shell/modules/report/core/ReportSerializable.java b/src/main/java/dpfmanager/shell/modules/report/core/ReportSerializable.java
index dd23480f..80c46f20 100644
--- a/src/main/java/dpfmanager/shell/modules/report/core/ReportSerializable.java
+++ b/src/main/java/dpfmanager/shell/modules/report/core/ReportSerializable.java
@@ -38,7 +38,7 @@ public Integer getVersion(){
}
public void write(String internal, String filename){
- version = 2;
+ version = 3;
try {
File internalFile = new File(internal);
if (!internalFile.exists()) internalFile.mkdirs();
@@ -70,7 +70,7 @@ public static ReportSerializable read(String file){
fis.close();
} catch(Exception ioe) {
System.err.println("Error in file: "+file);
- //ioe.printStackTrace();
+ System.err.println("Error message: "+ioe.getMessage());
obj = null;
}
return obj;
diff --git a/src/main/java/dpfmanager/shell/modules/report/core/ReportService.java b/src/main/java/dpfmanager/shell/modules/report/core/ReportService.java
index b262c662..ee65b3f6 100644
--- a/src/main/java/dpfmanager/shell/modules/report/core/ReportService.java
+++ b/src/main/java/dpfmanager/shell/modules/report/core/ReportService.java
@@ -27,6 +27,7 @@
import dpfmanager.shell.core.messages.ArrayMessage;
import dpfmanager.shell.core.messages.ShowMessage;
import dpfmanager.shell.core.messages.UiMessage;
+import dpfmanager.shell.modules.report.messages.GenerateIndividualMessage;
import dpfmanager.shell.modules.report.messages.GenerateMessage;
import dpfmanager.shell.modules.report.messages.GlobalReportMessage;
import dpfmanager.shell.modules.report.messages.IndividualReportMessage;
@@ -42,6 +43,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import javax.annotation.PostConstruct;
@@ -75,7 +77,7 @@ public void tractIndividualMessage(IndividualReportMessage message) {
// Main function
public void tractGlobalMessage(GlobalReportMessage message) {
- createGlobalReports(message.getUuid(), message.getIndividuals(), message.getConfig(), message.getStart(), message.getCheckedIsos());
+ createGlobalReports(message.getUuid(), message.getIndividuals(), message.getConfig(), message.getStart(), message.getCheckedIsos(), message.getZipsPaths());
config = message.getConfig();
}
@@ -86,44 +88,63 @@ private void createIndividualReports(IndividualReport ir, Configuration config)
context.send(BasicConfig.MODULE_THREADING, new RunnableMessage(ir.getUuid(), run));
}
- private void createGlobalReports(Long uuid, List individuals, Configuration config, Date start, List checkedIsos) {
+ private void createGlobalReports(Long uuid, List individuals, Configuration config, Date start, List checkedIsos, Map zipsPaths) {
// Create global runnable
GlobalReportsRunnable run = new GlobalReportsRunnable(generator);
- run.setParameters(individuals, config, start, checkedIsos);
+ run.setParameters(individuals, config, start, checkedIsos, zipsPaths);
context.send(BasicConfig.MODULE_THREADING, new RunnableMessage(uuid, run));
}
public void tractGenerateMessage(GenerateMessage gm) {
Long uuid = gm.getUuid();
String internalReportFolder = null;
- Integer globalValue = gm.getFormat().toLowerCase().equals("mets") ? 0 : 1;
- globalValue = 1;
- Integer max = gm.getGlobalReport().getIndividualReports().size() + globalValue;
+ Integer globalValue = 1;
+ Integer max = (gm.isOnlyGlobal()) ? globalValue : (gm.getInfo().getGlobalReport().getIndividualReports().size() + globalValue) * gm.getFormats().size();
// Transform individual reports runnables
List individualsMakers = new ArrayList<>();
- for (SmallIndividualReport sir : gm.getGlobalReport().getIndividualReports()) {
- if (internalReportFolder == null) internalReportFolder = sir.getInternalReportFodler();
- sir.predictImagePath();
-
+ List globalMakers = new ArrayList<>();
+ for (String format : gm.getFormats()) {
+ for (SmallIndividualReport sir : gm.getInfo().getGlobalReport().getIndividualReports()) {
+ if (internalReportFolder == null) internalReportFolder = sir.getInternalReportFodler();
+ sir.predictImagePath();
+
+ MakeReportRunnable mrr = new MakeReportRunnable(generator);
+ mrr.setIndividualParameters(sir, gm.getInfo().getGlobalReport(), format);
+ individualsMakers.add(mrr);
+ }
+
+ // Transforms global report and show runnable
MakeReportRunnable mrr = new MakeReportRunnable(generator);
- mrr.setIndividualParameters(sir, gm.getGlobalReport(), gm.getFormat());
- individualsMakers.add(mrr);
+ mrr.setGlobalParameters(internalReportFolder, gm.getInfo(), globalValue, format, gm.isOnlyGlobal());
+ globalMakers.add(mrr);
}
- // Transforms global report and show runnable
- MakeReportRunnable mrr = new MakeReportRunnable(generator);
- mrr.setGlobalParameters(internalReportFolder, gm.getGlobalReport(), globalValue, gm.getFormat());
-
// Init progress bar
+ MakeReportRunnable mrr = globalMakers.get(0);
+ mrr.setShowAtEnd(true);
context.send(GuiConfig.PERSPECTIVE_SHOW + "." + GuiConfig.COMPONENT_SHOW, new ShowMessage(uuid, max, globalValue, mrr));
- // Start individual transforms
- for (MakeReportRunnable iMrr : individualsMakers){
- context.send(BasicConfig.MODULE_THREADING, new RunnableMessage(uuid, iMrr));
+ globalMakers.remove(0);
+ individualsMakers.addAll(globalMakers);
+ if (!gm.isOnlyGlobal()){
+ // Start individual transforms
+ for (MakeReportRunnable iMrr : individualsMakers){
+ context.send(BasicConfig.MODULE_THREADING, new RunnableMessage(uuid, iMrr, "individual"));
+ }
+ } else {
+ // Start global transforms
+ context.send(GuiConfig.PERSPECTIVE_SHOW + "." + GuiConfig.COMPONENT_SHOW, new ShowMessage(uuid, 0));
}
}
+ public void tractGenerateIndividualMessage(GenerateIndividualMessage gm) {
+ IndividualReport ir = (IndividualReport) IndividualReport.read(gm.getPath());
+ MakeReportRunnable mrr = new MakeReportRunnable(generator);
+ mrr.setIndividualParameters(ir, gm.getPath(), gm.getFormat(), gm.getConfig());
+ context.send(BasicConfig.MODULE_THREADING, new RunnableMessage(System.currentTimeMillis(), mrr, "individual"));
+ }
+
public Configuration getConfig() {
return config;
}
diff --git a/src/main/java/dpfmanager/shell/modules/report/core/SmallGlobalReport.java b/src/main/java/dpfmanager/shell/modules/report/core/SmallGlobalReport.java
new file mode 100644
index 00000000..c0daaabf
--- /dev/null
+++ b/src/main/java/dpfmanager/shell/modules/report/core/SmallGlobalReport.java
@@ -0,0 +1,89 @@
+/**
+ *
ReportGenerator.java
This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version; or, at your
+ * choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the Mozilla Public License for more details.
+ *
+ * @author Adria Llorens Martinez
+ * @version 1.0
+ * @since 23/6/2015
+ */
+
+package dpfmanager.shell.modules.report.core;
+
+/**
+ * The Class GlobalReport.
+ */
+public class SmallGlobalReport extends ReportSerializable {
+
+ /**
+ * Do not modify!
+ */
+ private static final long serialVersionUID = 7845L;
+
+ /**
+ * The path to global report serialized file
+ */
+ private String serGlobalReportPath;
+
+ private String input;
+ private boolean quick;
+ private int nFiles;
+ private int nErrors;
+ private int nWarnings;
+ private int nPassed;
+
+
+ /**
+ * Instantiates a new small global report.
+ */
+ public SmallGlobalReport(GlobalReport gr, String path) {
+ this.serGlobalReportPath = path;
+ this.input = gr.getInputString();
+ this.quick = gr.getConfig().isQuick();
+ this.nFiles = gr.getReportsCount();
+ this.nErrors = gr.getAllReportsKo();
+ this.nWarnings = gr.getAllReportsWarnings();
+ this.nPassed = gr.getAllReportsOk();
+ }
+
+ /**
+ * Getters
+ */
+
+ public String getSerGlobalReportPath() {
+ return serGlobalReportPath;
+ }
+
+ public String getInput() {
+ return input;
+ }
+
+ public boolean isQuick() {
+ return quick;
+ }
+
+ public int getnFiles() {
+ return nFiles;
+ }
+
+ public int getnErrors() {
+ return nErrors;
+ }
+
+ public int getnWarnings() {
+ return nWarnings;
+ }
+
+ public int getnPassed() {
+ return nPassed;
+ }
+}
diff --git a/src/main/java/dpfmanager/shell/modules/report/core/SmallIndividualReport.java b/src/main/java/dpfmanager/shell/modules/report/core/SmallIndividualReport.java
index 93b68977..f3d2dac2 100644
--- a/src/main/java/dpfmanager/shell/modules/report/core/SmallIndividualReport.java
+++ b/src/main/java/dpfmanager/shell/modules/report/core/SmallIndividualReport.java
@@ -33,6 +33,12 @@ public class SmallIndividualReport implements Comparable, Serializable {
int percentOne;
int percent;
boolean quick;
+ String inputStr;
+
+ List selectedIsos;
+ Integer reportVersion;
+ String serPath;
+ int idReport;
public SmallIndividualReport(IndividualReport ind) {
this.isError = ind.isError();
@@ -45,6 +51,11 @@ public SmallIndividualReport(IndividualReport ind) {
this.uuid = ind.getUuid();
this.imagePath = ind.getImagePath();
this.quick = ind.isQuick();
+ this.inputStr = ind.getInputStr();
+ this.serPath = ind.getSerPath();
+ this.idReport = ind.getIdReport();
+ this.reportVersion = ind.getVersion();
+ this.selectedIsos = ind.getSelectedIsos();
}
public void generate(IndividualReport ind){
@@ -67,6 +78,10 @@ public void computePercent(GlobalReport global){
this.percentOne = calculatePercent(global, 1.0);
}
+ public String getInputStr() {
+ return inputStr;
+ }
+
public String getImagePath() {
return imagePath;
}
@@ -109,14 +124,14 @@ public int getNErrorsPolicy(String iso){
if (nErrorsPolicy.containsKey(iso)) {
return nErrorsPolicy.get(iso);
}
- return 0;
+ return -1;
}
public int getNWarningsPolicy(String iso){
if (nWarningsPolicy.containsKey(iso)) {
return nWarningsPolicy.get(iso);
}
- return 0;
+ return -1;
}
public int getAllNErrorsPolicy(){
@@ -182,6 +197,22 @@ public Long getUuid() {
return uuid;
}
+ public String getSerPath() {
+ return serPath;
+ }
+
+ public int getIdReport() {
+ return idReport;
+ }
+
+ public int getReportVersion() {
+ return reportVersion;
+ }
+
+ public List getSelectedIsos() {
+ return selectedIsos;
+ }
+
public boolean isQuick() {
return quick;
}
diff --git a/src/main/java/dpfmanager/shell/modules/report/messages/GenerateIndividualMessage.java b/src/main/java/dpfmanager/shell/modules/report/messages/GenerateIndividualMessage.java
new file mode 100644
index 00000000..36f74329
--- /dev/null
+++ b/src/main/java/dpfmanager/shell/modules/report/messages/GenerateIndividualMessage.java
@@ -0,0 +1,53 @@
+/**
+ *
IndividualReportMessage.java
This program is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any later version; or,
+ * at your choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License and the Mozilla Public License for more details.
This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version; or, at your
+ * choice, under the terms of the Mozilla Public License, v. 2.0. SPDX GPL-3.0+ or MPL-2.0+.
+ *
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the Mozilla Public License for more details.