From 403da2e3211cef211cf278abfe565c8d4b6ba5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Thu, 14 Jun 2012 14:14:01 +0200 Subject: [PATCH 1/2] IDEA-87235 Spring webflow: binder@binding@property rename is incorrect when performed from Structure view --- .../refactoring/rename/BeanPropertyRenameHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/rename/BeanPropertyRenameHandler.java b/java/java-impl/src/com/intellij/refactoring/rename/BeanPropertyRenameHandler.java index 0b6366742815..4c41a438cffc 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/BeanPropertyRenameHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/BeanPropertyRenameHandler.java @@ -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); } - } } From 7b846d20c88d0a2228ca74be7485f6fe0616dd8f Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Thu, 14 Jun 2012 16:35:04 +0400 Subject: [PATCH 2/2] IDEA-87280 ('Create new maven module' does not create standard maven /resources folder) --- .../jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java index 3e40d8780479..b705bd671c73 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java @@ -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) {