From d7f93e958449e72e08200712dca4f430490de5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 6 Jul 2026 19:47:11 +0200 Subject: [PATCH] Use a simpler interface. --- .../msd/converter/supplier/animl/io/ChromatogramReader.java | 5 ++--- .../msd/converter/supplier/animl/model/VendorScan.java | 4 ++-- .../msd/converter/supplier/gaml/model/IVendorScan.java | 6 +++--- .../msd/converter/supplier/gaml/model/VendorScan.java | 6 +++--- .../msd/converter/supplier/mz5/io/ChromatogramReader.java | 4 ++-- .../msd/converter/supplier/mz5/model/IVendorScan.java | 6 +++--- .../msd/converter/supplier/mz5/model/VendorScan.java | 6 +++--- .../msd/converter/supplier/mzmlb/model/IVendorScan.java | 6 +++--- .../msd/converter/supplier/mzmlb/model/VendorScan.java | 6 +++--- 9 files changed, 24 insertions(+), 25 deletions(-) diff --git a/openchrom/plugins/net.openchrom.msd.converter.supplier.animl/src/net/openchrom/msd/converter/supplier/animl/io/ChromatogramReader.java b/openchrom/plugins/net.openchrom.msd.converter.supplier.animl/src/net/openchrom/msd/converter/supplier/animl/io/ChromatogramReader.java index c6b4af894..33afbae81 100644 --- a/openchrom/plugins/net.openchrom.msd.converter.supplier.animl/src/net/openchrom/msd/converter/supplier/animl/io/ChromatogramReader.java +++ b/openchrom/plugins/net.openchrom.msd.converter.supplier.animl/src/net/openchrom/msd/converter/supplier/animl/io/ChromatogramReader.java @@ -34,7 +34,6 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; -import org.eclipse.chemclipse.msd.model.core.IRegularMassSpectrum; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.support.PeakBuilderMSD; import org.eclipse.core.runtime.IProgressMonitor; @@ -199,7 +198,7 @@ private void readTotalIonCurrent(ExperimentStepType experimentStep, IVendorChrom } for(int i = 0; i < seriesSet.getLength(); i++) { - IRegularMassSpectrum scan = new VendorScan(); + IScanMSD scan = new VendorScan(); VendorIon ion = new VendorIon(IIon.TIC_ION, signals.get(i)); scan.addIon(ion, false); scan.setRetentionTime(retentionTimes.get(i)); @@ -248,7 +247,7 @@ private void readRetentionTime(SeriesType series, IVendorChromatogram chromatogr } } for(int rt : retentionTimes) { - IRegularMassSpectrum scan = new VendorScan(); + IScanMSD scan = new VendorScan(); scan.setRetentionTime(rt); chromatogram.getScans().add(scan); } diff --git a/openchrom/plugins/net.openchrom.msd.converter.supplier.animl/src/net/openchrom/msd/converter/supplier/animl/model/VendorScan.java b/openchrom/plugins/net.openchrom.msd.converter.supplier.animl/src/net/openchrom/msd/converter/supplier/animl/model/VendorScan.java index 202a1ff22..9eb550c8d 100644 --- a/openchrom/plugins/net.openchrom.msd.converter.supplier.animl/src/net/openchrom/msd/converter/supplier/animl/model/VendorScan.java +++ b/openchrom/plugins/net.openchrom.msd.converter.supplier.animl/src/net/openchrom/msd/converter/supplier/animl/model/VendorScan.java @@ -12,10 +12,10 @@ *******************************************************************************/ package net.openchrom.msd.converter.supplier.animl.model; -import org.eclipse.chemclipse.msd.model.core.AbstractRegularMassSpectrum; +import org.eclipse.chemclipse.msd.model.core.AbstractScanMSD; import org.eclipse.chemclipse.msd.model.core.IIon; -public class VendorScan extends AbstractRegularMassSpectrum { +public class VendorScan extends AbstractScanMSD { private static final long serialVersionUID = -2505351146336950677L; diff --git a/openchrom/plugins/net.openchrom.msd.converter.supplier.gaml/src/net/openchrom/msd/converter/supplier/gaml/model/IVendorScan.java b/openchrom/plugins/net.openchrom.msd.converter.supplier.gaml/src/net/openchrom/msd/converter/supplier/gaml/model/IVendorScan.java index e2bc073ec..25b4344ba 100644 --- a/openchrom/plugins/net.openchrom.msd.converter.supplier.gaml/src/net/openchrom/msd/converter/supplier/gaml/model/IVendorScan.java +++ b/openchrom/plugins/net.openchrom.msd.converter.supplier.gaml/src/net/openchrom/msd/converter/supplier/gaml/model/IVendorScan.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2025 Lablicate GmbH. + * Copyright (c) 2008, 2026 Lablicate GmbH. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -12,7 +12,7 @@ *******************************************************************************/ package net.openchrom.msd.converter.supplier.gaml.model; -import org.eclipse.chemclipse.msd.model.core.IRegularMassSpectrum; +import org.eclipse.chemclipse.msd.model.core.IScanMSD; -public interface IVendorScan extends IRegularMassSpectrum { +public interface IVendorScan extends IScanMSD { } diff --git a/openchrom/plugins/net.openchrom.msd.converter.supplier.gaml/src/net/openchrom/msd/converter/supplier/gaml/model/VendorScan.java b/openchrom/plugins/net.openchrom.msd.converter.supplier.gaml/src/net/openchrom/msd/converter/supplier/gaml/model/VendorScan.java index d08ca503d..57f4088f7 100644 --- a/openchrom/plugins/net.openchrom.msd.converter.supplier.gaml/src/net/openchrom/msd/converter/supplier/gaml/model/VendorScan.java +++ b/openchrom/plugins/net.openchrom.msd.converter.supplier.gaml/src/net/openchrom/msd/converter/supplier/gaml/model/VendorScan.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2025 Lablicate GmbH. + * Copyright (c) 2008, 2026 Lablicate GmbH. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -12,10 +12,10 @@ *******************************************************************************/ package net.openchrom.msd.converter.supplier.gaml.model; -import org.eclipse.chemclipse.msd.model.core.AbstractRegularMassSpectrum; +import org.eclipse.chemclipse.msd.model.core.AbstractScanMSD; import org.eclipse.chemclipse.msd.model.core.IIon; -public class VendorScan extends AbstractRegularMassSpectrum implements IVendorScan { +public class VendorScan extends AbstractScanMSD implements IVendorScan { /** * Renew the serialVersionUID any time you have changed some fields or diff --git a/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/io/ChromatogramReader.java b/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/io/ChromatogramReader.java index eda577ee3..0cb7c4ddf 100644 --- a/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/io/ChromatogramReader.java +++ b/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/io/ChromatogramReader.java @@ -24,7 +24,7 @@ import org.eclipse.chemclipse.msd.converter.io.IChromatogramMSDReader; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IIon; -import org.eclipse.chemclipse.msd.model.core.IRegularMassSpectrum; +import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.core.runtime.IProgressMonitor; import net.openchrom.msd.converter.supplier.mz5.internal.model.CVParam; @@ -86,7 +86,7 @@ private void readTIC(IHDF5SimpleReader reader, CVReference[] cvReferences, CVPar double[] totalIntensities = reader.readDoubleArray(Mz5.CHROMATOGRAM_INTENSITY); int[] chromatogramIndex = reader.readIntArray(Mz5.CHROMATOGRAM_INDEX); for(int i = 0; i < chromatogramIndex[0]; i++) { - IRegularMassSpectrum scan = new VendorScan(); + IScanMSD scan = new VendorScan(); VendorIon ion = new VendorIon(IIon.TIC_ION, (float)totalIntensities[i]); scan.addIon(ion, false); scan.setRetentionTime((int)Math.round(retentionTimes[i] * timeMultiplicator)); diff --git a/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/model/IVendorScan.java b/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/model/IVendorScan.java index cbb25787f..90f434db7 100644 --- a/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/model/IVendorScan.java +++ b/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/model/IVendorScan.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2025 Lablicate GmbH. + * Copyright (c) 2014, 2026 Lablicate GmbH. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -12,7 +12,7 @@ *******************************************************************************/ package net.openchrom.msd.converter.supplier.mz5.model; -import org.eclipse.chemclipse.msd.model.core.IRegularMassSpectrum; +import org.eclipse.chemclipse.msd.model.core.IScanMSD; -public interface IVendorScan extends IRegularMassSpectrum { +public interface IVendorScan extends IScanMSD { } diff --git a/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/model/VendorScan.java b/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/model/VendorScan.java index 138eadc64..5add3c85d 100644 --- a/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/model/VendorScan.java +++ b/openchrom/plugins/net.openchrom.msd.converter.supplier.mz5/src/net/openchrom/msd/converter/supplier/mz5/model/VendorScan.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2025 Lablicate GmbH. + * Copyright (c) 2014, 2026 Lablicate GmbH. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -12,10 +12,10 @@ *******************************************************************************/ package net.openchrom.msd.converter.supplier.mz5.model; -import org.eclipse.chemclipse.msd.model.core.AbstractRegularMassSpectrum; +import org.eclipse.chemclipse.msd.model.core.AbstractScanMSD; import org.eclipse.chemclipse.msd.model.core.IIon; -public class VendorScan extends AbstractRegularMassSpectrum implements IVendorScan { +public class VendorScan extends AbstractScanMSD implements IVendorScan { /** * Renew the serialVersionUID any time you have changed some fields or diff --git a/openchrom/plugins/net.openchrom.msd.converter.supplier.mzmlb/src/net/openchrom/msd/converter/supplier/mzmlb/model/IVendorScan.java b/openchrom/plugins/net.openchrom.msd.converter.supplier.mzmlb/src/net/openchrom/msd/converter/supplier/mzmlb/model/IVendorScan.java index 03e12ff8c..a67ac37a8 100644 --- a/openchrom/plugins/net.openchrom.msd.converter.supplier.mzmlb/src/net/openchrom/msd/converter/supplier/mzmlb/model/IVendorScan.java +++ b/openchrom/plugins/net.openchrom.msd.converter.supplier.mzmlb/src/net/openchrom/msd/converter/supplier/mzmlb/model/IVendorScan.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2025 Lablicate GmbH. + * Copyright (c) 2014, 2026 Lablicate GmbH. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -12,7 +12,7 @@ *******************************************************************************/ package net.openchrom.msd.converter.supplier.mzmlb.model; -import org.eclipse.chemclipse.msd.model.core.IRegularMassSpectrum; +import org.eclipse.chemclipse.msd.model.core.IScanMSD; -public interface IVendorScan extends IRegularMassSpectrum { +public interface IVendorScan extends IScanMSD { } diff --git a/openchrom/plugins/net.openchrom.msd.converter.supplier.mzmlb/src/net/openchrom/msd/converter/supplier/mzmlb/model/VendorScan.java b/openchrom/plugins/net.openchrom.msd.converter.supplier.mzmlb/src/net/openchrom/msd/converter/supplier/mzmlb/model/VendorScan.java index 2efc628e4..12f9519e5 100644 --- a/openchrom/plugins/net.openchrom.msd.converter.supplier.mzmlb/src/net/openchrom/msd/converter/supplier/mzmlb/model/VendorScan.java +++ b/openchrom/plugins/net.openchrom.msd.converter.supplier.mzmlb/src/net/openchrom/msd/converter/supplier/mzmlb/model/VendorScan.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2025 Lablicate GmbH. + * Copyright (c) 2014, 2026 Lablicate GmbH. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -12,10 +12,10 @@ *******************************************************************************/ package net.openchrom.msd.converter.supplier.mzmlb.model; -import org.eclipse.chemclipse.msd.model.core.AbstractRegularMassSpectrum; +import org.eclipse.chemclipse.msd.model.core.AbstractScanMSD; import org.eclipse.chemclipse.msd.model.core.IIon; -public class VendorScan extends AbstractRegularMassSpectrum implements IVendorScan { +public class VendorScan extends AbstractScanMSD implements IVendorScan { /** * Renew the serialVersionUID any time you have changed some fields or