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

IDEA-125442 Strip .java from classname when creating new class

Browse Source
This commit is contained in:
peter
2014-06-02 17:29:53 +02:00
parent 571196f186
commit 3dd0451d42
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
+5
View File
@@ -83,6 +83,11 @@ public class CreateClassAction extends JavaCreateTemplateInPackageAction<PsiClas
});
}
@Override
protected String removeExtension(String templateName, String className) {
return super.removeExtension(templateName, StringUtil.trimEnd(className, ".java"));
}
@Override
protected String getErrorTitle() {
return IdeBundle.message("title.cannot.create.class");
platform/lang-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
+9 -7
View File
@@ -20,7 +20,6 @@ import com.intellij.ide.IdeView;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
@@ -83,12 +82,7 @@ public abstract class CreateTemplateInPackageAction<T extends PsiElement> extend
@Nullable
private T checkOrCreate(String newName, PsiDirectory directory, String templateName) throws IncorrectOperationException {
PsiDirectory dir = directory;
String className = newName;
final String extension = StringUtil.getShortName(templateName);
if (StringUtil.isNotEmpty(extension)) {
className = StringUtil.trimEnd(className, "." + extension);
}
String className = removeExtension(templateName, newName);
if (className.contains(".")) {
String[] names = className.split("\\.");
@@ -110,6 +104,14 @@ public abstract class CreateTemplateInPackageAction<T extends PsiElement> extend
return doCreate(dir, className, templateName);
}
protected String removeExtension(String templateName, String className) {
final String extension = StringUtil.getShortName(templateName);
if (StringUtil.isNotEmpty(extension)) {
className = StringUtil.trimEnd(className, "." + extension);
}
return className;
}
@Nullable
protected abstract T doCreate(final PsiDirectory dir, final String className, String templateName) throws IncorrectOperationException;