From bcfe3cb951677e7c06ec1263f11037b451982983 Mon Sep 17 00:00:00 2001 From: nrousseau Date: Wed, 8 Oct 2014 23:50:03 +0800 Subject: [PATCH] TDI-30302: review util functions to help for the junits --- .../src/org/talend/commons/utils/resource/ResourceUtil.java | 4 +++- .../talend/repository/viewer/content/VisitResourceHelper.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/resource/ResourceUtil.java b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/resource/ResourceUtil.java index 42c13a9e9f..0007410ac0 100644 --- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/resource/ResourceUtil.java +++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/resource/ResourceUtil.java @@ -28,9 +28,11 @@ public class ResourceUtil { private static final String BUNDLERESOURCE = "bundleresource"; //$NON-NLS-1$ + private static final String BUNDLEENTRY = "bundleentry"; //$NON-NLS-1$ + public static File convertResourceToFile(URL resource) throws IOException, URISyntaxException { File fileDir = null; - if (BUNDLERESOURCE.equals(resource.getProtocol())) { + if (BUNDLERESOURCE.equals(resource.getProtocol()) || BUNDLEENTRY.equals(resource.getProtocol())) { URL unescapedURL = FileLocator.toFileURL(resource); URI escapedURI = new URI(unescapedURL.getProtocol(), unescapedURL.getPath(), unescapedURL.getQuery()); fileDir = URIUtil.toFile(escapedURI); diff --git a/main/plugins/org.talend.repository.view/src/org/talend/repository/viewer/content/VisitResourceHelper.java b/main/plugins/org.talend.repository.view/src/org/talend/repository/viewer/content/VisitResourceHelper.java index b97a4ca5a8..3a715ef580 100644 --- a/main/plugins/org.talend.repository.view/src/org/talend/repository/viewer/content/VisitResourceHelper.java +++ b/main/plugins/org.talend.repository.view/src/org/talend/repository/viewer/content/VisitResourceHelper.java @@ -14,6 +14,7 @@ package org.talend.repository.viewer.content; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.runtime.CoreException; @@ -93,6 +94,9 @@ public class VisitResourceHelper { IResourceDelta[] affectedChildren = delta.getAffectedChildren(); IResource res = delta.getResource(); + if (res instanceof IProject && delta.getKind() == IResourceDelta.REMOVED) { + return false; + } IPath path = delta.getFullPath(); boolean noChild = (affectedChildren == null || (affectedChildren.length == 0));