From da67b8d7062a97a427d1c90f680702922869c9b5 Mon Sep 17 00:00:00 2001 From: Joost Kraaijeveld Date: Sat, 15 Feb 2020 13:31:41 +0100 Subject: [PATCH] Bug 560038 - Mark LlvmResourceListener for deletion - deleted LlvmResourceListener.java - removed all references to LlvmResourceListener - removed import of LlvmResourceListener - bumped bundle version to 1.2.0 as per Alexander's advise - added 2 commented filters wrt problems in MANNIFEST.MF Change-Id: Iee8024dc6bfd6998b2eecbae25f7574bc3effba0 Signed-off-by: Joost Kraaijeveld --- .../.settings/.api_filters | 14 +++++ .../managedbuilder/llvm/ui/LlvmUIPlugin.java | 11 ---- .../llvm/util/LlvmResourceListener.java | 61 ------------------- 3 files changed, 14 insertions(+), 72 deletions(-) delete mode 100644 llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmResourceListener.java diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters index 3854ec7101f..4160358c7da 100644 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters @@ -16,4 +16,18 @@ + + + + + + + + + + + + + + diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmUIPlugin.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmUIPlugin.java index fdcf4fb11ef..9da2773ac61 100755 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmUIPlugin.java +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmUIPlugin.java @@ -20,10 +20,6 @@ import java.util.MissingResourceException; import java.util.PropertyResourceBundle; import java.util.ResourceBundle; -import org.eclipse.cdt.managedbuilder.llvm.util.LlvmResourceListener; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; @@ -54,10 +50,6 @@ public class LlvmUIPlugin extends AbstractUIPlugin { //Property Resource bundle private PropertyResourceBundle properties; - //Resource listeners - private IResourceChangeListener listener = new LlvmResourceListener(); - private IResourceChangeListener listener2 = new LlvmResourceListener(); - /** * Constructor. */ @@ -71,9 +63,6 @@ public class LlvmUIPlugin extends AbstractUIPlugin { super.start(context); plugin = this; // LlvmEnvironmentVariableSupplier.initializePaths(); - //add resource change listeners to the workspace - ResourcesPlugin.getWorkspace().addResourceChangeListener(this.listener, IResourceChangeEvent.PRE_BUILD); - ResourcesPlugin.getWorkspace().addResourceChangeListener(this.listener2, IResourceChangeEvent.POST_BUILD); } @Override diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmResourceListener.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmResourceListener.java deleted file mode 100644 index 4138cbcfce1..00000000000 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmResourceListener.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2015 Nokia Siemens Networks Oyj, Finland. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Nokia Siemens Networks - initial implementation - * Petri Tuononen - Initial implementation - * Marc-Andre Laperle (Ericsson) - *******************************************************************************/ -package org.eclipse.cdt.managedbuilder.llvm.util; - -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; - -/** - * Implements Resource listener. - */ -public class LlvmResourceListener implements IResourceChangeListener { - - /** - * Defines what happens when resources have changed. - * - * @param event IResourceChangeEvent - */ - @Override - public void resourceChanged(IResourceChangeEvent event) { - - if (event.getType() == IResourceChangeEvent.POST_BUILD) { //refresh every project after build - - /* - * FIXME: M-A.L: (Bug 405909) I commented out the refresh code because it was a - * major performance issue even without LLVM projects in the - * workspace. Unfortunately, I could not track down the reason as to - * why there was a refresh in the first the place by looking at the - * history (git and svn) and by manual testing - */ - - // //get all projects - // IProject[] projects = LlvmToolOptionPathUtil.getProjectsInWorkspace(); - // - // //refresh the projects - // for (IProject proj : projects) { - // try { - // proj.refreshLocal(IResource.DEPTH_INFINITE, null); - // } catch (CoreException e) { - // e.printStackTrace(); - // } - // } - } else { - return; - } - - } - -} \ No newline at end of file