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

non-VFS based FileTemplatesManager

Browse Source
This commit is contained in:
Eugene Zhuravlev
2011-04-09 19:36:08 +02:00
parent f30ae93906
commit b63986dce8
27 changed files with 1465 additions and 1443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+1 -1
View File
@@ -447,7 +447,7 @@ public class CompileDriver {
if (message != null) {
compileContext.addMessage(message);
}
TranslatingCompilerFilesMonitor.getInstance().ensureInitializationCompleted(myProject);
TranslatingCompilerFilesMonitor.getInstance().ensureInitializationCompleted(myProject, compileContext.getProgressIndicator());
doCompile(compileContext, isRebuild, forceCompile, callback, checkCachesVersion);
}
finally {
java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java
+3 -3
View File
@@ -965,16 +965,16 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
}
}
public void ensureInitializationCompleted(Project project) {
public void ensureInitializationCompleted(Project project, ProgressIndicator indicator) {
final int id = getProjectId(project);
synchronized (myInitializationLock) {
while (myInitInProgress.contains(id)) {
if (!project.isOpen() || project.isDisposed()) {
if (!project.isOpen() || project.isDisposed() || (indicator != null && indicator.isCanceled())) {
// makes no sense to continue waiting
break;
}
try {
myInitializationLock.wait();
myInitializationLock.wait(500);
}
catch (InterruptedException ignored) {
break;
java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java
+2 -2
View File
@@ -85,7 +85,7 @@ public class JavaCreateFromTemplateHandler implements CreateFromTemplateHandler
}
static void hackAwayEmptyPackage(PsiJavaFile file, FileTemplate template, Properties props) throws IncorrectOperationException {
if (!template.isJavaClassTemplate()) return;
if (!template.isTemplateOfType(StdFileTypes.JAVA)) return;
String packageName = props.getProperty(FileTemplate.ATTRIBUTE_PACKAGE_NAME);
if(packageName == null || packageName.length() == 0 || packageName.equals(FileTemplate.ATTRIBUTE_PACKAGE_NAME)){
@@ -104,7 +104,7 @@ public class JavaCreateFromTemplateHandler implements CreateFromTemplateHandler
public PsiElement createFromTemplate(final Project project, final PsiDirectory directory, final String fileName, FileTemplate template,
String templateText, Properties props) throws IncorrectOperationException {
String extension = template.getExtension();
PsiElement result = createClassOrInterface(project, directory, templateText, template.isAdjust(), extension);
PsiElement result = createClassOrInterface(project, directory, templateText, template.isReformatCode(), extension);
hackAwayEmptyPackage((PsiJavaFile)result.getContainingFile(), template, props);
return result;
}
java/java-tests/testSrc/com/intellij/ide/fileTemplates/FileTemplatesTest.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class FileTemplatesTest extends IdeaTestCase {
}
finally {
FileTemplateManager.getInstance().saveAll();
FileTemplateManager.getInstance().removeTemplate(template, false);
FileTemplateManager.getInstance().removeTemplate(template);
}
}
}