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

Cleanup (obscure method usages replaced)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-11-10 16:10:57 +01:00
parent 7899c01ce5
commit 3c6997e4e1
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java
+2 -1
View File
@@ -109,7 +109,8 @@ public class SaveProjectAsTemplateAction extends AnAction {
}
public static VirtualFile getDescriptionFile(Project project, String path) {
return VfsUtilCore.findRelativeFile(path, project.getBaseDir());
VirtualFile baseDir = project.getBaseDir();
return baseDir != null ? baseDir.findFileByRelativePath(path) : null;
}
public static void saveProject(final Project project,
plugins/devkit/testSources/PluginProjectWizardTest.java
+1 -3
View File
@@ -22,7 +22,6 @@ import com.intellij.ide.IdeBundle;
import com.intellij.ide.projectWizard.NewProjectWizardTestCase;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.idea.devkit.module.PluginModuleType;
import org.jetbrains.idea.devkit.projectRoots.IdeaJdk;
@@ -35,8 +34,7 @@ public class PluginProjectWizardTest extends NewProjectWizardTestCase {
public void testPluginProject() throws Exception {
createSdk("devkit", IdeaJdk.getInstance());
Project project = createProjectFromTemplate(PluginModuleType.getInstance().getName(), null, null);
VirtualFile baseDir = project.getBaseDir();
VirtualFile virtualFile = VfsUtilCore.findRelativeFile("resources/META-INF/plugin.xml", baseDir);
VirtualFile virtualFile = project.getBaseDir().findFileByRelativePath("resources/META-INF/plugin.xml");
assertNotNull(virtualFile);
RunnerAndConfigurationSettings configuration = RunManager.getInstance(project).getSelectedConfiguration();
plugins/gradle/testSources/org/jetbrains/plugins/gradle/GradleProjectWizardTest.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -62,12 +62,12 @@ public class GradleProjectWizardTest extends NewProjectWizardTestCase {
assertEquals(projectName, module.getName());
VirtualFile root = ProjectRootManager.getInstance(project).getContentRoots()[0];
VirtualFile settingsScript = VfsUtilCore.findRelativeFile("settings.gradle", root);
VirtualFile settingsScript = root.findChild("settings.gradle");
assertNotNull(settingsScript);
assertEquals(String.format("rootProject.name = '%s'\n\n", projectName),
StringUtil.convertLineSeparators(VfsUtilCore.loadText(settingsScript)));
VirtualFile buildScript = VfsUtilCore.findRelativeFile("build.gradle", root);
VirtualFile buildScript = root.findChild("build.gradle");
assertNotNull(buildScript);
assertEquals("group '" + projectName + "'\n" +
"version '1.0-SNAPSHOT'\n" +