From 4f1a0e2cf62e3df62dc5fe029d014cb71d80e607 Mon Sep 17 00:00:00 2001
From: Petr Bainar <petr.bainar@hotmail.com>
Date: Thu, 13 Sep 2018 15:16:23 +0200
Subject: [PATCH] miscStuffAgain: enable/disable the 'Data upload' tab
---
.../ui/DataTransferController.java | 8 +++-----
.../haas_spim_benchmark/ui/JobDetailControl.java | 12 +++++++++---
.../it4i/fiji/haas_spim_benchmark/ui/JobDetail.fxml | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
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 e2ae7ca4..1b73008b 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 48158fd7..76c6a388 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 fb5bfba9..c1895410 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>
--
GitLab