Merge pull request #108 from Lars-B/fix/target-tree

Fix/target tree problem in TAGui and Docker file

Author: rbouckaert

Dockerfile

@@ -24,15 +24,15 @@
 #   docker run --platform linux/arm64/v8 --entrypoint /bin/bash -it -p 5900:5900 beastfx_testing
 
 
-FROM openjdk:8
+FROM eclipse-temurin:8-jdk
 
 RUN apt-get update
 # Install stuff required later
 RUN apt-get install -y curl git
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-ENV USER root
+ENV USER=root
 
 WORKDIR /root/BeastFX
 
@@ -84,7 +84,7 @@ RUN chmod 600 /root/.vnc/passwd
 
 ADD . ./
 
-ENV DISPLAY :2
+ENV DISPLAY=:2
 
 RUN echo "#!/bin/bash\n" \
         "export USER=root\n" \

src/beastfx/app/treeannotator/TAGui.java

@@ -128,15 +128,15 @@ public void run() {
 	            TreeAnnotator ta = new TreeAnnotator();
 	            ta.topologyInput.setValue(targetOption, ta);
 	            ta.heightInput.setValue(heightsOption, ta);
-	            ta.run(burninPercentage,
+                ta.targetInput.setValue(targetTreeFileName, ta);
+
+                ta.run(burninPercentage,
 	            		lowMem,
-	                    //heightsOption,
 	                    posteriorLimit,
 	                    hpd2D,
-	                    //targetOption,
-	                    targetTreeFileName,
 	                    inputFileName,
-	                    outputFileName);
+	                    outputFileName
+                );
 
 	        } catch (Exception ex) {
 	            Log.err.println("Exception: " + ex.getMessage());