MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

WI-33147 Project templates: Sometimes iml of an attached project can't be found

Browse Source
This commit is contained in:
Shaverdova Elena
2016-09-05 20:20:28 +02:00
parent 53375a6d10
commit a000ad207b
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/platform/templates/ArchivedProjectTemplate.java
+2 -1
View File
@@ -111,7 +111,8 @@ public abstract class ArchivedProjectTemplate implements ProjectTemplate {
return null;
}
public void handleUnzippedDirectories(File dir) throws IOException {
public void handleUnzippedDirectories(File dir, List<File> filesToRefresh) throws IOException {
filesToRefresh.add(dir);
}
public static abstract class StreamProcessor<T> {
platform/lang-impl/src/com/intellij/platform/templates/LocalArchivedTemplate.java
+2 -1
View File
@@ -195,7 +195,7 @@ public class LocalArchivedTemplate extends ArchivedProjectTemplate {
}
@Override
public void handleUnzippedDirectories(File dir) throws IOException {
public void handleUnzippedDirectories(File dir, List<File> filesToRefresh) throws IOException {
if (myModuleDescriptions == null) {
return;
}
@@ -207,6 +207,7 @@ public class LocalArchivedTemplate extends ArchivedProjectTemplate {
target.mkdirs();
FileUtil.copyDir(root, target);
FileUtil.delete(root);
filesToRefresh.add(target);
}
}
platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java
+12 -5
View File
@@ -67,6 +67,7 @@ import org.jetbrains.jps.model.serialization.PathMacroUtil;
import javax.swing.*;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.zip.ZipInputStream;
@@ -267,6 +268,7 @@ public class TemplateModuleBuilder extends ModuleBuilder {
}
ExceptionConsumer consumer = new ExceptionConsumer();
List<File> filesToRefresh = new ArrayList<>();
myTemplate.processStream(new ArchivedProjectTemplate.StreamProcessor<Void>() {
@Override
public Void consume(@NotNull ZipInputStream stream) throws IOException {
@@ -283,7 +285,7 @@ public class TemplateModuleBuilder extends ModuleBuilder {
}
}, true);
myTemplate.handleUnzippedDirectories(dir);
myTemplate.handleUnzippedDirectories(dir, filesToRefresh);
return null;
}
@@ -301,11 +303,16 @@ public class TemplateModuleBuilder extends ModuleBuilder {
throw new IOException("Can't rename " + from + " to " + to);
}
}
VirtualFile virtualFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(dir);
if (virtualFile == null) {
throw new IOException("Can't find " + dir);
RefreshQueue refreshQueue = RefreshQueue.getInstance();
LOG.assertTrue(!filesToRefresh.isEmpty());
for (File file : filesToRefresh) {
VirtualFile virtualFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file);
if (virtualFile == null) {
throw new IOException("Can't find " + file);
}
refreshQueue.refresh(false, true, null, virtualFile);
}
RefreshQueue.getInstance().refresh(false, true, null, virtualFile);
consumer.reportFailures();
}