[334151] Need to back out bug 294627
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF index c1c3d24..c4787fd 100644 --- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true -Bundle-Version: 1.1.216.qualifier +Bundle-Version: 1.1.217.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java index 37c2d7a..73874cf 100644 --- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java +++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
@@ -18,7 +18,6 @@ import java.util.Map; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.WorkspaceJob; @@ -262,21 +261,7 @@ for (int i = 0; i < childDeltas.length; i++) { processResourceDelta(childDeltas[i], rootFolder, sourceToRuntime, pathsToAdd, pathsToRemove, changedJavaPaths); } - } else if (kind == IResourceDelta.REMOVED){ - if(sourceToRuntime != null){ - IResource resource = delta.getResource(); - if(resource.getType() == IResource.FOLDER){ - IVirtualComponent c = ComponentCore.createComponent(resource.getProject()); - if(c != null){ - rootFolder = c.getRootFolder(); - final IPath movedFrom = delta.getProjectRelativePath(); - final IPath runtimePath = (IPath) sourceToRuntime.get(movedFrom); - final IVirtualFolder folder = rootFolder.getFolder(runtimePath); - pathsToRemove.add(new Object[]{movedFrom, folder}); - } - } - } - }else { + } else { final int flags = delta.getFlags(); if ((flags & IResourceDelta.MOVED_FROM) == IResourceDelta.MOVED_FROM) { if (rootFolder == null) {