Author: rombert
Date: Tue Oct 28 16:12:49 2014
New Revision: 1634904
URL: http://svn.apache.org/r1634904
Log:
SLING-4113 - Importing resources triggers spurios publish events when
missing parent folders are created
Ensure that ImportRepositoryContentAction.createParents set the import
modification property so its changes are ignored.
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java?rev=1634904&r1=1634903&r2=1634904&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Tue Oct 28 16:12:49 2014
@@ -428,6 +428,15 @@ public class ImportRepositoryContentActi
return destinationFolder;
}
+ private void createParents(IContainer container) throws CoreException {
+ if (container.exists() || container.getType() != IResource.FOLDER) {
+ return;
+ }
+
+ createParents(container.getParent());
+ createFolder(container.getProject(),
container.getProjectRelativePath());
+ }
+
private void removeTouchedResource(IResource resource) {
IResource current = resource;
@@ -461,17 +470,4 @@ public class ImportRepositoryContentActi
destinationFile.setSessionProperty(ResourceUtil.QN_IMPORT_MODIFICATION_TIMESTAMP,
destinationFile.getModificationStamp());
}
-
- private void createParents(IContainer container) throws CoreException {
- if (container.exists()) {
- return;
- }
- if (!(container instanceof IFolder)) {
- return;
- }
- createParents(container.getParent());
- IFolder parentFolder = (IFolder)container;
- parentFolder.create(true, true, null);
- }
-
}
\ No newline at end of file
