diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/DataTransferController.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/DataTransferController.java index e2ae7ca483bfdeb4fa9a9dc6313b29ecb51b5de3..1b73008b36e98a9e8feb80f546a480109fea4c0e 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/DataTransferController.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/DataTransferController.java @@ -9,7 +9,6 @@ import cz.it4i.fiji.haas.ui.JavaFXRoutines; import cz.it4i.fiji.haas.ui.TableCellAdapter; import cz.it4i.fiji.haas_java_client.FileTransferInfo; import cz.it4i.fiji.haas_java_client.FileTransferState; -import cz.it4i.fiji.haas_spim_benchmark.core.ObservableBenchmarkJob; import cz.it4i.fiji.haas_spim_benchmark.core.SimpleObservableList; import cz.it4i.fiji.haas_spim_benchmark.core.SimpleObservableValue; import javafx.fxml.FXML; @@ -37,10 +36,9 @@ public class DataTransferController extends BorderPane implements } @SuppressWarnings("unchecked") - public void setJob(final ObservableBenchmarkJob job) { - - SimpleObservableList<FileTransferInfo> fileTransferList = job - .getFileTransferList(); + public void setObservable( + final SimpleObservableList<FileTransferInfo> fileTransferList) + { if (fileTransferList != null && fileTransferList.size() != 0) { diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/JobDetailControl.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/JobDetailControl.java index 48158fd7d37664d8535aee7bc62e0d224cec0263..76c6a388366692723c233f5498783bd2f95ea5b4 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/JobDetailControl.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/JobDetailControl.java @@ -17,6 +17,7 @@ import cz.it4i.fiji.haas.ui.InitiableControl; import cz.it4i.fiji.haas.ui.JavaFXRoutines; import cz.it4i.fiji.haas.ui.ModalDialogs; import cz.it4i.fiji.haas.ui.ProgressDialog; +import cz.it4i.fiji.haas_java_client.FileTransferInfo; import cz.it4i.fiji.haas_java_client.JobState; import cz.it4i.fiji.haas_java_client.SynchronizableFileType; import cz.it4i.fiji.haas_spim_benchmark.core.ObservableBenchmarkJob; @@ -62,7 +63,7 @@ public class JobDetailControl extends TabPane implements CloseableControl, private Tab jobPropertiesTab; @FXML - private DataTransferController dataUpload; + private DataTransferController dataUploadControl; @FXML private Tab dataUploadTab; @@ -151,7 +152,12 @@ public class JobDetailControl extends TabPane implements CloseableControl, otherOutputControl.setObservable(standardOutput); jobProperties.setJob(job); - dataUpload.setJob(job); + + SimpleObservableList<FileTransferInfo> fileTransferList = job + .getFileTransferList(); + setTabAvailability(dataUploadTab, fileTransferList == null || + fileTransferList.size() == 0); + dataUploadControl.setObservable(fileTransferList); if (job.getValue().getState() == JobState.Disposed) { // TODO: Handle this? @@ -193,7 +199,7 @@ public class JobDetailControl extends TabPane implements CloseableControl, standardOutput.removeListener(standardOutputListener); otherOutputControl.close(); jobProperties.close(); - dataUpload.close(); + dataUploadControl.close(); } // -- Helper methods -- diff --git a/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/JobDetail.fxml b/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/JobDetail.fxml index fb5bfba98e578f1906c974ff6ee9cd5c919f6505..c18954101d0c5988977f941c975a4ab5e940d116 100644 --- a/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/JobDetail.fxml +++ b/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/JobDetail.fxml @@ -49,7 +49,7 @@ <Tab closable="false" text="Data upload" fx:id="dataUploadTab"> <content> <HBox> - <DataTransferController fx:id="dataUpload" HBox.hgrow="ALWAYS" /> + <DataTransferController fx:id="dataUploadControl" HBox.hgrow="ALWAYS" /> </HBox> </content> </Tab>