Skip to content

Commit f930508

Browse files
committed
Fix the Submission Content Panel data model import/export issue
The cluster selection targets were always the current submit model, which caused the submitted cluster was always the first one. Signed-off-by: Wei Zhang <[email protected]>
1 parent 875b1ba commit f930508

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionContentPanelConfigurable.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,17 @@ private void resetClusterDetailsToComboBoxModel(SparkSubmitModel destSubmitModel
156156
destSubmitModel.getClusterComboBoxModel().removeAllElements();
157157
clusterDetails.forEach(clusterDetail -> destSubmitModel.getClusterComboBoxModel().addElement(clusterDetail.getTitle()));
158158

159-
setSelectedClusterByName(destSubmitModel.getSubmissionParameter().getClusterName());
159+
setSelectedClusterByName(destSubmitModel, destSubmitModel.getSubmissionParameter().getClusterName());
160160
}
161161

162162
private void loadJobConfigMapFromPropertyFile(String propertyFilePath) {
163163
submitModel.getTableModel().loadJobConfigMapFromPropertyFile(propertyFilePath);
164164
}
165165

166-
private void setSelectedClusterByName(String clusterName) {
167-
final DefaultComboBoxModel<String> clusterComboBoxModel = submitModel.getClusterComboBoxModel();
166+
private void setSelectedClusterByName(SparkSubmitModel destSubmitModel, String clusterName) {
167+
final DefaultComboBoxModel<String> clusterComboBoxModel = destSubmitModel.getClusterComboBoxModel();
168168

169-
submitModel.getCachedClusterDetails().stream()
169+
destSubmitModel.getCachedClusterDetails().stream()
170170
.filter(clusterDetail -> clusterDetail.getName().equals(clusterName))
171171
.map(IClusterDetail::getTitle)
172172
.findFirst()
@@ -184,7 +184,7 @@ public void setData(@NotNull SparkSubmitModel data) {
184184

185185
submitModel.setSubmissionParameters(parameter);
186186

187-
setSelectedClusterByName(parameter.getClusterName());
187+
setSelectedClusterByName(submitModel, parameter.getClusterName());
188188

189189
if (parameter.isLocalArtifact()) {
190190
submissionPanel.getLocalArtifactRadioButton().setSelected(true);

0 commit comments

Comments
 (0)