mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 05:15:43 +02:00
Code Issues Wiki Activity

Bug 574057: Prevent null set of selected data volumes

Browse source 
Prefer an empty set instead.

Change-Id: I6b13f78ffbbbe0cbac2b69ad50abdc90f15fed66
This commit is contained in:
Jonah Graham 2021-06-07 11:39:38 -04:00
parent 087e0e4a3e
commit 48ff7a223d
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java
View file

@ -911,7 +911,7 @@ public class ContainerPropertyTab extends AbstractCBuildPropertyTab
} }
imageCombo.setText(""); //$NON-NLS-1$ imageCombo.setText(""); //$NON-NLS-1$
model.setDataVolumes(null); model.setDataVolumes(null);
model.setSelectedDataVolumes(null); model.setSelectedDataVolumes(new HashSet<>());
enableButton.setSelection(false); enableButton.setSelection(false);
setControlsEnabled(false); setControlsEnabled(false);
} }

6
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java
View file

@ -21,6 +21,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.runtime.Assert;
import org.eclipse.linuxtools.docker.core.DockerException; import org.eclipse.linuxtools.docker.core.DockerException;
import org.eclipse.linuxtools.docker.core.IDockerConnection; import org.eclipse.linuxtools.docker.core.IDockerConnection;
import org.eclipse.linuxtools.docker.core.IDockerImage; import org.eclipse.linuxtools.docker.core.IDockerImage;
@ -129,7 +130,12 @@ public class ContainerPropertyVolumesModel extends BaseDatabindingModel {
return selectedDataVolumes; return selectedDataVolumes;
} }
/**
*
* @param selectedDataVolumes non-<code>null</code> set of selected data volumes
*/
public void setSelectedDataVolumes(final Set<DataVolumeModel> selectedDataVolumes) { public void setSelectedDataVolumes(final Set<DataVolumeModel> selectedDataVolumes) {
Assert.isNotNull(selectedDataVolumes);
firePropertyChange(SELECTED_DATA_VOLUMES, this.selectedDataVolumes, firePropertyChange(SELECTED_DATA_VOLUMES, this.selectedDataVolumes,
this.selectedDataVolumes = selectedDataVolumes); this.selectedDataVolumes = selectedDataVolumes);
} }