From e1d2bc33b2b0918fe1ff6591939b8c8f9bd24117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 2 Nov 2021 15:39:30 +0100 Subject: [PATCH] Differentiate column label and internal name. --- .../CalibrationListLabelProvider.java | 4 +- .../CalibrationListTableComparator.java | 6 +- .../impl/RetentionIndexCalculator.java | 8 +-- .../amdiscalri/io/CalibrationFileWriter.java | 5 +- .../xxd/calculator/io/AMDISConverter.java | 7 ++- .../xxd/calculator/io/MassLibConverter.java | 4 +- .../provider/IdentifierListLabelProvider.java | 2 +- .../IdentifierListTableComparator.java | 4 +- .../file/model/IdentifierFileReader.java | 10 ++-- .../ColumnExtractorFieldEditor.java | 12 +++- .../ColumExtractorEditingSupport.java | 13 +++-- .../columns/AbstractSeparationColumn.java | 55 +++++++++++++++---- .../model/columns/ISeparationColumn.java | 6 +- .../model/columns/SeparationColumn.java | 6 +- .../columns/SeparationColumnFactory.java | 44 ++++++--------- .../columns/SeparationColumnIndices.java | 2 +- .../model/columns/SeparationColumnType.java | 53 ++++++++++++++++++ .../model/core/AbstractChromatogram.java | 3 +- .../ExtendedRetentionIndexListUI.java | 8 +-- .../swt/editors/ExtendedChromatogramUI.java | 4 +- .../internal/io/ChromatogramReader_1300.java | 4 +- .../internal/io/ChromatogramReader_1301.java | 2 +- .../internal/io/ChromatogramReader_1400.java | 2 +- .../internal/io/ChromatogramWriter_1300.java | 2 +- .../internal/io/ChromatogramWriter_1301.java | 2 +- .../internal/io/ChromatogramWriter_1400.java | 2 +- .../internal/io/ChromatogramReader_1300.java | 4 +- .../internal/io/ChromatogramReader_1301.java | 2 +- .../internal/io/ChromatogramReader_1400.java | 2 +- .../internal/io/ChromatogramWriter_1300.java | 2 +- .../internal/io/ChromatogramWriter_1301.java | 2 +- .../internal/io/ChromatogramWriter_1400.java | 2 +- .../internal/io/ChromatogramReader_1300.java | 2 +- .../internal/io/ChromatogramReader_1301.java | 2 +- .../internal/io/ChromatogramReader_1400.java | 2 +- .../internal/io/ChromatogramWriter_1300.java | 2 +- .../internal/io/ChromatogramWriter_1301.java | 2 +- .../internal/io/ChromatogramWriter_1400.java | 2 +- 38 files changed, 194 insertions(+), 102 deletions(-) create mode 100644 chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnType.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri.ui/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/ui/internal/provider/CalibrationListLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri.ui/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/ui/internal/provider/CalibrationListLabelProvider.java index 5719ca3d75..d574c812ae 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri.ui/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/ui/internal/provider/CalibrationListLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri.ui/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/ui/internal/provider/CalibrationListLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -50,7 +50,7 @@ public String getColumnText(Object element, int columnIndex) { // switch(columnIndex) { case 0: - text = calibrationFile.getSeparationColumnIndices().getSeparationColumn().getName(); + text = calibrationFile.getSeparationColumnIndices().getSeparationColumn().getValue(); break; case 1: text = calibrationFile.getFile().getName(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri.ui/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/ui/internal/provider/CalibrationListTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri.ui/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/ui/internal/provider/CalibrationListTableComparator.java index 4eddaf1a3a..4c00bba8e8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri.ui/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/ui/internal/provider/CalibrationListTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri.ui/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/ui/internal/provider/CalibrationListTableComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -26,8 +26,8 @@ public int compare(Viewer viewer, Object e1, Object e2) { // CalibrationFile calibrationFile1 = (CalibrationFile)e1; CalibrationFile calibrationFile2 = (CalibrationFile)e2; - String column1 = calibrationFile1.getSeparationColumnIndices().getSeparationColumn().getName(); - String column2 = calibrationFile2.getSeparationColumnIndices().getSeparationColumn().getName(); + String column1 = calibrationFile1.getSeparationColumnIndices().getSeparationColumn().getValue(); + String column2 = calibrationFile2.getSeparationColumnIndices().getSeparationColumn().getValue(); // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/impl/RetentionIndexCalculator.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/impl/RetentionIndexCalculator.java index 96028b7e11..ddd487e830 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/impl/RetentionIndexCalculator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/impl/RetentionIndexCalculator.java @@ -27,7 +27,7 @@ import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; import org.eclipse.chemclipse.model.columns.ISeparationColumn; import org.eclipse.chemclipse.model.columns.ISeparationColumnIndices; -import org.eclipse.chemclipse.model.columns.SeparationColumnFactory; +import org.eclipse.chemclipse.model.columns.SeparationColumnType; import org.eclipse.chemclipse.model.core.IChromatogram; import org.eclipse.chemclipse.model.core.IPeak; import org.eclipse.chemclipse.model.core.IScan; @@ -276,15 +276,15 @@ private ISeparationColumnIndices getFileIndices(IChromatogramSelection chromatog File file = new File(retentionIndexFile); ISeparationColumnIndices separationColumnIndices = calibrationFileReader.parse(file); ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - calibrationMap.put(separationColumn.getName(), separationColumnIndices); + calibrationMap.put(separationColumn.getValue(), separationColumnIndices); } /* * Run the calculation. */ - String columnName = chromatogramSelection.getChromatogram().getSeparationColumnIndices().getSeparationColumn().getName(); + String columnName = chromatogramSelection.getChromatogram().getSeparationColumnIndices().getSeparationColumn().getValue(); ISeparationColumnIndices separationColumnIndices = calibrationMap.get(columnName); if(separationColumnIndices == null && calculatorSettings.isUseDefaultColumn()) { - separationColumnIndices = calibrationMap.get(SeparationColumnFactory.TYPE_DEFAULT); + separationColumnIndices = calibrationMap.get(SeparationColumnType.DEFAULT.value()); } // return separationColumnIndices; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/io/CalibrationFileWriter.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/io/CalibrationFileWriter.java index 66e5cfc32a..0d6e35b0dd 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/io/CalibrationFileWriter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.amdiscalri/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/supplier/amdiscalri/io/CalibrationFileWriter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016, 2018 Lablicate GmbH. + * Copyright (c) 2016, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -30,6 +30,7 @@ public class CalibrationFileWriter { private DecimalFormat decimalFormat; public CalibrationFileWriter() { + decimalFormat = ValueFormat.getDecimalFormatEnglish(); } @@ -44,7 +45,7 @@ public void write(File file, ISeparationColumnIndices separationColumnIndices) { */ ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); if(separationColumn != null) { - printWriter.println(IColumnFormat.COLUMN_NAME + IColumnFormat.HEADER_VALUE_DELIMITER + separationColumn.getName()); + printWriter.println(IColumnFormat.COLUMN_NAME + IColumnFormat.HEADER_VALUE_DELIMITER + separationColumn.getValue()); printWriter.println(IColumnFormat.COLUMN_LENGTH + IColumnFormat.HEADER_VALUE_DELIMITER + separationColumn.getLength()); printWriter.println(IColumnFormat.COLUMN_DIAMETER + IColumnFormat.HEADER_VALUE_DELIMITER + separationColumn.getDiameter()); printWriter.println(IColumnFormat.COLUMN_PHASE + IColumnFormat.HEADER_VALUE_DELIMITER + separationColumn.getPhase()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/io/AMDISConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/io/AMDISConverter.java index ab38b600d2..e6029814fc 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/io/AMDISConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/io/AMDISConverter.java @@ -23,8 +23,8 @@ import org.eclipse.chemclipse.model.columns.ISeparationColumnIndices; import org.eclipse.chemclipse.model.columns.RetentionIndexEntry; import org.eclipse.chemclipse.model.columns.SeparationColumn; -import org.eclipse.chemclipse.model.columns.SeparationColumnFactory; import org.eclipse.chemclipse.model.columns.SeparationColumnIndices; +import org.eclipse.chemclipse.model.columns.SeparationColumnType; import org.eclipse.chemclipse.model.core.AbstractChromatogram; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; @@ -54,7 +54,8 @@ public ISeparationColumnIndices parse(File file) { /* * Column Specification */ - String name = SeparationColumnFactory.TYPE_DEFAULT; + String name = SeparationColumnType.DEFAULT.name(); + String value = SeparationColumnType.DEFAULT.value(); String length = ""; String diameter = ""; String phase = ""; @@ -116,7 +117,7 @@ public ISeparationColumnIndices parse(File file) { /* * Create and set the column. */ - ISeparationColumn separationColumn = new SeparationColumn(name, length, diameter, phase); + ISeparationColumn separationColumn = new SeparationColumn(name, value, length, diameter, phase); separationColumnIndices.setSeparationColumn(separationColumn); } catch(IOException e) { logger.error(e); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/io/MassLibConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/io/MassLibConverter.java index c6a546295f..eb52949214 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/io/MassLibConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.calculator/src/org/eclipse/chemclipse/chromatogram/xxd/calculator/io/MassLibConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -110,7 +110,7 @@ public IProcessingInfo parseRetentionIndices(File file while(matcherColumn.find()) { String length = matcherColumn.group(3).trim(); String name = matcherColumn.group(5).trim(); - separationColumn.setName(name); + separationColumn.setValue(name); separationColumn.setLength(length); } /* diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file.ui/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/ui/internal/provider/IdentifierListLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file.ui/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/ui/internal/provider/IdentifierListLabelProvider.java index d41a4e4d86..4f732b1514 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file.ui/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/ui/internal/provider/IdentifierListLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file.ui/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/ui/internal/provider/IdentifierListLabelProvider.java @@ -48,7 +48,7 @@ public String getColumnText(Object element, int columnIndex) { IdentifierFile identifierFile = (IdentifierFile)element; switch(columnIndex) { case 0: - text = identifierFile.getSeparationColumn().getName(); + text = identifierFile.getSeparationColumn().getValue(); break; case 1: text = identifierFile.getFile().getName(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file.ui/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/ui/internal/provider/IdentifierListTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file.ui/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/ui/internal/provider/IdentifierListTableComparator.java index 78619f9b3d..1d14e84322 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file.ui/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/ui/internal/provider/IdentifierListTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file.ui/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/ui/internal/provider/IdentifierListTableComparator.java @@ -26,8 +26,8 @@ public int compare(Viewer viewer, Object e1, Object e2) { // IdentifierFile identifierFile1 = (IdentifierFile)e1; IdentifierFile identifierFile2 = (IdentifierFile)e2; - String column1 = identifierFile1.getSeparationColumn().getName(); - String column2 = identifierFile2.getSeparationColumn().getName(); + String column1 = identifierFile1.getSeparationColumn().getValue(); + String column2 = identifierFile2.getSeparationColumn().getValue(); // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/model/IdentifierFileReader.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/model/IdentifierFileReader.java index ea729a50d2..eaa778da47 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/model/IdentifierFileReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/model/IdentifierFileReader.java @@ -21,6 +21,7 @@ import org.eclipse.chemclipse.model.columns.ISeparationColumn; import org.eclipse.chemclipse.model.columns.SeparationColumn; import org.eclipse.chemclipse.model.columns.SeparationColumnFactory; +import org.eclipse.chemclipse.model.columns.SeparationColumnType; public class IdentifierFileReader { @@ -32,7 +33,7 @@ public ISeparationColumn parse(File file) { * Extract the separation column if the library contains the info, e.g. in a *.msl or *.msp file. * Otherwise, create a default column. */ - ISeparationColumn separationColumn = SeparationColumnFactory.getSeparationColumn(SeparationColumnFactory.TYPE_DEFAULT); + ISeparationColumn separationColumn = SeparationColumnFactory.getSeparationColumn(SeparationColumnType.DEFAULT); if(isSeparationColumnFile(file)) { separationColumn = extractSeparationColumn(file); } @@ -46,13 +47,14 @@ private ISeparationColumn extractSeparationColumn(File file) { * Restrict to *.msl and *.msp files at the moment. * Otherwise use default. */ - ISeparationColumn separationColumn = SeparationColumnFactory.getSeparationColumn(SeparationColumnFactory.TYPE_DEFAULT); + ISeparationColumn separationColumn = SeparationColumnFactory.getSeparationColumn(SeparationColumnType.DEFAULT); // try (BufferedReader bufferedReader = new BufferedReader(new FileReader(file))) { /* * Column Specification */ - String name = SeparationColumnFactory.TYPE_DEFAULT; + String name = SeparationColumnType.DEFAULT.name(); + String value = SeparationColumnType.DEFAULT.value(); String length = ""; String diameter = ""; String phase = ""; @@ -79,7 +81,7 @@ private ISeparationColumn extractSeparationColumn(File file) { /* * Create the column. */ - separationColumn = new SeparationColumn(name, length, diameter, phase); + separationColumn = new SeparationColumn(name, value, length, diameter, phase); } catch(IOException e) { logger.error(e); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.converter.ui/src/org/eclipse/chemclipse/converter/ui/fieldeditors/ColumnExtractorFieldEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.converter.ui/src/org/eclipse/chemclipse/converter/ui/fieldeditors/ColumnExtractorFieldEditor.java index 29d1330b32..e31a940cf3 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.converter.ui/src/org/eclipse/chemclipse/converter/ui/fieldeditors/ColumnExtractorFieldEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.converter.ui/src/org/eclipse/chemclipse/converter/ui/fieldeditors/ColumnExtractorFieldEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Lablicate GmbH. + * Copyright (c) 2019, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.converter.model.SeparationColumnMapping; import org.eclipse.chemclipse.converter.preferences.PreferenceSupplier; import org.eclipse.chemclipse.converter.ui.swt.ColumExtractorTable; -import org.eclipse.chemclipse.model.columns.SeparationColumnFactory; +import org.eclipse.chemclipse.model.columns.SeparationColumnType; import org.eclipse.chemclipse.support.ui.events.IKeyEventProcessor; import org.eclipse.chemclipse.support.ui.menu.ITableMenuEntry; import org.eclipse.chemclipse.support.ui.swt.ExtendedTableViewer; @@ -74,6 +74,7 @@ public class ColumnExtractorFieldEditor extends FieldEditor { private SeparationColumnMapping mapping = new SeparationColumnMapping(); public ColumnExtractorFieldEditor(String name, String labelText, Composite parent) { + init(name, labelText); createControl(parent); } @@ -179,6 +180,7 @@ private Button createButtonAdd(Composite parent) { button.setToolTipText(ADD_TOOLTIP); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { InputDialog dialog = new InputDialog(button.getShell(), DIALOG_TITLE, MESSAGE_ADD, "DB5", new IInputValidator() { @@ -204,7 +206,7 @@ public String isValid(String newText) { String item = dialog.getValue().trim(); if(!"".equals(item)) { if(!mapping.keySet().contains(item)) { - mapping.put(item, SeparationColumnFactory.TYPE_DEFAULT); + mapping.put(item, SeparationColumnType.DEFAULT.value()); setTableViewerInput(); } } @@ -222,6 +224,7 @@ private Button createButtonRemove(Composite parent) { button.setToolTipText(REMOVE_TOOLTIP); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { deleteItems(e.display.getActiveShell()); @@ -238,6 +241,7 @@ private Button createButtonRemoveAll(Composite parent) { button.setToolTipText(REMOVE_ALL_TOOLTIP); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if(MessageDialog.openQuestion(button.getShell(), DIALOG_TITLE, MESSAGE_REMOVE_ALL)) { @@ -257,6 +261,7 @@ private Button createButtonImport(Composite parent) { button.setToolTipText(IMPORT_TITLE); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { FileDialog fileDialog = new FileDialog(e.widget.getDisplay().getActiveShell(), SWT.READ_ONLY); @@ -284,6 +289,7 @@ private Button createButtonExport(Composite parent) { button.setToolTipText(EXPORT_TITLE); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { FileDialog fileDialog = new FileDialog(e.widget.getDisplay().getActiveShell(), SWT.SAVE); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.converter.ui/src/org/eclipse/chemclipse/converter/ui/internal/provider/ColumExtractorEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.converter.ui/src/org/eclipse/chemclipse/converter/ui/internal/provider/ColumExtractorEditingSupport.java index 7f2ea9a1b7..e716a17d89 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.converter.ui/src/org/eclipse/chemclipse/converter/ui/internal/provider/ColumExtractorEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.converter.ui/src/org/eclipse/chemclipse/converter/ui/internal/provider/ColumExtractorEditingSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Lablicate GmbH. + * Copyright (c) 2019, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -13,7 +13,7 @@ import java.util.Map; -import org.eclipse.chemclipse.model.columns.SeparationColumnFactory; +import org.eclipse.chemclipse.model.columns.SeparationColumnType; import org.eclipse.chemclipse.support.ui.swt.ExtendedTableViewer; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ComboBoxCellEditor; @@ -27,13 +27,14 @@ public class ColumExtractorEditingSupport extends EditingSupport { private ExtendedTableViewer tableViewer; private String column; private static final String[] ITEMS = new String[]{ // - SeparationColumnFactory.TYPE_DEFAULT, // - SeparationColumnFactory.TYPE_APOLAR, // - SeparationColumnFactory.TYPE_SEMI_POLAR, // - SeparationColumnFactory.TYPE_POLAR // + SeparationColumnType.DEFAULT.value(), // + SeparationColumnType.APOLAR.value(), // + SeparationColumnType.SEMI_POLAR.value(), // + SeparationColumnType.POLAR.value() // }; public ColumExtractorEditingSupport(ExtendedTableViewer tableViewer, String column) { + super(tableViewer); this.column = column; if(column.equals(ColumExtractorLabelProvider.SEPRATION_COLUMN)) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/AbstractSeparationColumn.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/AbstractSeparationColumn.java index 159779f918..d65f124a11 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/AbstractSeparationColumn.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/AbstractSeparationColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -13,11 +13,24 @@ public abstract class AbstractSeparationColumn implements ISeparationColumn { + private String value = ""; private String name = ""; private String length = ""; private String diameter = ""; private String phase = ""; + @Override + public String getValue() { + + return value; + } + + @Override + public void setValue(String value) { + + this.value = value; + } + @Override public String getName() { @@ -87,33 +100,51 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if(this == obj) + if(this == obj) { return true; - if(obj == null) + } + if(obj == null) { return false; - if(getClass() != obj.getClass()) + } + if(getClass() != obj.getClass()) { return false; + } AbstractSeparationColumn other = (AbstractSeparationColumn)obj; if(diameter == null) { - if(other.diameter != null) + if(other.diameter != null) { return false; - } else if(!diameter.equals(other.diameter)) + } + } else if(!diameter.equals(other.diameter)) { return false; + } if(length == null) { - if(other.length != null) + if(other.length != null) { return false; - } else if(!length.equals(other.length)) + } + } else if(!length.equals(other.length)) { return false; + } if(name == null) { - if(other.name != null) + if(other.name != null) { + return false; + } + } else if(!name.equals(other.name)) { + return false; + } + if(value == null) { + if(other.value != null) { return false; - } else if(!name.equals(other.name)) + } + } else if(!value.equals(other.value)) { return false; + } if(phase == null) { - if(other.phase != null) + if(other.phase != null) { return false; - } else if(!phase.equals(other.phase)) + } + } else if(!phase.equals(other.phase)) { return false; + } return true; } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/ISeparationColumn.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/ISeparationColumn.java index 0bcff19f71..8dd12335c1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/ISeparationColumn.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/ISeparationColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -17,6 +17,10 @@ public interface ISeparationColumn { void setName(String name); + String getValue(); + + void setValue(String value); + String getLength(); void setLength(String length); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumn.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumn.java index c0f74caa2b..0c3247f04e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumn.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -13,8 +13,10 @@ public class SeparationColumn extends AbstractSeparationColumn implements ISeparationColumn { - public SeparationColumn(String name, String length, String diameter, String phase) { + public SeparationColumn(String name, String value, String length, String diameter, String phase) { + setName(name); + setValue(value); setLength(length); setDiameter(diameter); setPhase(phase); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnFactory.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnFactory.java index 32dcfd4e82..b6ae49b8b1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnFactory.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnFactory.java @@ -16,45 +16,35 @@ public class SeparationColumnFactory { - public static final String TYPE_DEFAULT = "Default"; - public static final String TYPE_POLAR = "Polar"; - public static final String TYPE_APOLAR = "Nonpolar"; - public static final String TYPE_SEMI_POLAR = "Semipolar"; - /* - * Specific columns might be removed soon as basic types. - * Mappings shall be added to group specific columns into - * one of the three above classes. - */ - public static final String TYPE_DB1 = "DB-1"; - public static final String TYPE_DB5 = "DB-5"; - public static final String TYPE_DB1701 = "DB-1701"; - public static final String TYPE_ZB1 = "ZB-1"; - public static final String TYPE_WAX_PLUS = "WAX+"; - public static List getSeparationColumns() { List separationColumns = new ArrayList<>(); - separationColumns.add(getSeparationColumn(TYPE_DEFAULT)); - separationColumns.add(getSeparationColumn(TYPE_POLAR)); - separationColumns.add(getSeparationColumn(TYPE_APOLAR)); - separationColumns.add(getSeparationColumn(TYPE_SEMI_POLAR)); - separationColumns.add(getSeparationColumn(TYPE_DB1)); - separationColumns.add(getSeparationColumn(TYPE_DB5)); - separationColumns.add(getSeparationColumn(TYPE_DB1701)); - separationColumns.add(getSeparationColumn(TYPE_ZB1)); - separationColumns.add(getSeparationColumn(TYPE_WAX_PLUS)); + separationColumns.add(getSeparationColumn(SeparationColumnType.DEFAULT)); + separationColumns.add(getSeparationColumn(SeparationColumnType.POLAR)); + separationColumns.add(getSeparationColumn(SeparationColumnType.APOLAR)); + separationColumns.add(getSeparationColumn(SeparationColumnType.SEMI_POLAR)); + separationColumns.add(getSeparationColumn(SeparationColumnType.DB1)); + separationColumns.add(getSeparationColumn(SeparationColumnType.DB5)); + separationColumns.add(getSeparationColumn(SeparationColumnType.DB1701)); + separationColumns.add(getSeparationColumn(SeparationColumnType.ZB1)); + separationColumns.add(getSeparationColumn(SeparationColumnType.WAX_PLUS)); return separationColumns; } public static ISeparationColumn getSeparationColumn(String name) { - return new SeparationColumn(name, "", "", ""); + return new SeparationColumn(name, "", "", "", ""); + } + + public static ISeparationColumn getSeparationColumn(SeparationColumnType type) { + + return new SeparationColumn(type.name(), type.value(), "", "", ""); } - public static ISeparationColumnIndices getSeparationColumnIndices(String name) { + public static ISeparationColumnIndices getSeparationColumnIndices(SeparationColumnType type) { ISeparationColumnIndices separationColumnIndices = new SeparationColumnIndices(); - separationColumnIndices.getSeparationColumn().setName(name); + separationColumnIndices.getSeparationColumn().setValue(type.value()); return separationColumnIndices; } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnIndices.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnIndices.java index b40a612a09..d5eb1b6f84 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnIndices.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnIndices.java @@ -16,7 +16,7 @@ public class SeparationColumnIndices extends TreeMap implements ISeparationColumnIndices { private static final long serialVersionUID = -104734015201641034L; - private ISeparationColumn separationColumn = SeparationColumnFactory.getSeparationColumn(SeparationColumnFactory.TYPE_DEFAULT); + private ISeparationColumn separationColumn = SeparationColumnFactory.getSeparationColumn(SeparationColumnType.DEFAULT); @Override public ISeparationColumn getSeparationColumn() { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnType.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnType.java new file mode 100644 index 0000000000..113cda9437 --- /dev/null +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/columns/SeparationColumnType.java @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2018, 2021 Lablicate GmbH. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Dr. Philip Wenig - initial API and implementation + * Matthias Mailänder - added labels + *******************************************************************************/ +package org.eclipse.chemclipse.model.columns; + +import org.eclipse.chemclipse.support.text.ILabel; + +public enum SeparationColumnType implements ILabel { + + DEFAULT("Default", "DEFAULT"), // + POLAR("Polar", "POLAR"), // + APOLAR("Nonpolar", "APOLAR"), // + SEMI_POLAR("SEMI-POLAR", "Semipolar"), + /* + * Specific columns might be removed soon as basic types. + * Mappings shall be added to group specific columns into + * one of the three above classes. + */ + DB1("DB-1", "DB1"), // + DB5("DB-5", "DB5"), // + DB1701("DB-1701", "DB1701"), // + ZB1("ZB-1", "ZB1"), // + WAX_PLUS("WAX+", "WAX+"); + + private String label = ""; + private String value = ""; + + private SeparationColumnType(String label, String value) { + + this.label = label; + this.value = value; + } + + @Override + public String label() { + + return label; + } + + public String value() { + + return value; + } +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/core/AbstractChromatogram.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/core/AbstractChromatogram.java index b281bf1c1d..125da0e6d5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/core/AbstractChromatogram.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/core/AbstractChromatogram.java @@ -37,6 +37,7 @@ import org.eclipse.chemclipse.model.baseline.IChromatogramBaseline; import org.eclipse.chemclipse.model.columns.ISeparationColumnIndices; import org.eclipse.chemclipse.model.columns.SeparationColumnFactory; +import org.eclipse.chemclipse.model.columns.SeparationColumnType; import org.eclipse.chemclipse.model.exceptions.ChromatogramIsNullException; import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.implementation.TripleQuadMethod; @@ -138,7 +139,7 @@ public AbstractChromatogram() { chromatogramIntegrationEntries = new ArrayList(); backgroundIntegrationEntries = new ArrayList(); method = new TripleQuadMethod(); - separationColumnIndices = SeparationColumnFactory.getSeparationColumnIndices(SeparationColumnFactory.TYPE_DEFAULT); + separationColumnIndices = SeparationColumnFactory.getSeparationColumnIndices(SeparationColumnType.DEFAULT); } @Override diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/ExtendedRetentionIndexListUI.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/ExtendedRetentionIndexListUI.java index 6cca9fcbf9..ec289876dd 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/ExtendedRetentionIndexListUI.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/ExtendedRetentionIndexListUI.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016, 2020 Lablicate GmbH. + * Copyright (c) 2016, 2021 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -101,7 +101,7 @@ public RetentionIndexTableViewerUI getRetentionIndexTableViewerUI() { private void setSeparationColumnSelection(ISeparationColumn separationColumn) { if(separationColumn != null) { - String name = separationColumn.getName(); + String name = separationColumn.getValue(); int index = -1; exitloop: for(String item : comboViewerSeparationColumn.getCombo().getItems()) { @@ -197,7 +197,7 @@ public String getText(Object element) { if(element instanceof ISeparationColumn) { ISeparationColumn separationColumn = (ISeparationColumn)element; - return separationColumn.getName(); + return separationColumn.getValue(); } return null; } @@ -391,7 +391,7 @@ private void updateLabel() { StringBuilder builder = new StringBuilder(); if(object instanceof ISeparationColumn) { ISeparationColumn separationColumn = (ISeparationColumn)object; - builder.append(separationColumn.getName()); + builder.append(separationColumn.getValue()); builder.append(" "); builder.append(separationColumn.getLength()); builder.append(" "); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/editors/ExtendedChromatogramUI.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/editors/ExtendedChromatogramUI.java index fe74368222..8eee90a706 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/editors/ExtendedChromatogramUI.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/editors/ExtendedChromatogramUI.java @@ -1051,7 +1051,7 @@ public String getText(Object element) { if(element instanceof ISeparationColumn) { ISeparationColumn separationColumn = (ISeparationColumn)element; - return separationColumn.getName(); + return separationColumn.getValue(); } return null; } @@ -1397,7 +1397,7 @@ private void setSeparationColumnSelection() { if(chromatogramSelection != null) { ISeparationColumn separationColumn = chromatogramSelection.getChromatogram().getSeparationColumnIndices().getSeparationColumn(); if(separationColumn != null) { - String name = separationColumn.getName(); + String name = separationColumn.getValue(); int index = -1; exitloop: for(String item : comboViewerSeparationColumn.getCombo().getItems()) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java index 5525744ca7..0253576b14 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2019 Lablicate GmbH. + * Copyright (c) 2018, 2021 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -575,7 +575,7 @@ private void readSeparationColumn(DataInputStream dataInputStream, boolean close } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - separationColumn.setName(readString(dataInputStream)); + separationColumn.setValue(readString(dataInputStream)); separationColumn.setLength(readString(dataInputStream)); separationColumn.setDiameter(readString(dataInputStream)); separationColumn.setPhase(readString(dataInputStream)); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java index d119585b37..3ad90af94a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java @@ -581,7 +581,7 @@ private void readSeparationColumn(DataInputStream dataInputStream, boolean close } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - separationColumn.setName(readString(dataInputStream)); + separationColumn.setValue(readString(dataInputStream)); separationColumn.setLength(readString(dataInputStream)); separationColumn.setDiameter(readString(dataInputStream)); separationColumn.setPhase(readString(dataInputStream)); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java index 15af315cba..fee10da64f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java @@ -641,7 +641,7 @@ private void readSeparationColumn(DataInputStream dataInputStream, boolean close } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - separationColumn.setName(readString(dataInputStream)); + separationColumn.setValue(readString(dataInputStream)); separationColumn.setLength(readString(dataInputStream)); separationColumn.setDiameter(readString(dataInputStream)); separationColumn.setPhase(readString(dataInputStream)); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java index 7b278b4046..e08fc41079 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java @@ -546,7 +546,7 @@ private void writeSeparationColumn(ZipOutputStream zipOutputStream, String direc } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - writeString(dataOutputStream, separationColumn.getName()); + writeString(dataOutputStream, separationColumn.getValue()); writeString(dataOutputStream, separationColumn.getLength()); writeString(dataOutputStream, separationColumn.getDiameter()); writeString(dataOutputStream, separationColumn.getPhase()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java index b936288b1c..f3a30dc909 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java @@ -532,7 +532,7 @@ private void writeSeparationColumn(ZipOutputStream zipOutputStream, String direc } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - writeString(dataOutputStream, separationColumn.getName()); + writeString(dataOutputStream, separationColumn.getValue()); writeString(dataOutputStream, separationColumn.getLength()); writeString(dataOutputStream, separationColumn.getDiameter()); writeString(dataOutputStream, separationColumn.getPhase()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java index 595f7b9422..24b8a3ce9f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java @@ -571,7 +571,7 @@ private void writeSeparationColumn(ZipOutputStream zipOutputStream, String direc } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - writeString(dataOutputStream, separationColumn.getName()); + writeString(dataOutputStream, separationColumn.getValue()); writeString(dataOutputStream, separationColumn.getLength()); writeString(dataOutputStream, separationColumn.getDiameter()); writeString(dataOutputStream, separationColumn.getPhase()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java index 11ab501ca4..846e96e6a3 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2019 Lablicate GmbH. + * Copyright (c) 2018, 2021 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -885,7 +885,7 @@ private void readSeparationColumn(DataInputStream dataInputStream, boolean close } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - separationColumn.setName(readString(dataInputStream)); + separationColumn.setValue(readString(dataInputStream)); separationColumn.setLength(readString(dataInputStream)); separationColumn.setDiameter(readString(dataInputStream)); separationColumn.setPhase(readString(dataInputStream)); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java index 86f3e0328a..1ea41be571 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java @@ -892,7 +892,7 @@ private void readSeparationColumn(DataInputStream dataInputStream, boolean close } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - separationColumn.setName(readString(dataInputStream)); + separationColumn.setValue(readString(dataInputStream)); separationColumn.setLength(readString(dataInputStream)); separationColumn.setDiameter(readString(dataInputStream)); separationColumn.setPhase(readString(dataInputStream)); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java index c162eeb171..0cf34a4bf2 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java @@ -954,7 +954,7 @@ private void readSeparationColumn(DataInputStream dataInputStream, boolean close } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - separationColumn.setName(readString(dataInputStream)); + separationColumn.setValue(readString(dataInputStream)); separationColumn.setLength(readString(dataInputStream)); separationColumn.setDiameter(readString(dataInputStream)); separationColumn.setPhase(readString(dataInputStream)); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java index 09be952019..317ba22d91 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java @@ -664,7 +664,7 @@ private void writeSeparationColumn(ZipOutputStream zipOutputStream, String direc } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - writeString(dataOutputStream, separationColumn.getName()); + writeString(dataOutputStream, separationColumn.getValue()); writeString(dataOutputStream, separationColumn.getLength()); writeString(dataOutputStream, separationColumn.getDiameter()); writeString(dataOutputStream, separationColumn.getPhase()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java index 2bdf154f37..43b2019adb 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java @@ -665,7 +665,7 @@ private void writeSeparationColumn(ZipOutputStream zipOutputStream, String direc } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - writeString(dataOutputStream, separationColumn.getName()); + writeString(dataOutputStream, separationColumn.getValue()); writeString(dataOutputStream, separationColumn.getLength()); writeString(dataOutputStream, separationColumn.getDiameter()); writeString(dataOutputStream, separationColumn.getPhase()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java index 81d4fd4de8..7b098c530a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java @@ -704,7 +704,7 @@ private void writeSeparationColumn(ZipOutputStream zipOutputStream, String direc } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - writeString(dataOutputStream, separationColumn.getName()); + writeString(dataOutputStream, separationColumn.getValue()); writeString(dataOutputStream, separationColumn.getLength()); writeString(dataOutputStream, separationColumn.getDiameter()); writeString(dataOutputStream, separationColumn.getPhase()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java index d3730e8604..a14deab327 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java @@ -710,7 +710,7 @@ private void readSeparationColumn(DataInputStream dataInputStream, boolean close } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - separationColumn.setName(readString(dataInputStream)); + separationColumn.setValue(readString(dataInputStream)); separationColumn.setLength(readString(dataInputStream)); separationColumn.setDiameter(readString(dataInputStream)); separationColumn.setPhase(readString(dataInputStream)); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java index 8688dabc18..a191b13c7c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java @@ -716,7 +716,7 @@ private void readSeparationColumn(DataInputStream dataInputStream, boolean close } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - separationColumn.setName(readString(dataInputStream)); + separationColumn.setValue(readString(dataInputStream)); separationColumn.setLength(readString(dataInputStream)); separationColumn.setDiameter(readString(dataInputStream)); separationColumn.setPhase(readString(dataInputStream)); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java index b31971ffc5..db14197770 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java @@ -780,7 +780,7 @@ private void readSeparationColumn(DataInputStream dataInputStream, boolean close } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - separationColumn.setName(readString(dataInputStream)); + separationColumn.setValue(readString(dataInputStream)); separationColumn.setLength(readString(dataInputStream)); separationColumn.setDiameter(readString(dataInputStream)); separationColumn.setPhase(readString(dataInputStream)); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java index 5e2b0fe61a..a82c50c56e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java @@ -578,7 +578,7 @@ private void writeSeparationColumn(ZipOutputStream zipOutputStream, String direc } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - writeString(dataOutputStream, separationColumn.getName()); + writeString(dataOutputStream, separationColumn.getValue()); writeString(dataOutputStream, separationColumn.getLength()); writeString(dataOutputStream, separationColumn.getDiameter()); writeString(dataOutputStream, separationColumn.getPhase()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java index 234108fd13..4249fc7c6e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java @@ -564,7 +564,7 @@ private void writeSeparationColumn(ZipOutputStream zipOutputStream, String direc } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - writeString(dataOutputStream, separationColumn.getName()); + writeString(dataOutputStream, separationColumn.getValue()); writeString(dataOutputStream, separationColumn.getLength()); writeString(dataOutputStream, separationColumn.getDiameter()); writeString(dataOutputStream, separationColumn.getPhase()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java index b4c0356cfa..8a8b670919 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java @@ -603,7 +603,7 @@ private void writeSeparationColumn(ZipOutputStream zipOutputStream, String direc } // ISeparationColumn separationColumn = separationColumnIndices.getSeparationColumn(); - writeString(dataOutputStream, separationColumn.getName()); + writeString(dataOutputStream, separationColumn.getValue()); writeString(dataOutputStream, separationColumn.getLength()); writeString(dataOutputStream, separationColumn.getDiameter()); writeString(dataOutputStream, separationColumn.getPhase());