gCubeSystem
/
software-versions-processor-lib
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improving code

This commit is contained in:
Luca Frosini 2023-01-27 16:40:13 +01:00
parent 7961619ac0
commit 56f690c4cc
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/common/software/analyser/SoftwareVersionConfigAnalyser.java
View File

@ -83,9 +83,9 @@ public class SoftwareVersionConfigAnalyser {
Class<? extends SoftwareVersionExporter> exporterClass = availableExporters.get(className); Class<? extends SoftwareVersionExporter> exporterClass = availableExporters.get(className);
SoftwareVersionExporter sve = exporterClass.newInstance(); SoftwareVersionExporter sve = exporterClass.newInstance();
ExporterConfig processorConfig = requestedExporters.get(className); ExporterConfig processorConfig = requestedExporters.get(className);
sve.setSoftwareConfig(softwareConfig); sve.setGlobalConfig(softwareConfig);
sve.setSoftwareVersion(softwareVersionConfig); sve.setSoftwareVersion(softwareVersionConfig);
sve.setProcessorConfig(processorConfig); sve.setExporterConfig(processorConfig);
sve.setFirst(first); sve.setFirst(first);
// sve.export(); // sve.export();
} }

14
src/main/java/org/gcube/common/software/export/SoftwareVersionExporter.java
View File

@ -30,17 +30,17 @@ public abstract class SoftwareVersionExporter {
return processors; return processors;
} }
protected GlobalConfig softwareConfig; protected GlobalConfig globalConfig;
protected SoftwareVersionConfig softwareVersionConfig; protected SoftwareVersionConfig softwareVersionConfig;
protected ExporterConfig processorConfig; protected ExporterConfig processorConfig;
protected boolean first; protected boolean first;
public GlobalConfig getSoftwareConfig() { public GlobalConfig getGlobalConfig() {
return softwareConfig; return globalConfig;
} }
public void setSoftwareConfig(GlobalConfig softwareConfig) { public void setGlobalConfig(GlobalConfig softwareConfig) {
this.softwareConfig = softwareConfig; this.globalConfig = softwareConfig;
} }
public SoftwareVersionConfig getSoftwareVersionConfig() { public SoftwareVersionConfig getSoftwareVersionConfig() {
@ -51,11 +51,11 @@ public abstract class SoftwareVersionExporter {
this.softwareVersionConfig = softwareVersionConfig; this.softwareVersionConfig = softwareVersionConfig;
} }
public ExporterConfig getProcessorConfig() { public ExporterConfig getExporterConfig() {
return processorConfig; return processorConfig;
} }
public void setProcessorConfig(ExporterConfig processorConfig) { public void setExporterConfig(ExporterConfig processorConfig) {
this.processorConfig = processorConfig; this.processorConfig = processorConfig;
} }

3
src/main/java/org/gcube/common/software/export/biblatex/BibLaTeXSoftwareVersionExporter.java
View File

@ -9,6 +9,7 @@ import java.util.Set;
import org.gcube.com.fasterxml.jackson.databind.JsonNode; import org.gcube.com.fasterxml.jackson.databind.JsonNode;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode; 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.export.SoftwareVersionExporter;
import org.gcube.common.software.model.ElaborationType; import org.gcube.common.software.model.ElaborationType;
import org.gcube.common.software.model.Variables; import org.gcube.common.software.model.Variables;
@ -183,7 +184,7 @@ public class BibLaTeXSoftwareVersionExporter extends SoftwareVersionExporter {
} }
protected File getExportFile() { protected File getExportFile() {
String fileName = softwareConfig.getExportFileName(); String fileName = AnalyserFactory.getExportFileName(null);
File file = new File(fileName + EXPORT_FILENAME_EXTENSION); File file = new File(fileName + EXPORT_FILENAME_EXTENSION);
return file; return file;
} }