You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2015/09/29 23:58:54 UTC
svn commit: r1705935 - in /sling/trunk/tooling/ide:
api/src/org/apache/sling/ide/filter/
eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/
eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/
eclipse-ui/src/org/apache/sling/ide/eclipse/u...
Author: rombert
Date: Tue Sep 29 21:58:54 2015
New Revision: 1705935
URL: http://svn.apache.org/viewvc?rev=1705935&view=rev
Log:
SLING-4458 - Resources not matching the filter can be deleted when
updating a node
Removed unused contentSyncParameter from Filter.filter
Modified:
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilter.java
Modified: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java?rev=1705935&r1=1705934&r2=1705935&view=diff
==============================================================================
--- sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java (original)
+++ sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java Tue Sep 29 21:58:54 2015
@@ -16,16 +16,14 @@
*/
package org.apache.sling.ide.filter;
-import java.io.File;
-
public interface Filter {
/**
* Returns the result of filtering, i.e. whether a resource should be included in synchronization calls with the
* repository
+ * @param repositoryPath a path in repository format
*
- * @param path a path in repository format
* @return the filter result, never <code>null</code>
*/
- FilterResult filter(File contentSyncRoot, String path);
+ FilterResult filter(String repositoryPath);
}
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java?rev=1705935&r1=1705934&r2=1705935&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java Tue Sep 29 21:58:54 2015
@@ -259,8 +259,7 @@ public class ResourceChangeCommandFactor
String repositoryPath = resourceProxy != null ? resourceProxy.getPath() : getRepositoryPathForDeletedResource(
resource, contentSyncRoot);
- FilterResult filterResult = filter.filter(ProjectUtil.getSyncDirectoryFile(resource.getProject()),
- repositoryPath);
+ FilterResult filterResult = filter.filter(repositoryPath);
Activator.getDefault().getPluginLogger().trace("Filter result for {0} for {1}", repositoryPath, filterResult);
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=1705935&r1=1705934&r2=1705935&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 Sep 29 21:58:54 2015
@@ -206,7 +206,7 @@ public class ImportRepositoryContentActi
String repositoryPath = rai.getResource().getPath();
- FilterResult filterResult = filter.filter(contentSyncRoot, repositoryPath);
+ FilterResult filterResult = filter.filter(repositoryPath);
if (ignoredResources.isIgnored(repositoryPath)) {
return false;
@@ -350,7 +350,7 @@ public class ImportRepositoryContentActi
}
if (filter != null) {
- FilterResult filterResult = filter.filter(contentSyncRoot, child.getPath());
+ FilterResult filterResult = filter.filter(child.getPath());
if (filterResult == FilterResult.DENY) {
continue;
}
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java?rev=1705935&r1=1705934&r2=1705935&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java Tue Sep 29 21:58:54 2015
@@ -1107,7 +1107,7 @@ public class JcrNode implements IAdaptab
Activator.getDefault().getPluginLogger().error("No filter.xml found for "+project);
return true;
} else {
- final FilterResult result = filter.filter(ProjectUtil.getSyncDirectoryFile(project), relativeFilePath);
+ final FilterResult result = filter.filter(relativeFilePath);
return result==FilterResult.ALLOW;
}
} catch (CoreException e) {
Modified: sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java?rev=1705935&r1=1705934&r2=1705935&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java (original)
+++ sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java Tue Sep 29 21:58:54 2015
@@ -16,7 +16,6 @@
*/
package org.apache.sling.ide.impl.resource.filer;
-import java.io.File;
import java.util.List;
import org.apache.sling.ide.filter.Filter;
@@ -31,7 +30,7 @@ public class SimpleFilter implements Fil
}
@Override
- public FilterResult filter(File contentSyncRoot, String relativeFilePath) {
+ public FilterResult filter(String relativeFilePath) {
if (relativeFilePath.isEmpty() || relativeFilePath.charAt(0) != '/') {
relativeFilePath = '/' + relativeFilePath;
}
Modified: sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java?rev=1705935&r1=1705934&r2=1705935&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java (original)
+++ sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java Tue Sep 29 21:58:54 2015
@@ -31,7 +31,7 @@ public class VltFilterTest {
@Test
public void defaultFilterExcludedVarClasses() throws IOException, ConfigurationException {
- assertThat(newFilter("filter-default.xml").filter(null, "/var/classes"), is(FilterResult.DENY));
+ assertThat(newFilter("filter-default.xml").filter("/var/classes"), is(FilterResult.DENY));
}
@@ -48,20 +48,20 @@ public class VltFilterTest {
VltFilter filter = new VltFilter(null);
- assertThat(filter.filter(null, "/var/classes"), is(FilterResult.DENY));
+ assertThat(filter.filter("/var/classes"), is(FilterResult.DENY));
}
@Test
public void defaultFilterIncludesLibs() throws IOException, ConfigurationException {
- assertThat(newFilter("filter-default.xml").filter(null, "/libs"), is(FilterResult.ALLOW));
+ assertThat(newFilter("filter-default.xml").filter("/libs"), is(FilterResult.ALLOW));
}
@Test
public void pathMissingLeadingSlashIsCorrected() throws IOException, ConfigurationException {
- assertThat(newFilter("filter-default.xml").filter(null, "libs"), is(FilterResult.ALLOW));
+ assertThat(newFilter("filter-default.xml").filter("libs"), is(FilterResult.ALLOW));
}
@Test
@@ -69,7 +69,7 @@ public class VltFilterTest {
String[] parents = new String[] { "/libs", "/libs/sling", "/libs/sling/servlet" };
for (String parent : parents) {
- assertThat("Parent '" + parent + "'", newFilter("filter-deep.xml").filter(null, parent),
+ assertThat("Parent '" + parent + "'", newFilter("filter-deep.xml").filter(parent),
is(FilterResult.PREREQUISITE));
}
}
Modified: sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilter.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilter.java?rev=1705935&r1=1705934&r2=1705935&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilter.java (original)
+++ sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilter.java Tue Sep 29 21:58:54 2015
@@ -16,7 +16,6 @@
*/
package org.apache.sling.ide.impl.vlt.filter;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -43,7 +42,7 @@ public class VltFilter implements Filter
}
@Override
- public FilterResult filter(File contentSyncRoot, String relativeFilePath) {
+ public FilterResult filter(String relativeFilePath) {
if (relativeFilePath.length() > 0 && relativeFilePath.charAt(0) != '/') {
relativeFilePath = '/' + relativeFilePath;