Some compiler warning (generics) have been reduced.

eclipse-chemclipse · May 18, 2021 · 4df706c · 4df706c
1 parent b8e8470
commit 4df706c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/...ugins/org.eclipse.chemclipse.chromatogram.msd.quantitation.supplier.chemclipse/plugin.xml b/...ugins/org.eclipse.chemclipse.chromatogram.msd.quantitation.supplier.chemclipse/plugin.xml
@@ -24,4 +24,4 @@
             class="org.eclipse.chemclipse.chromatogram.msd.quantitation.supplier.chemclipse.preferences.PreferenceInitializer">
       </initializer>
    </extension>
-</plugin>
+</plugin>
diff --git a/...tation/src/org/eclipse/chemclipse/chromatogram/msd/quantitation/core/IPeakQuantifier.java b/...tation/src/org/eclipse/chemclipse/chromatogram/msd/quantitation/core/IPeakQuantifier.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2018 Lablicate GmbH.
+ * Copyright (c) 2013, 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
@@ -28,7 +28,7 @@ public interface IPeakQuantifier {
 	 * @param monitor
 	 * @return IProcessingInfo
 	 */
-	IProcessingInfo quantify(IPeak peak, IPeakQuantifierSettings peakQuantifierSettings, IProgressMonitor monitor);
+	IProcessingInfo<?> quantify(IPeak peak, IPeakQuantifierSettings peakQuantifierSettings, IProgressMonitor monitor);
 
 	/**
 	 * Quantifies the peak.
@@ -37,7 +37,7 @@ public interface IPeakQuantifier {
 	 * @param monitor
 	 * @return {@link IProcessingInfo}
 	 */
-	IProcessingInfo quantify(IPeak peak, IProgressMonitor monitor);
+	IProcessingInfo<?> quantify(IPeak peak, IProgressMonitor monitor);
 
 	/**
 	 * Quantifies the list of peaks.
@@ -47,7 +47,7 @@ public interface IPeakQuantifier {
 	 * @param monitor
 	 * @return IProcessingInfo
 	 */
-	IProcessingInfo quantify(List<IPeak> peaks, IPeakQuantifierSettings peakQuantifierSettings, IProgressMonitor monitor);
+	IProcessingInfo<?> quantify(List<IPeak> peaks, IPeakQuantifierSettings peakQuantifierSettings, IProgressMonitor monitor);
 
 	/**
 	 * Quantifies the list of peaks.
@@ -56,5 +56,5 @@ public interface IPeakQuantifier {
 	 * @param monitor
 	 * @return {@link IProcessingInfo}
 	 */
-	IProcessingInfo quantify(List<IPeak> peaks, IProgressMonitor monitor);
+	IProcessingInfo<?> quantify(List<IPeak> peaks, IProgressMonitor monitor);
 }
diff --git a/...itation/src/org/eclipse/chemclipse/chromatogram/msd/quantitation/core/PeakQuantifier.java b/...itation/src/org/eclipse/chemclipse/chromatogram/msd/quantitation/core/PeakQuantifier.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2018 Lablicate GmbH.
+ * Copyright (c) 2013, 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
@@ -48,6 +48,7 @@ public class PeakQuantifier {
 	 * This class has only static methods.
 	 */
 	private PeakQuantifier() {
+
 	}
 
 	/**
@@ -59,9 +60,9 @@ private PeakQuantifier() {
 	 * @param monitor
 	 * @return IProcessingInfo
 	 */
-	public static IProcessingInfo quantify(IPeak peak, IPeakQuantifierSettings peakQuantifierSettings, final String peakQuantifierId, IProgressMonitor monitor) {
+	public static IProcessingInfo<?> quantify(IPeak peak, IPeakQuantifierSettings peakQuantifierSettings, final String peakQuantifierId, IProgressMonitor monitor) {
 
-		IProcessingInfo processingInfo;
+		IProcessingInfo<?> processingInfo;
 		IPeakQuantifier peakQuantifier = getPeakQuantifier(peakQuantifierId);
 		if(peakQuantifier != null) {
 			processingInfo = peakQuantifier.quantify(peak, peakQuantifierSettings, monitor);
@@ -79,9 +80,9 @@ public static IProcessingInfo quantify(IPeak peak, IPeakQuantifierSettings peakQ
 	 * @param monitor
 	 * @return {@link IProcessingInfo}
 	 */
-	public static IProcessingInfo quantify(IPeak peak, final String peakQuantifierId, IProgressMonitor monitor) {
+	public static IProcessingInfo<?> quantify(IPeak peak, final String peakQuantifierId, IProgressMonitor monitor) {
 
-		IProcessingInfo processingInfo;
+		IProcessingInfo<?> processingInfo;
 		IPeakQuantifier peakQuantifier = getPeakQuantifier(peakQuantifierId);
 		if(peakQuantifier != null) {
 			processingInfo = peakQuantifier.quantify(peak, monitor);
@@ -100,9 +101,9 @@ public static IProcessingInfo quantify(IPeak peak, final String peakQuantifierId
 	 * @param monitor
 	 * @return IProcessingInfo
 	 */
-	public static IProcessingInfo quantify(List<IPeak> peaks, IPeakQuantifierSettings peakQuantifierSettings, final String peakQuantifierId, IProgressMonitor monitor) {
+	public static IProcessingInfo<?> quantify(List<IPeak> peaks, IPeakQuantifierSettings peakQuantifierSettings, final String peakQuantifierId, IProgressMonitor monitor) {
 
-		IProcessingInfo processingInfo;
+		IProcessingInfo<?> processingInfo;
 		IPeakQuantifier peakQuantifier = getPeakQuantifier(peakQuantifierId);
 		if(peakQuantifier != null) {
 			processingInfo = peakQuantifier.quantify(peaks, peakQuantifierSettings, monitor);
@@ -120,9 +121,9 @@ public static IProcessingInfo quantify(List<IPeak> peaks, IPeakQuantifierSetting
 	 * @param monitor
 	 * @return {@link IProcessingInfo}
 	 */
-	public static IProcessingInfo quantify(List<IPeak> peaks, final String peakQuantifierId, IProgressMonitor monitor) {
+	public static IProcessingInfo<?> quantify(List<IPeak> peaks, final String peakQuantifierId, IProgressMonitor monitor) {
 
-		IProcessingInfo processingInfo;
+		IProcessingInfo<?> processingInfo;
 		IPeakQuantifier peakQuantifier = getPeakQuantifier(peakQuantifierId);
 		if(peakQuantifier != null) {
 			processingInfo = peakQuantifier.quantify(peaks, monitor);
@@ -199,10 +200,9 @@ private static IConfigurationElement getConfigurationElement(final String peakQu
 		return null;
 	}
 
-	// --------------------------------------------private methods
-	private static IProcessingInfo getNoPeakQuantifierProcessingInfo() {
+	private static IProcessingInfo<?> getNoPeakQuantifierProcessingInfo() {
 
-		IProcessingInfo processingInfo = new ProcessingInfo();
+		IProcessingInfo<?> processingInfo = new ProcessingInfo<>();
 		IProcessingMessage processingMessage = new ProcessingMessage(MessageType.ERROR, "Peak Quantifier", NO_PEAK_QUANTIFIER_AVAILABLE);
 		processingInfo.addMessage(processingMessage);
 		return processingInfo;