xml.config: Delete supplementary files when deleting xml analysis config

Fixes #267

[Fixed] Delete supplementary files when deleting xml analysis config

Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

Author: bhufmann

tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/META-INF/MANIFEST.MF

@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.analysis.profiling.core,
  org.eclipse.core.commands,
  com.google.guava,
- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
+ org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
+ org.eclipse.core.resources
 Export-Package: org.eclipse.tracecompass.internal.tmf.analysis.xml.core;x-friends:="org.eclipse.tracecompass.tmf.analysis.xml.core.tests",
  org.eclipse.tracecompass.internal.tmf.analysis.xml.core.callstack;x-friends:="org.eclipse.tracecompass.tmf.analysis.xml.core.tests",
  org.eclipse.tracecompass.internal.tmf.analysis.xml.core.config;x-friends:="org.eclipse.tracecompass.tmf.analysis.xml.core.tests",

tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/config/XmlConfigurationSource.java

@@ -13,25 +13,40 @@
 import static org.eclipse.tracecompass.common.core.NonNullUtils.nullToEmptyString;
 
 import java.io.File;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.tracecompass.internal.analysis.timing.core.Activator;
 import org.eclipse.tracecompass.internal.tmf.analysis.xml.core.module.XmlAnalysisModuleSource;
 import org.eclipse.tracecompass.internal.tmf.analysis.xml.core.module.XmlUtils;
+import org.eclipse.tracecompass.tmf.core.TmfCommonConstants;
+import org.eclipse.tracecompass.tmf.core.TmfProjectNature;
+import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.config.ITmfConfiguration;
 import org.eclipse.tracecompass.tmf.core.config.ITmfConfigurationSource;
 import org.eclipse.tracecompass.tmf.core.config.ITmfConfigurationSourceType;
 import org.eclipse.tracecompass.tmf.core.config.TmfConfigParamDescriptor;
 import org.eclipse.tracecompass.tmf.core.config.TmfConfiguration;
 import org.eclipse.tracecompass.tmf.core.config.TmfConfigurationSourceType;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfConfigurationException;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
+import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager;
 
 import com.google.common.collect.ImmutableList;
 
@@ -108,7 +123,7 @@ public ITmfConfiguration update(String id, Map<String, Object> parameters) throw
         if (!XmlUtils.listFiles().containsKey(id)) {
             return null;
         }
-
+        deleteSupplementaryResources(id);
         XmlUtils.deleteFiles(ImmutableList.of(id));
         XmlUtils.saveFilesStatus();
         XmlAnalysisModuleSource.notifyModuleChange();
@@ -187,4 +202,50 @@ private static ITmfConfiguration createConfiguration(File file) {
                 .setSourceTypeId(XML_ANALYSIS_TYPE_ID);
        return builder.build();
     }
+
+    @SuppressWarnings("null")
+    private static void deleteSupplementaryResources(String id) {
+        // Get unique list of analysis IDs
+        Set<String> analysisIds = new HashSet<>();
+        analysisIds.addAll(XmlUtils.getAnalysisIdsFromFile(id));
+
+        // Delete persistent data of all open traces (this will close the file before deleting it)
+        for (ITmfTrace trace : TmfTraceManager.getInstance().getOpenedTraces()) {
+            for (ITmfTrace tr : TmfTraceManager.getTraceSetWithExperiment(trace)) {
+                analysisIds.forEach(analysisId -> {
+                    IAnalysisModule module = tr.getAnalysisModule(analysisId);
+                    if (module != null) {
+                        module.clearPersistentData();
+                    }
+                });
+            }
+        }
+
+        // Delete applicable persistent data of non-opened traces
+        for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+            try {
+                if (project.hasNature(TmfProjectNature.ID)) {
+                    IFolder supplFolder = project.getFolder(TmfCommonConstants.TRACE_SUPPLEMENTARY_FOLDER_NAME);
+                    if (supplFolder != null && supplFolder.exists()) {
+                        supplFolder.accept((IResourceVisitor) resource -> {
+                            if (resource instanceof IFile) {
+                                analysisIds.forEach(analysisId -> {
+                                    if (resource.getName().startsWith(analysisId)) {
+                                        try {
+                                            resource.delete(true, null);
+                                        } catch (CoreException e) {
+                                            Activator.getInstance().logError("Can't delete supplementary resource " + resource.getName(), e); //$NON-NLS-1$
+                                        }
+                                    }
+                                });
+                            }
+                            return true;
+                        }, IResource.DEPTH_INFINITE, IResource.NONE);
+                    }
+                }
+            } catch (CoreException e) {
+                Activator.getInstance().logError("Can't delete supplementary resources for XML anlayses", e); //$NON-NLS-1$
+            }
+        }
+    }
 }