X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.tracecompass.tmf.core%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Ftmf%2Fcore%2Ftrace%2FITmfTrace.java;h=aede3ca57d7d0ff2f9fb0aeca32229f485338e7b;hb=b8585c7c525d47181d576c604b4a785ac8b37954;hp=15b491e1f319658073697a5737ad700a74870b15;hpb=9d710b2be7fe709e3f3b290664d2a55a5c42d918;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/ITmfTrace.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/ITmfTrace.java
index 15b491e1f3..aede3ca57d 100644
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/ITmfTrace.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/ITmfTrace.java
@@ -243,46 +243,15 @@ public interface ITmfTrace extends ITmfEventProvider {
      *            The analysis module ID
      * @return The {@link IAnalysisModule} object, or null if an analysis with
      *         the given ID does no exist.
-     * @since 3.0
      */
-    @Nullable
-    IAnalysisModule getAnalysisModule(String id);
+    @Nullable IAnalysisModule getAnalysisModule(String id);
 
     /**
      * Get a list of all analysis modules currently available for this trace.
      *
      * @return An iterable view of the analysis modules
-     * @since 3.0
-     */
-    @NonNull
-    Iterable<IAnalysisModule> getAnalysisModules();
-
-    /**
-     * Get an analysis module belonging to this trace, with the specified ID and
-     * class.
-     *
-     * @param moduleClass
-     *            Returned modules must extend this class
-     * @param id
-     *            The ID of the analysis module
-     * @return The analysis module with specified class and ID, or null if no
-     *         such module exists.
-     * @since 3.0
-     */
-    @Nullable
-    <T extends IAnalysisModule> T getAnalysisModuleOfClass(Class<T> moduleClass, String id);
-
-    /**
-     * Return the analysis modules that are of a given class. Module are already
-     * casted to the requested class.
-     *
-     * @param moduleClass
-     *            Returned modules must extend this class
-     * @return List of modules of class moduleClass
-     * @since 3.0
      */
-    @NonNull
-    <T> Iterable<T> getAnalysisModulesOfClass(Class<T> moduleClass);
+    @NonNull Iterable<IAnalysisModule> getAnalysisModules();
 
     // ------------------------------------------------------------------------
     // Aspect getters