From 8153832807e2a97690bc511e8516855fabac02ca Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 31 Dec 2018 11:31:15 +0100
Subject: [PATCH] exportElement doesn't take sbmlModel as a parameter
---
.../converter/model/sbml/SbmlBioEntityExporter.java | 3 +--
.../lcsb/mapviewer/converter/model/sbml/SbmlExporter.java | 6 +++---
.../model/sbml/species/SbmlSpeciesExporterTest.java | 6 +++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlBioEntityExporter.java b/converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlBioEntityExporter.java
index 45ac9e9392..c49d357149 100644
--- a/converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlBioEntityExporter.java
+++ b/converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlBioEntityExporter.java
@@ -70,8 +70,7 @@ public abstract class SbmlBioEntityExporter<T extends BioEntity, S extends org.s
this.sbmlExtensions.addAll(sbmlExtensions);
}
- public void exportElements(Model model) throws InconsistentModelException {
- sbmlModel = model;
+ public void exportElements() throws InconsistentModelException {
Collection<T> speciesList = getElementList();
for (T species : speciesList) {
S sbmlElement = getSbmlElement(species);
diff --git a/converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlExporter.java b/converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlExporter.java
index db7b4bd519..9411cc7ff5 100644
--- a/converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlExporter.java
+++ b/converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlExporter.java
@@ -108,9 +108,9 @@ public class SbmlExporter {
SbmlParameterExporter parameterExporter = new SbmlParameterExporter(model);
SbmlFunctionExporter functionExporter = new SbmlFunctionExporter(model);
- compartmentExporter.exportElements(result);
- speciesExporter.exportElements(result);
- reactionExporter.exportElements(result);
+ compartmentExporter.exportElements();
+ speciesExporter.exportElements();
+ reactionExporter.exportElements();
unitExporter.exportUnits(result);
parameterExporter.exportParameter(result);
functionExporter.exportFunction(result);
diff --git a/converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/species/SbmlSpeciesExporterTest.java b/converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/species/SbmlSpeciesExporterTest.java
index 954544c422..36b459def4 100644
--- a/converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/species/SbmlSpeciesExporterTest.java
+++ b/converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/species/SbmlSpeciesExporterTest.java
@@ -40,7 +40,7 @@ public class SbmlSpeciesExporterTest {
SbmlSpeciesExporter exporter = createExporter(model);
- exporter.exportElements(sbmlModel);
+ exporter.exportElements();
assertEquals(1, sbmlModel.getSpeciesCount());
}
@@ -62,7 +62,7 @@ public class SbmlSpeciesExporterTest {
SbmlSpeciesExporter exporter = createExporter(model);
- exporter.exportElements(sbmlModel);
+ exporter.exportElements();
assertEquals(2, sbmlModel.getSpeciesCount());
}
@@ -76,7 +76,7 @@ public class SbmlSpeciesExporterTest {
SbmlCompartmentExporter compartmentExporter = new SbmlCompartmentExporter(sbmlModel, model,
Arrays.asList(SbmlExtension.values()));
- compartmentExporter.exportElements(sbmlModel);
+ compartmentExporter.exportElements();
SbmlSpeciesExporter result = new SbmlSpeciesExporter(sbmlModel, model,
Arrays.asList(new SbmlExtension[] { SbmlExtension.RENDER, SbmlExtension.LAYOUT }),
compartmentExporter);
--
GitLab