19
19
import java .util .Collection ;
20
20
import java .util .function .Supplier ;
21
21
22
+ import com .intellij .core .CoreBundle ;
22
23
import com .intellij .openapi .application .Application ;
23
24
import com .intellij .openapi .application .ApplicationManager ;
24
25
import com .intellij .openapi .command .WriteCommandAction ;
25
26
import com .intellij .openapi .editor .Document ;
26
- import com .intellij .openapi .fileTypes .StdFileTypes ;
27
+ import com .intellij .openapi .fileTypes .FileType ;
28
+ import com .intellij .openapi .fileTypes .FileTypeManager ;
27
29
import com .intellij .openapi .project .Project ;
28
30
import com .intellij .openapi .util .TextRange ;
29
31
import com .intellij .openapi .vfs .VirtualFile ;
30
- import com .intellij .psi .PsiBundle ;
31
32
import com .intellij .psi .PsiDirectory ;
32
33
import com .intellij .psi .PsiDocumentManager ;
33
34
import com .intellij .psi .PsiElement ;
@@ -48,6 +49,8 @@ class SpringReformatter {
48
49
49
50
private static final String NORMALIZED_LINE_SEPARATOR = "\n " ;
50
51
52
+ private static final FileType JAVA_FILE_TYPE = FileTypeManager .getInstance ().getStdFileType ("JAVA" );
53
+
51
54
private final Supplier <Project > project ;
52
55
53
56
private final Supplier <Application > application ;
@@ -68,7 +71,7 @@ class SpringReformatter {
68
71
}
69
72
70
73
public boolean canReformat (PsiFile file ) {
71
- return StdFileTypes . JAVA .equals (file .getFileType ());
74
+ return JAVA_FILE_TYPE .equals (file .getFileType ());
72
75
}
73
76
74
77
public void reformat (PsiFile file , Collection <TextRange > ranges ) {
@@ -83,7 +86,7 @@ public void reformat(PsiFile file, Collection<TextRange> ranges) {
83
86
private void throwNotWritableException (PsiElement element ) throws IncorrectOperationException {
84
87
if (element instanceof PsiDirectory ) {
85
88
String url = ((PsiDirectory ) element ).getVirtualFile ().getPresentableUrl ();
86
- throw new IncorrectOperationException (PsiBundle .message ("cannot.modify.a.read.only.directory" , url ));
89
+ throw new IncorrectOperationException (CoreBundle .message ("cannot.modify.a.read.only.directory" , url ));
87
90
}
88
91
PsiFile file = element .getContainingFile ();
89
92
if (file == null ) {
@@ -94,7 +97,7 @@ private void throwNotWritableException(PsiElement element) throws IncorrectOpera
94
97
throw new IncorrectOperationException ();
95
98
}
96
99
throw new IncorrectOperationException (
97
- PsiBundle .message ("cannot.modify.a.read.only.file" , virtualFile .getPresentableUrl ()));
100
+ CoreBundle .message ("cannot.modify.a.read.only.file" , virtualFile .getPresentableUrl ()));
98
101
}
99
102
100
103
private void reformat (PsiFile file , Collection <TextRange > ranges , Document document ) {
0 commit comments