From 56f690c4cc0d63e10a77c9baab63ef3301512a60 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 27 Jan 2023 16:40:13 +0100
Subject: [PATCH] Improving code

---
 .../analyser/SoftwareVersionConfigAnalyser.java    |  4 ++--
 .../software/export/SoftwareVersionExporter.java   | 14 +++++++-------
 .../biblatex/BibLaTeXSoftwareVersionExporter.java  |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/gcube/common/software/analyser/SoftwareVersionConfigAnalyser.java b/src/main/java/org/gcube/common/software/analyser/SoftwareVersionConfigAnalyser.java
index 1987f54..a363a56 100644
--- a/src/main/java/org/gcube/common/software/analyser/SoftwareVersionConfigAnalyser.java
+++ b/src/main/java/org/gcube/common/software/analyser/SoftwareVersionConfigAnalyser.java
@@ -83,9 +83,9 @@ public class SoftwareVersionConfigAnalyser {
 			Class<? extends SoftwareVersionExporter> exporterClass = availableExporters.get(className);
 			SoftwareVersionExporter sve = exporterClass.newInstance();
 			ExporterConfig processorConfig = requestedExporters.get(className); 
-			sve.setSoftwareConfig(softwareConfig);
+			sve.setGlobalConfig(softwareConfig);
 			sve.setSoftwareVersion(softwareVersionConfig);
-			sve.setProcessorConfig(processorConfig);
+			sve.setExporterConfig(processorConfig);
 			sve.setFirst(first);
 			// sve.export();
 		} 
diff --git a/src/main/java/org/gcube/common/software/export/SoftwareVersionExporter.java b/src/main/java/org/gcube/common/software/export/SoftwareVersionExporter.java
index 2a900c2..2161533 100644
--- a/src/main/java/org/gcube/common/software/export/SoftwareVersionExporter.java
+++ b/src/main/java/org/gcube/common/software/export/SoftwareVersionExporter.java
@@ -30,17 +30,17 @@ public abstract class SoftwareVersionExporter {
 		return processors;
 	}
 	
-	protected GlobalConfig softwareConfig;
+	protected GlobalConfig globalConfig;
 	protected SoftwareVersionConfig softwareVersionConfig;
 	protected ExporterConfig processorConfig;
 	protected boolean first;
 	
-	public GlobalConfig getSoftwareConfig() {
-		return softwareConfig;
+	public GlobalConfig getGlobalConfig() {
+		return globalConfig;
 	}
 
-	public void setSoftwareConfig(GlobalConfig softwareConfig) {
-		this.softwareConfig = softwareConfig;
+	public void setGlobalConfig(GlobalConfig softwareConfig) {
+		this.globalConfig = softwareConfig;
 	}
 
 	public SoftwareVersionConfig getSoftwareVersionConfig() {
@@ -51,11 +51,11 @@ public abstract class SoftwareVersionExporter {
 		this.softwareVersionConfig = softwareVersionConfig;
 	}
 	
-	public ExporterConfig getProcessorConfig() {
+	public ExporterConfig getExporterConfig() {
 		return processorConfig;
 	}
 	
-	public void setProcessorConfig(ExporterConfig processorConfig) {
+	public void setExporterConfig(ExporterConfig processorConfig) {
 		this.processorConfig = processorConfig;
 	}
 
diff --git a/src/main/java/org/gcube/common/software/export/biblatex/BibLaTeXSoftwareVersionExporter.java b/src/main/java/org/gcube/common/software/export/biblatex/BibLaTeXSoftwareVersionExporter.java
index 81db1d7..3389866 100644
--- a/src/main/java/org/gcube/common/software/export/biblatex/BibLaTeXSoftwareVersionExporter.java
+++ b/src/main/java/org/gcube/common/software/export/biblatex/BibLaTeXSoftwareVersionExporter.java
@@ -9,6 +9,7 @@ import java.util.Set;
 
 import org.gcube.com.fasterxml.jackson.databind.JsonNode;
 import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
+import org.gcube.common.software.analyser.AnalyserFactory;
 import org.gcube.common.software.export.SoftwareVersionExporter;
 import org.gcube.common.software.model.ElaborationType;
 import org.gcube.common.software.model.Variables;
@@ -183,7 +184,7 @@ public class BibLaTeXSoftwareVersionExporter extends SoftwareVersionExporter {
 	}
 
 	protected File getExportFile() {
-		String fileName = softwareConfig.getExportFileName();
+		String fileName = AnalyserFactory.getExportFileName(null);
 		File file = new File(fileName + EXPORT_FILENAME_EXTENSION);
 		return file;
 	}