Override with typed chromatogram getter.

eclipse-chemclipse · Jan 29, 2025 · f8a44d8 · f8a44d8
1 parent 756db23
commit f8a44d8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 26 deletions.
diff --git a/...d.model/src/org/eclipse/chemclipse/csd/model/core/selection/ChromatogramSelectionCSD.java b/...d.model/src/org/eclipse/chemclipse/csd/model/core/selection/ChromatogramSelectionCSD.java
@@ -50,9 +50,9 @@ public void dispose() {
 	}
 
 	@Override
-	public IChromatogramCSD getChromatogramCSD() {
+	public IChromatogramCSD getChromatogram() {
 
-		IChromatogram<?> chromatogram = getChromatogram();
+		IChromatogram<?> chromatogram = super.getChromatogram();
 		if(chromatogram instanceof IChromatogramCSD chromatogramCSD) {
 			return chromatogramCSD;
 		}

diff --git a/....model/src/org/eclipse/chemclipse/csd/model/core/selection/IChromatogramSelectionCSD.java b/....model/src/org/eclipse/chemclipse/csd/model/core/selection/IChromatogramSelectionCSD.java
@@ -23,14 +23,10 @@ public interface IChromatogramSelectionCSD extends IChromatogramSelection<IChrom
 	 * Returns the stored chromatogram.
 	 * May return null.
 	 *
-	 * @deprecated use {@link #getChromatogram()} instead
 	 * @return {@link IChromatogramCSD}
 	 */
-	@Deprecated
-	default IChromatogramCSD getChromatogramCSD() {
-
-		return getChromatogram();
-	}
+	@Override
+	IChromatogramCSD getChromatogram();
 
 	/**
 	 * Returns the selected scan of the current chromatogram or null, if none is

diff --git a/...d.model/src/org/eclipse/chemclipse/msd/model/core/selection/ChromatogramSelectionMSD.java b/...d.model/src/org/eclipse/chemclipse/msd/model/core/selection/ChromatogramSelectionMSD.java
@@ -88,10 +88,9 @@ public void dispose() {
 	}
 
 	@Override
-	@Deprecated
-	public IChromatogramMSD getChromatogramMSD() {
+	public IChromatogramMSD getChromatogram() {
 
-		IChromatogram<?> chromatogram = getChromatogram();
+		IChromatogram<?> chromatogram = super.getChromatogram();
 		if(chromatogram instanceof IChromatogramMSD chromatogramMSD) {
 			return chromatogramMSD;
 		}

diff --git a/....model/src/org/eclipse/chemclipse/msd/model/core/selection/IChromatogramSelectionMSD.java b/....model/src/org/eclipse/chemclipse/msd/model/core/selection/IChromatogramSelectionMSD.java
@@ -33,14 +33,10 @@ public interface IChromatogramSelectionMSD extends IChromatogramSelection<IChrom
 	 * Returns the stored chromatogram.
 	 * May return null.
 	 *
-	 * @deprecated use {@link #getChromatogram()} instead
 	 * @return {@link IChromatogramMSD}
 	 */
-	@Deprecated
-	default IChromatogramMSD getChromatogramMSD() {
-
-		return getChromatogram();
-	}
+	@Override
+	IChromatogramMSD getChromatogram();
 
 	/**
 	 * Returns the selected scan of the current chromatogram or null, if none is

diff --git a/....model/src/org/eclipse/chemclipse/vsd/model/core/selection/IChromatogramSelectionVSD.java b/....model/src/org/eclipse/chemclipse/vsd/model/core/selection/IChromatogramSelectionVSD.java
@@ -18,5 +18,9 @@
 
 public interface IChromatogramSelectionVSD extends IChromatogramSelection<IChromatogramPeakVSD, IChromatogramVSD> {
 
+	@Override
+	IChromatogramVSD getChromatogram();
+
+	@Override
 	IScanVSD getSelectedScan();
 }
diff --git a/...d.model/src/org/eclipse/chemclipse/wsd/model/core/selection/ChromatogramSelectionWSD.java b/...d.model/src/org/eclipse/chemclipse/wsd/model/core/selection/ChromatogramSelectionWSD.java
@@ -69,10 +69,9 @@ public void dispose() {
 	}
 
 	@Override
-	@Deprecated
-	public IChromatogramWSD getChromatogramWSD() {
+	public IChromatogramWSD getChromatogram() {
 
-		IChromatogram<?> chromatogram = getChromatogram();
+		IChromatogram<?> chromatogram = super.getChromatogram();
 		if(chromatogram instanceof IChromatogramWSD chromatogramWSD) {
 			return chromatogramWSD;
 		}

diff --git a/....model/src/org/eclipse/chemclipse/wsd/model/core/selection/IChromatogramSelectionWSD.java b/....model/src/org/eclipse/chemclipse/wsd/model/core/selection/IChromatogramSelectionWSD.java
@@ -25,14 +25,10 @@ public interface IChromatogramSelectionWSD extends IChromatogramSelection<IChrom
 	 * Returns the stored chromatogram.
 	 * May return null.
 	 *
-	 * @deprecated use {@link #getChromatogram()} instead
 	 * @return {@link IChromatogramWSD}
 	 */
-	@Deprecated
-	default IChromatogramWSD getChromatogramWSD() {
-
-		return getChromatogram();
-	}
+	@Override
+	IChromatogramWSD getChromatogram();
 
 	/**
 	 * Returns the selected scan of the current chromatogram or null, if none is