提交 5e5acfa3 编写于 作者: S ShadelessFox

#9687 Don't expose flag

上级 aa0cae7c
......@@ -200,8 +200,6 @@ public class DataTransferWizard extends TaskConfigurationWizard<DataTransferSett
super.addPages();
if ((!isTaskEditor() || isNewTaskEditor()) && (settings.isConsumerOptional() || settings.isProducerOptional())) {
addPage(new DataTransferPagePipes());
} else {
settings.setNodeUpdateRestricted(true);
}
addWizardPages(this);
addPage(new DataTransferPageFinal());
......@@ -570,7 +568,8 @@ public class DataTransferWizard extends TaskConfigurationWizard<DataTransferSett
new DialogSettingsMap(getWizardDialogSettings()),
new DataTransferState(),
true,
CommonUtils.isEmpty(consumers));
CommonUtils.isEmpty(consumers),
false);
}
});
......
......@@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.runtime.MonitorRunnableContext;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.task.DBTTask;
import org.jkiss.dbeaver.model.task.DBTTaskSettings;
import org.jkiss.dbeaver.model.task.DBTaskUtils;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.tools.transfer.internal.DTMessages;
import org.jkiss.dbeaver.tools.transfer.registry.DataTransferNodeDescriptor;
......@@ -78,7 +79,7 @@ public class DataTransferSettings implements DBTTaskSettings<DBPObject> {
private boolean pipeChangeRestricted;
// Hacky flag too. Skip nodes (producer and consumer) update
// if it's not required -- e.g., when we're editing an exiting task
private boolean nodeUpdateRestricted;
private final boolean nodeUpdateRestricted;
public DataTransferSettings(
@NotNull DBRProgressMonitor monitor,
......@@ -87,8 +88,10 @@ public class DataTransferSettings implements DBTTaskSettings<DBPObject> {
@NotNull Map<String, Object> configuration,
@NotNull DataTransferState state,
boolean selectDefaultNodes,
boolean isExport) {
boolean isExport,
boolean isExitingTask) {
this.state = state;
this.nodeUpdateRestricted = isExitingTask;
initializePipes(producers, consumers, isExport);
loadSettings(monitor, configuration);
......@@ -113,7 +116,8 @@ public class DataTransferSettings implements DBTTaskSettings<DBPObject> {
getTaskOrSavedSettings(task, configuration),
state,
!task.getProperties().isEmpty(),
isExportTask(task)
isExportTask(task),
DBTaskUtils.isTaskExists(task)
);
}
......@@ -142,14 +146,6 @@ public class DataTransferSettings implements DBTTaskSettings<DBPObject> {
this.pipeChangeRestricted = pipeChangeRestricted;
}
public boolean isNodeUpdateRestricted() {
return nodeUpdateRestricted;
}
public void setNodeUpdateRestricted(boolean nodeUpdateRestricted) {
this.nodeUpdateRestricted = nodeUpdateRestricted;
}
public static DataTransferSettings loadSettings(DBRRunnableWithResult<DataTransferSettings> loader) throws DBException {
// Wait 1 minute maximum
RuntimeUtils.runTask(loader, "Load data transfer settings", 60000, false);
......
......@@ -136,4 +136,10 @@ public class DBTaskUtils {
}
}
public static boolean isTaskExists(DBTTask task) {
if (task == null) {
return false;
}
return task.getProject().getTaskManager().getTaskById(task.getId()) != null;
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册