Added a fix for 1.0.3.4-beta1 for the failing Import From action.

Author: schaefa

.idea/misc.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>com.headwire.aem.tooling.intellij</id>
     <name>AEM IDE Tooling 4 IntelliJ</name>
-    <version>1.0.3.3</version>
+    <version>1.0.3.4-beta1</version>
     <vendor email="aemintellijplugin@headwire.com" url="https://www.headwire.com/aemintellijplugin">headwire.com Inc</vendor>
 
     <description><![CDATA[
@@ -16,6 +16,14 @@
 
     <change-notes><![CDATA[
         <ul>
+            <li>1.0.3.4-beta1:
+                <ol>
+                    <li>
+                        Added a fix of a threading issue inside the Import From action. IntelliJ does not permit (anymore)
+                        to write in an User Action.
+                    </li>
+                </ol>
+            </li>
             <li>1.0.3.3:
                 <ol>
                     <li>

.idea/modules.xml

@@ -6,6 +6,8 @@ This plugin requires to run IntelliJ IDEA **2016.2** or higher.
 
 #### Releases:
 
+Beta of 1.0.3.4 is out with a fix for the Import From action.
+ 
 Release of 1.0.3.3 is out. Check out in the release section.
 
 **Attention**: due to changes inside IntelliJ APIs some stored data might be lost during
@@ -45,6 +47,10 @@ The **master** is the latest release code and it the same as the highest
 
 #### Updates:
 
+**1.0.3.4-beta1**:
+* A fix for the Import From User Action that fails because I cannot write from a
+  User Action.
+
 **1.0.3.3**:
 * Working on issues with latest IntelliJ Releases.
 * All threading is centralized in single class and with it fixed some issues with threading

META-INF/plugin.xml

@@ -32,6 +32,7 @@
 import com.headwire.aem.tooling.intellij.util.ExecutionUtil;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
@@ -117,36 +118,40 @@ private void doImport(final Project project, final VirtualFile file) {
             final ServerConfiguration.Module currentModule = currentModuleLookup;
             InvokableRunner runnable = new InvokableRunner(ModalityState.NON_MODAL) {
                 public void run() {
-                    IServer server = new IServer(currentModule.getParent());
-                    String path = file.getPath();
-                    String modulePath = currentModule.getUnifiedModule().getModuleDirectory();
-                    String relativePath = path.substring(modulePath.length());
-                    if(relativePath.startsWith("/")) {
-                        relativePath = relativePath.substring(1);
-                    }
-                    IPath projectRelativePath = new IPath(relativePath);
-                    IProject iProject = new IProject(currentModule);
-                    SerializationManager serializationManager = ComponentProvider.getComponent(project, SerializationManager.class);
+                    ApplicationManager.getApplication().runWriteAction(
+                        () -> {
+                            IServer server = new IServer(currentModule.getParent());
+                            String path = file.getPath();
+                            String modulePath = currentModule.getUnifiedModule().getModuleDirectory();
+                            String relativePath = path.substring(modulePath.length());
+                            if(relativePath.startsWith("/")) {
+                                relativePath = relativePath.substring(1);
+                            }
+                            IPath projectRelativePath = new IPath(relativePath);
+                            IProject iProject = new IProject(currentModule);
+                            SerializationManager serializationManager = ComponentProvider.getComponent(project, SerializationManager.class);
 
-                    try {
-                        ImportRepositoryContentManager importManager = new ImportRepositoryContentManager(server, projectRelativePath, iProject, serializationManager);
-                        importManager.doImport(new NullProgressMonitor());
-                    } catch(CoreException e) {
-                        boolean done = false;
-                        if(e.getCause() instanceof org.apache.sling.ide.transport.RepositoryException) {
-                            if(e.getCause().getCause() instanceof PathNotFoundException) {
-                                if(messageManager != null) {
-                                    messageManager.sendDebugNotification("import.from.remote.resource.not.found", relativePath);
-                                    done = true;
+                            try {
+                                ImportRepositoryContentManager importManager = new ImportRepositoryContentManager(server, projectRelativePath, iProject, serializationManager);
+                                importManager.doImport(new NullProgressMonitor());
+                            } catch(CoreException e) {
+                                boolean done = false;
+                                if(e.getCause() instanceof org.apache.sling.ide.transport.RepositoryException) {
+                                    if(e.getCause().getCause() instanceof PathNotFoundException) {
+                                        if(messageManager != null) {
+                                            messageManager.sendDebugNotification("import.from.remote.resource.not.found", relativePath);
+                                            done = true;
+                                        }
+                                    }
                                 }
+                                if(!done && messageManager != null) { messageManager.sendDebugNotification("import.from.failed", e); }
+                            } catch(InterruptedException e) {
+                                if(messageManager != null) { messageManager.sendDebugNotification("import.from.failed", e); }
+                            } catch(SerializationException e) {
+                                if(messageManager != null) { messageManager.sendDebugNotification("import.from.failed", e); }
                             }
                         }
-                        if(!done && messageManager != null) { messageManager.sendDebugNotification("import.from.failed", e); }
-                    } catch(InterruptedException e) {
-                        if(messageManager != null) { messageManager.sendDebugNotification("import.from.failed", e); }
-                    } catch(SerializationException e) {
-                        if(messageManager != null) { messageManager.sendDebugNotification("import.from.failed", e); }
-                    }
+                    );
                 }
             };
             invokeAndWait(runnable);