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 2013/09/13 17:28:19 UTC
svn commit: r1522976 -
/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Author: rombert
Date: Fri Sep 13 15:28:19 2013
New Revision: 1522976
URL: http://svn.apache.org/r1522976
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Fix loading of filter file when importing repository contents
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java?rev=1522976&r1=1522975&r2=1522976&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java Fri Sep 13 15:28:19 2013
@@ -106,8 +106,11 @@ public class ImportRepositoryContentActi
if (filterFile != null && filterFile.exists()) {
try {
contents = filterFile.getContents();
+ filter = filterLocator.loadFilter(contents);
} catch (CoreException e) {
throw new InvocationTargetException(e);
+ } catch (IOException e) {
+ throw new InvocationTargetException(e);
} finally {
if (contents != null) {
try {
@@ -119,12 +122,6 @@ public class ImportRepositoryContentActi
}
}
- try {
- filter = filterLocator.loadFilter(contents);
- } catch (IOException e) {
- throw new InvocationTargetException(e);
- }
-
monitor.worked(5);
try {