Workaround duplicate peaks not being selected in Peak/Scan list.

eclipse-chemclipse · Feb 26, 2025 · 92c25fa · 92c25fa
1 parent ea23b40
commit 92c25fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 34 deletions.
diff --git a/...ipse.csd.model/src/org/eclipse/chemclipse/csd/model/core/AbstractChromatogramPeakCSD.java b/...ipse.csd.model/src/org/eclipse/chemclipse/csd/model/core/AbstractChromatogramPeakCSD.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2020 Lablicate GmbH.
+ * Copyright (c) 2014, 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
@@ -28,6 +28,7 @@ public abstract class AbstractChromatogramPeakCSD extends AbstractPeakCSD implem
 	 * @throws PeakException
 	 */
 	public AbstractChromatogramPeakCSD(IPeakModelCSD peakModel, IChromatogramCSD chromatogram) throws IllegalArgumentException, PeakException {
+
 		super(peakModel);
 		validateChromatogram(chromatogram);
 		validateRetentionTimes(chromatogram, peakModel);
@@ -39,6 +40,7 @@ public AbstractChromatogramPeakCSD(IPeakModelCSD peakModel, IChromatogramCSD chr
 	}
 
 	public AbstractChromatogramPeakCSD(IPeakModelCSD peakModel, IChromatogramCSD chromatogram, String modelDescription) throws IllegalArgumentException, PeakException {
+
 		this(peakModel, chromatogram);
 		setModelDescription(modelDescription);
 	}
@@ -84,22 +86,6 @@ public IChromatogramCSD getChromatogram() {
 		return chromatogram;
 	}
 
-	@Override
-	public boolean equals(Object otherObject) {
-
-		if(this == otherObject) {
-			return true;
-		}
-		if(otherObject == null) {
-			return false;
-		}
-		if(getClass() != otherObject.getClass()) {
-			return false;
-		}
-		AbstractChromatogramPeakCSD other = (AbstractChromatogramPeakCSD)otherObject;
-		return getPeakModel().equals(other.getPeakModel()) && chromatogram == other.getChromatogram();
-	}
-
 	@Override
 	public int hashCode() {
 

diff --git a/...ipse.wsd.model/src/org/eclipse/chemclipse/wsd/model/core/AbstractChromatogramPeakWSD.java b/...ipse.wsd.model/src/org/eclipse/chemclipse/wsd/model/core/AbstractChromatogramPeakWSD.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2023 Lablicate GmbH.
+ * Copyright (c) 2018, 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
@@ -107,22 +107,6 @@ public IChromatogramWSD getChromatogram() {
 		return chromatogram;
 	}
 
-	@Override
-	public boolean equals(Object otherObject) {
-
-		if(this == otherObject) {
-			return true;
-		}
-		if(otherObject == null) {
-			return false;
-		}
-		if(getClass() != otherObject.getClass()) {
-			return false;
-		}
-		AbstractChromatogramPeakWSD other = (AbstractChromatogramPeakWSD)otherObject;
-		return getPeakModel().equals(other.getPeakModel()) && chromatogram == other.getChromatogram();
-	}
-
 	@Override
 	public int hashCode() {