Merge branch 'master' into fix-#371

equinor · Apr 7, 2022 · 9f5ea36 · 9f5ea36
2 parents 46b0595 + 361aba7
commit 9f5ea36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/neqsim/thermo/system/SystemInterface.java b/src/main/java/neqsim/thermo/system/SystemInterface.java
@@ -2273,14 +2273,16 @@ public double calcBeta() throws neqsim.util.exception.IsNaNException,
      * generatePDF.
      * </p>
      */
-    public void generatePDF();
+    public neqsim.dataPresentation.iTextPDF.PdfCreator generatePDF();
 
     /**
      * <p>
      * displayPDF.
      * </p>
      */
-    public void displayPDF();
+    default public void displayPDF() {
+      generatePDF().openPDF();
+    }
 
     /**
      * <p>

diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java
@@ -105,7 +105,6 @@ abstract class SystemThermo implements SystemInterface {
   protected neqsim.standards.StandardInterface standard = null;
   protected InterphasePropertiesInterface interfaceProp = null;
   private boolean multiphaseWaxCheck = false;
-  Object pdfDocument = null;
   private boolean forcePhaseTypes = false;
   static Logger logger = LogManager.getLogger(SystemThermo.class);
 
@@ -3986,7 +3985,7 @@ public neqsim.standards.StandardInterface getStandard(String standardName) {
 
   /** {@inheritDoc} */
   @Override
-  public void generatePDF() {
+  public neqsim.dataPresentation.iTextPDF.PdfCreator generatePDF() {
     neqsim.dataPresentation.iTextPDF.PdfCreator pdfDocument = null;
     pdfDocument = new neqsim.dataPresentation.iTextPDF.PdfCreator();
     pdfDocument.getDocument().addTitle("NeqSim Thermo Simulation Report");
@@ -4026,14 +4025,7 @@ public void generatePDF() {
       logger.error("error", e);
     }
     pdfDocument.getDocument().close();
-    this.pdfDocument = pdfDocument;
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public void displayPDF() {
-    generatePDF();
-    ((neqsim.dataPresentation.iTextPDF.PdfCreator) pdfDocument).openPDF();
+    return pdfDocument;
   }
 
   /**