Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2014-06-02 18:38:39 -0400
committerIgor Fedorenko2014-06-02 18:38:39 -0400
commit9a7d1255be0127f34569a4be19fb222e091dbaa9 (patch)
treeb765858f219f70831acca06b70a71d38e9d026f8 /org.eclipse.m2e.core
parentda7e86e8e320ced8669872151e0ef6eb34c553d4 (diff)
downloadm2e-core-9a7d1255be0127f34569a4be19fb222e091dbaa9.tar.gz
m2e-core-9a7d1255be0127f34569a4be19fb222e091dbaa9.tar.xz
m2e-core-9a7d1255be0127f34569a4be19fb222e091dbaa9.zip
368376 removed workaround, require resources plugin 3.9
Change-Id: Id38e63e7f5e06fbd76d08a96d79a720e6748ee0f Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.core')
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/MavenBuilderImpl.java17
2 files changed, 1 insertions, 18 deletions
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index 1d687c93..e8bd71f1 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Require-Bundle:
org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.core.resources;bundle-version="3.9.0",
org.eclipse.m2e.maven.runtime;bundle-version="[1.6.0,1.7.0)",
org.eclipse.m2e.archetype.common;bundle-version="[1.6.0,1.7.0)",
org.eclipse.m2e.maven.indexer;bundle-version="[1.6.0,1.7.0)",
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/MavenBuilderImpl.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/MavenBuilderImpl.java
index 52ed2806..a39897ff 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/MavenBuilderImpl.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/MavenBuilderImpl.java
@@ -20,7 +20,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -29,7 +28,6 @@ import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -243,7 +241,6 @@ public class MavenBuilderImpl {
resource = project.getFile(path);
}
if(resource != null) {
- workaroundBug368376(resource, monitor);
resource.refreshLocal(IResource.DEPTH_INFINITE, monitor);
if(resource.exists()) {
// the resource has changed for certain, make sure resource sends IResourceChangeEvent
@@ -259,20 +256,6 @@ public class MavenBuilderImpl {
}
}
- void workaroundBug368376(IResource resource, IProgressMonitor monitor) throws CoreException {
- // refreshing a new file does not automatically refresh enclosing new folders
- // refreshLocal(IResource.DEPTH_ONE) on all out-of-sync parents seems to be the least expansive way to refresh
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=368376
- List<IContainer> parents = new LinkedList<IContainer>();
- for(IContainer parent = resource.getParent(); parent != null && !parent.isSynchronized(IResource.DEPTH_ZERO); parent = parent
- .getParent()) {
- parents.add(0, parent);
- }
- for(IContainer parent : parents) {
- parent.refreshLocal(IResource.DEPTH_ONE, monitor);
- }
- }
-
public static IPath getProjectRelativePath(IProject project, File file) {
if(project == null || file == null) {
return null;

Back to the top