From 6b71ae9f4d2535297ce916836d4fbed025c5be8b Mon Sep 17 00:00:00 2001 From: Lukasz Mitusinski Date: Wed, 20 Jun 2018 11:04:30 +0200 Subject: [PATCH] #7548 - make delete button on sparkUI unavailable if default profile is selected --- .../com/twosigma/beakerx/widget/SparkUIForm.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUIForm.java b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUIForm.java index c22bdbc513..e4a5220464 100644 --- a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUIForm.java +++ b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUIForm.java @@ -55,6 +55,7 @@ public class SparkUIForm extends VBox { private SparkEngine sparkEngine; private SparkUI.OnSparkButtonAction onStartAction; private Button connectButton; + private Button removeButton; private Spinner spinner; private HBox spinnerPanel; private SparkUiDefaults sparkUiDefaults; @@ -128,11 +129,13 @@ private HBox createProfileManagement() { newButton.setDomClasses(asList("bx-button", "icon-add")); newButton.setTooltip(NEW_PROFILE_TOOLTIP); - Button removeButton = new Button(); + removeButton = new Button(); removeButton.registerOnClick((content, message) -> removeProfile()); removeButton.setDomClasses(asList("bx-button", "icon-close")); removeButton.setTooltip(REMOVE_PROFILE_TOOLTIP); + refreshElementsAvailability(); + return new HBox(Arrays.asList(profileDropdown, saveButton, newButton, removeButton)); } @@ -142,9 +145,7 @@ private void loadProfile() { return; } sparkUiDefaults.loadProfiles(); - Map profileData = - (Map) sparkUiDefaults - .getProfileByName(profileName); + Map profileData = sparkUiDefaults.getProfileByName(profileName); if (profileData.size() > 0) { this.masterURL.setValue(profileData.getOrDefault(SparkUI.SPARK_MASTER, SparkUI.SPARK_MASTER_DEFAULT)); this.executorCores.setValue(profileData.getOrDefault(SparkUI.SPARK_EXECUTOR_CORES, SparkUI.SPARK_EXECUTOR_CORES_DEFAULT)); @@ -157,6 +158,7 @@ private void loadProfile() { }); this.advancedOption.setConfiguration(advancedSettings); } + refreshElementsAvailability(); } private void saveProfile() { @@ -181,6 +183,7 @@ private void createProfileOK(HashMap hashMap, Message message) { profile.setValue(newProfileName.getValue()); saveProfile(); newProfileName.setValue(""); + refreshElementsAvailability(); } private void createProfileCancel(HashMap hashMap, Message message) { @@ -321,6 +324,11 @@ public void setAllToDisabled() { public void setAllToEnabled() { this.profileManagement.getChildren().stream().map(x -> (ValueWidget) x).forEach(x -> x.setDisabled(false)); this.advancedOption.setEnabledToAll(); + refreshElementsAvailability(); + } + + public void refreshElementsAvailability(){ + removeButton.setDisabled(this.profile.getValue().equals(DEFAULT_PROFILE)); } }