Merge pull request #2054 from Mailaender/set-data-type

Fix a crash when importing reference chromatograms

Author: eselmeister

chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/DataTypeDialog.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2023 Lablicate GmbH.
+ * Copyright (c) 2021, 2025 Lablicate GmbH.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -85,10 +85,10 @@ protected Control createDialogArea(Composite parent) {
 		layout.marginRight = 10;
 		layout.marginLeft = 10;
 		composite.setLayout(layout);
-		//
+
 		createLabel(composite);
 		comboViewer = createComboViewer(composite);
-		//
+
 		return composite;
 	}
 
@@ -111,11 +111,11 @@ public String getText(Object element) {
 				if(element instanceof DataType dataType) {
 					return dataType.name();
 				}
-				//
+
 				return null;
 			}
 		});
-		//
+
 		combo.setToolTipText("Select a data type.");
 		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.widthHint = 150;
@@ -126,12 +126,13 @@ public String getText(Object element) {
 			public void widgetSelected(SelectionEvent e) {
 
 				Object object = comboViewer.getStructuredSelection().getFirstElement();
-				if(object instanceof DataType) {
+				if(object instanceof DataType selectedDataType) {
+					dataType = selectedDataType;
 					validate();
 				}
 			}
 		});
-		//
+
 		comboViewer.setInput(dataTypes);
 		return comboViewer;
 	}

chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/ChromatogramReferencesUI.java

@@ -412,7 +412,7 @@ private void createButtonImportReferences(Composite parent) {
 			public void widgetSelected(SelectionEvent e) {
 
 				if(comboChromatograms != null) {
-					DataTypeDialog dataTypeDialog = new DataTypeDialog(e.display.getActiveShell(), new DataType[]{DataType.MSD, DataType.CSD, DataType.WSD});
+					DataTypeDialog dataTypeDialog = new DataTypeDialog(e.display.getActiveShell(), new DataType[]{DataType.MSD, DataType.CSD, DataType.WSD, DataType.VSD});
 					if(IDialogConstants.OK_ID == dataTypeDialog.open()) {
 						DataType dataType = dataTypeDialog.getDataType();
 						InputWizardSettings inputWizardSettings = InputWizardSettings.create(Activator.getDefault().getPreferenceStore(), dataType);