From c30a15be0012ada7b37566a91e1b9545767ded23 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 3 Feb 2012 11:44:00 +0100 Subject: [PATCH 1/4] create class accepts qualified name, not just single identifier (IDEA-80800) --- .../com/intellij/ide/actions/CreateClassAction.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java b/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java index d8539d264b5c..89966b56a7e6 100644 --- a/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java +++ b/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java @@ -22,17 +22,12 @@ import com.intellij.ide.fileTemplates.FileTemplateManager; import com.intellij.ide.fileTemplates.JavaCreateFromTemplateHandler; import com.intellij.ide.fileTemplates.JavaTemplateUtil; import com.intellij.ide.highlighter.JavaFileType; -import com.intellij.lang.LanguageNamesValidation; -import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.openapi.ui.InputValidatorEx; import com.intellij.openapi.util.text.StringUtil; import com.intellij.pom.java.LanguageLevel; -import com.intellij.psi.JavaDirectoryService; -import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiDirectory; -import com.intellij.psi.PsiElement; +import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; @@ -70,8 +65,8 @@ public class CreateClassAction extends JavaCreateTemplateInPackageAction 0 && !LanguageNamesValidation.INSTANCE.forLanguage(JavaLanguage.INSTANCE).isIdentifier(inputString, project)) { - return "This is not a valid Java identifier"; + if (inputString.length() > 0 && !JavaPsiFacade.getInstance(project).getNameHelper().isQualifiedName(inputString)) { + return "This is not a valid Java qualified name"; } return null; } From 6832a596089c73e6d87060efeb05b864443cf000 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 3 Feb 2012 11:56:00 +0100 Subject: [PATCH 2/4] mnemonic (IDEA-62975) --- .../platform-resources-en/src/messages/ActionsBundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties index e8ba69be03c1..a5150687296c 100644 --- a/platform/platform-resources-en/src/messages/ActionsBundle.properties +++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties @@ -776,7 +776,7 @@ action.CloseAllUnmodifiedEditors.text=Close _Unmodified action.CloseAllUnmodifiedEditors.description=Close all non-modified editors action.CloseAllUnpinnedEditors.text=Close All But Pinned action.CloseAllUnpinnedEditors.description=Close all editors which are not pinned -action.CloseContent.text=Close +action.CloseContent.text=_Close action.CloseContent.description=Close currently focused content group.EditorTabsGroup.text=Editor _Tabs action.SplitVertically.text=Split _Vertically From 80b49b08a2862e6da76861da5f28707e1d1fd003 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 3 Feb 2012 11:59:28 +0100 Subject: [PATCH 3/4] disable font resizing by ctrl+wheel in editor text fields (IDEA-62449) --- platform/platform-impl/src/com/intellij/ui/EditorTextField.java | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java index 1ef119ae9774..1731856fc0e5 100644 --- a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java +++ b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java @@ -463,6 +463,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, settings.setLineMarkerAreaShown(false); settings.setIndentGuidesShown(false); settings.setVirtualSpace(false); + settings.setWheelFontChangeEnabled(false); editor.setHorizontalScrollbarVisible(false); editor.setVerticalScrollbarVisible(false); editor.setCaretEnabled(!myIsViewer); From ab3c5b0905fbc4068ef7b8f1d3787069b189d11a Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 3 Feb 2012 13:39:11 +0100 Subject: [PATCH 4/4] bring back new svn4idea --- build/scripts/layouts.gant | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 8ff3cb98ebf2..c26409ec2350 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -249,6 +249,9 @@ public def layoutCommunityPlugins(String home) { layoutPlugin("svn4ideaOld") { fileset(dir: "$home/plugins/svn4ideaOld/lib", excludes: "**/svnkitsrc.zip") } + layoutPlugin("svn4idea") { + fileset(dir: "$home/plugins/svn4idea/lib", excludes: "**/svnkitsrc.zip") + } layoutPlugin("junit", "junit", "idea-junit") { jar("junit-rt.jar") {