Merge pull request #2747 from Mailaender/rm-peak-positions

Remove PeakPosition interface

Author: eselmeister

chemclipse/plugins/org.eclipse.chemclipse.chromatogram.peak.detector/src/org/eclipse/chemclipse/chromatogram/peak/detector/support/IRawPeak.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,7 @@
  *******************************************************************************/
 package org.eclipse.chemclipse.chromatogram.peak.detector.support;
 
-import org.eclipse.chemclipse.model.core.PeakPosition;
-import org.eclipse.chemclipse.model.core.PeakType;
-
-public interface IRawPeak extends PeakPosition {
+public interface IRawPeak {
 
 	/**
 	 * Returns the start scan of the raw peak.
@@ -52,28 +49,4 @@ public interface IRawPeak extends PeakPosition {
 	 * @return int
 	 */
 	int getStopScan();
-
-	@Override
-	default PeakType getPeakType() {
-
-		return PeakType.DEFAULT;
-	}
-
-	@Override
-	default int getPeakStart() {
-
-		return getStartScan() - 1;
-	}
-
-	@Override
-	default int getPeakMaximum() {
-
-		return getMaximumScan() - 1;
-	}
-
-	@Override
-	default int getPeakEnd() {
-
-		return getStopScan() - 1;
-	}
 }

chemclipse/plugins/org.eclipse.chemclipse.model/META-INF/MANIFEST.MF

@@ -28,7 +28,6 @@ Export-Package: org.eclipse.chemclipse.model.baseline,
  org.eclipse.chemclipse.model.comparator,
  org.eclipse.chemclipse.model.core,
  org.eclipse.chemclipse.model.core.support,
- org.eclipse.chemclipse.model.detector;version="1.0.0",
  org.eclipse.chemclipse.model.exception,
  org.eclipse.chemclipse.model.exceptions,
  org.eclipse.chemclipse.model.filter;version="1.0.0",

chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/core/IPeak.java

@@ -21,7 +21,7 @@
 import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry;
 import org.eclipse.chemclipse.model.support.IIntegrationConstraints;
 
-public interface IPeak extends ITargetSupplier, PeakPosition, IClassifier, ISignal {
+public interface IPeak extends ITargetSupplier, IClassifier, ISignal {
 
 	/**
 	 * This comparator compares peaks based on the RT at the maximum of the intensity of the peak model
@@ -59,7 +59,6 @@ public interface IPeak extends ITargetSupplier, PeakPosition, IClassifier, ISign
 	 * BV - baseline valley<br/>
 	 * ... <br/>
 	 */
-	@Override
 	PeakType getPeakType();
 
 	/**
@@ -221,36 +220,6 @@ public interface IPeak extends ITargetSupplier, PeakPosition, IClassifier, ISign
 	 */
 	void setMarkedAsDeleted(boolean markedAsDeleted);
 
-	/**
-	 * Returns the scan number at peak stop.
-	 */
-	@Override
-	default int getPeakEnd() {
-
-		IPeakModel peakModel = getPeakModel();
-		return peakModel.getPeakScan(peakModel.getStopRetentionTime()).getScanNumber() - 1;
-	}
-
-	/**
-	 * Returns the scan number at peak start.
-	 */
-	@Override
-	default int getPeakStart() {
-
-		IPeakModel peakModel = getPeakModel();
-		return peakModel.getPeakScan(peakModel.getStartRetentionTime()).getScanNumber() - 1;
-	}
-
-	/**
-	 * Returns the scan number at peak maximum.
-	 */
-	@Override
-	default int getPeakMaximum() {
-
-		IPeakModel peakModel = getPeakModel();
-		return peakModel.getPeakMaximum().getScanNumber() - 1;
-	}
-
 	/**
 	 * Returns the retention time at peak maximum in milliseconds.
 	 */

chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/core/PeakList.java

@@ -30,7 +30,6 @@ Service-Component: OSGI-INF/org.eclipse.chemclipse.nmr.processing.apodization.Ex
  OSGI-INF/org.eclipse.chemclipse.nmr.processing.digitalfilter.DigitalFilterRemoval.xml,
  OSGI-INF/org.eclipse.chemclipse.nmr.processing.ft.FourierTransformationProcessor.xml,
  OSGI-INF/org.eclipse.chemclipse.nmr.processing.ft.InverseFourierTransformationProcessor.xml,
- OSGI-INF/org.eclipse.chemclipse.nmr.processing.peakdetection.WaveletPeakDetectorProcessor.xml,
  OSGI-INF/org.eclipse.chemclipse.nmr.processing.phasecorrection.AutoPhaseCorrectionProcessor.xml,
  OSGI-INF/org.eclipse.chemclipse.nmr.processing.phasecorrection.PhaseCorrectionProcessor.xml,
  OSGI-INF/org.eclipse.chemclipse.nmr.processing.supplier.base.core.BaselineCorrectionProcessor.xml,