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

Browse Source
This commit is contained in:
Anna Kozlova
2012-02-03 16:41:19 +04:00
parent fa52d26293 c314cd663a
commit ff45f753a2
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/layouts.gant
+3
View File
@@ -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") {
java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
+3 -8
View File
@@ -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<PsiClas
builder.setValidator(new InputValidatorEx() {
@Override
public String getErrorText(String inputString) {
if (inputString.length() > 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;
}
platform/platform-impl/src/com/intellij/ui/EditorTextField.java
+1
View File
@@ -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);
platform/platform-resources-en/src/messages/ActionsBundle.properties
+1 -1
View File
@@ -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