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 2014/10/10 00:04:55 UTC
svn commit: r1630600 - in /sling/trunk/tooling/ide:
api/src/org/apache/sling/ide/filter/Filter.java
impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilter.java
Author: rombert
Date: Thu Oct 9 22:04:55 2014
New Revision: 1630600
URL: http://svn.apache.org/r1630600
Log:
SLING-3573 - Local resources which are no longer present in the
repository are not deleted when importing
Clarify javadoc and remove TODOs in Filter, VltFilter
Modified:
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.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=1630600&r1=1630599&r2=1630600&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 Thu Oct 9 22:04:55 2014
@@ -21,9 +21,11 @@ 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 relativeFilePath a relative path
- * @return the filter result
+ * @param path a path in repository format
+ * @return the filter result, never <code>null</code>
*/
- FilterResult filter(File contentSyncRoot, String relativeFilePath);
+ FilterResult filter(File contentSyncRoot, String path);
}
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=1630600&r1=1630599&r2=1630600&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 Thu Oct 9 22:04:55 2014
@@ -44,8 +44,6 @@ public class VltFilter implements Filter
@Override
public FilterResult filter(File contentSyncRoot, String relativeFilePath) {
- // TODO - is this the right check? I _think_ that filter paths are repository-based, not fs-based
- // so this could be incorrect
if (relativeFilePath.length() > 0 && relativeFilePath.charAt(0) != '/') {
relativeFilePath = '/' + relativeFilePath;