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

Merge commit 'origin/master'

Browse Source
This commit is contained in:
Sascha Weinreuter
2011-11-23 15:03:09 +01:00
parent f3bc625879 ae644774f9
commit 5f14412803
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/JavaFilePasteProvider.java
+12 -5
View File
@@ -45,16 +45,23 @@ public class JavaFilePasteProvider implements PasteProvider {
final PsiJavaFile javaFile = createJavaFileFromClipboardContent(project);
if (javaFile == null) return;
final PsiClass[] classes = javaFile.getClasses();
if (classes.length != 1) return;
if (classes.length < 1) return;
final PsiDirectory targetDir = ideView.getOrChooseDirectory();
if (targetDir == null) return;
new WriteCommandAction(project, "Paste class '" + classes[0].getName() + "'") {
PsiClass publicClass = classes[0];
for (PsiClass aClass : classes) {
if (aClass.hasModifierProperty(PsiModifier.PUBLIC)) {
publicClass = aClass;
break;
}
}
final PsiClass mainClass = publicClass;
new WriteCommandAction(project, "Paste class '" + mainClass.getName() + "'") {
@Override
protected void run(Result result) throws Throwable {
PsiFile file;
try {
file = targetDir.createFile(classes[0].getName() + ".java");
file = targetDir.createFile(mainClass.getName() + ".java");
}
catch (IncorrectOperationException e) {
return;
@@ -111,7 +118,7 @@ public class JavaFilePasteProvider implements PasteProvider {
return false;
}
PsiJavaFile file = createJavaFileFromClipboardContent(project);
return file != null && file.getClasses().length == 1;
return file != null && file.getClasses().length >= 1;
}
@Nullable