Skip to content
Snippets Groups Projects
Commit 4f1a0e2c authored by Petr Bainar's avatar Petr Bainar
Browse files

miscStuffAgain: enable/disable the 'Data upload' tab

parent 37f883db
No related branches found
No related tags found
1 merge request!33Misc stuff again
Pipeline #4918 failed
...@@ -9,7 +9,6 @@ import cz.it4i.fiji.haas.ui.JavaFXRoutines; ...@@ -9,7 +9,6 @@ import cz.it4i.fiji.haas.ui.JavaFXRoutines;
import cz.it4i.fiji.haas.ui.TableCellAdapter; import cz.it4i.fiji.haas.ui.TableCellAdapter;
import cz.it4i.fiji.haas_java_client.FileTransferInfo; import cz.it4i.fiji.haas_java_client.FileTransferInfo;
import cz.it4i.fiji.haas_java_client.FileTransferState; 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.SimpleObservableList;
import cz.it4i.fiji.haas_spim_benchmark.core.SimpleObservableValue; import cz.it4i.fiji.haas_spim_benchmark.core.SimpleObservableValue;
import javafx.fxml.FXML; import javafx.fxml.FXML;
...@@ -37,10 +36,9 @@ public class DataTransferController extends BorderPane implements ...@@ -37,10 +36,9 @@ public class DataTransferController extends BorderPane implements
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void setJob(final ObservableBenchmarkJob job) { public void setObservable(
final SimpleObservableList<FileTransferInfo> fileTransferList)
SimpleObservableList<FileTransferInfo> fileTransferList = job {
.getFileTransferList();
if (fileTransferList != null && fileTransferList.size() != 0) { if (fileTransferList != null && fileTransferList.size() != 0) {
......
...@@ -17,6 +17,7 @@ import cz.it4i.fiji.haas.ui.InitiableControl; ...@@ -17,6 +17,7 @@ import cz.it4i.fiji.haas.ui.InitiableControl;
import cz.it4i.fiji.haas.ui.JavaFXRoutines; import cz.it4i.fiji.haas.ui.JavaFXRoutines;
import cz.it4i.fiji.haas.ui.ModalDialogs; import cz.it4i.fiji.haas.ui.ModalDialogs;
import cz.it4i.fiji.haas.ui.ProgressDialog; 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.JobState;
import cz.it4i.fiji.haas_java_client.SynchronizableFileType; import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
import cz.it4i.fiji.haas_spim_benchmark.core.ObservableBenchmarkJob; import cz.it4i.fiji.haas_spim_benchmark.core.ObservableBenchmarkJob;
...@@ -62,7 +63,7 @@ public class JobDetailControl extends TabPane implements CloseableControl, ...@@ -62,7 +63,7 @@ public class JobDetailControl extends TabPane implements CloseableControl,
private Tab jobPropertiesTab; private Tab jobPropertiesTab;
@FXML @FXML
private DataTransferController dataUpload; private DataTransferController dataUploadControl;
@FXML @FXML
private Tab dataUploadTab; private Tab dataUploadTab;
...@@ -151,7 +152,12 @@ public class JobDetailControl extends TabPane implements CloseableControl, ...@@ -151,7 +152,12 @@ public class JobDetailControl extends TabPane implements CloseableControl,
otherOutputControl.setObservable(standardOutput); otherOutputControl.setObservable(standardOutput);
jobProperties.setJob(job); 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) { if (job.getValue().getState() == JobState.Disposed) {
// TODO: Handle this? // TODO: Handle this?
...@@ -193,7 +199,7 @@ public class JobDetailControl extends TabPane implements CloseableControl, ...@@ -193,7 +199,7 @@ public class JobDetailControl extends TabPane implements CloseableControl,
standardOutput.removeListener(standardOutputListener); standardOutput.removeListener(standardOutputListener);
otherOutputControl.close(); otherOutputControl.close();
jobProperties.close(); jobProperties.close();
dataUpload.close(); dataUploadControl.close();
} }
// -- Helper methods -- // -- Helper methods --
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<Tab closable="false" text="Data upload" fx:id="dataUploadTab"> <Tab closable="false" text="Data upload" fx:id="dataUploadTab">
<content> <content>
<HBox> <HBox>
<DataTransferController fx:id="dataUpload" HBox.hgrow="ALWAYS" /> <DataTransferController fx:id="dataUploadControl" HBox.hgrow="ALWAYS" />
</HBox> </HBox>
</content> </content>
</Tab> </Tab>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment