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 remote branch 'origin/master'

Browse Source
This commit is contained in:
irengrig
2012-06-14 16:50:23 +04:00
parent d4dad4ad82 7b846d20c8
commit f2c105f1b7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/rename/BeanPropertyRenameHandler.java
+6 -3
View File
@@ -44,12 +44,16 @@ public abstract class BeanPropertyRenameHandler implements RenameHandler {
}
public void invoke(@NotNull Project project, Editor editor, PsiFile file, DataContext dataContext) {
final BeanProperty property = getProperty(dataContext);
new PropertyRenameDialog(property, editor).show();
performInvoke(editor, dataContext);
}
public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, DataContext dataContext) {
performInvoke(null, dataContext);
}
private void performInvoke(@Nullable Editor editor, DataContext dataContext) {
final BeanProperty property = getProperty(dataContext);
new PropertyRenameDialog(property, editor).show();
}
public static void doRename(@NotNull final BeanProperty property, final String newName, final boolean searchInComments) {
@@ -89,6 +93,5 @@ public abstract class BeanPropertyRenameHandler implements RenameHandler {
doRename(myProperty, newName, searchInComments);
close(DialogWrapper.OK_EXIT_CODE);
}
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java
+1
View File
@@ -123,6 +123,7 @@ public class MavenModuleBuilderHelper {
if (myArchetype == null) {
try {
VfsUtil.createDirectories(root.getPath() + "/src/main/java");
VfsUtil.createDirectories(root.getPath() + "/src/main/resources");
VfsUtil.createDirectories(root.getPath() + "/src/test/java");
}
catch (IOException e) {