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/02/20 13:36:37 UTC

svn commit: r1661107 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java

Author: rombert
Date: Fri Feb 20 12:36:36 2015
New Revision: 1661107

URL: http://svn.apache.org/r1661107
Log:
SLING-4445 - Don't consider files outside the content sync root when
exporting a project to the server

Modified:
    sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java

Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java?rev=1661107&r1=1661106&r2=1661107&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java Fri Feb 20 12:36:36 2015
@@ -18,9 +18,11 @@ package org.apache.sling.ide.eclipse.ui.
 
 import java.util.Iterator;
 
+import org.apache.sling.ide.eclipse.core.ProjectUtil;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
@@ -60,6 +62,11 @@ public class ExportContentAction extends
                 Shell activeShell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
 
                 ExportWizard wiz = new ExportWizard();
+
+                if (resource instanceof IProject) {
+                    resource = ProjectUtil.getSyncDirectory((IProject) resource);
+                }
+
                 wiz.init(PlatformUI.getWorkbench(), resource);
 
                 WizardDialog dialog = new WizardDialog(activeShell, wiz);