MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

replaced FileTypeRegistry.getFileTypeByFile() with file.getFileType()

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-10-21 20:03:06 +04:00
parent 158761f472
commit 5452af70e7
55 changed files with 65 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/actions/RunToCursorActionHandler.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class RunToCursorActionHandler extends DebuggerActionHandler {
}
final VirtualFile virtualFile = file.getVirtualFile();
FileType fileType = virtualFile != null ? fileTypeManager.getFileTypeByFile(virtualFile) : null;
FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
if (DebuggerUtils.supportsJVMDebugging(fileType) || DebuggerUtils.supportsJVMDebugging(file)) {
DebuggerSession debuggerSession = DebuggerManagerEx.getInstanceEx(project).getContext().getDebuggerSession();
return debuggerSession != null && debuggerSession.isPaused();
java/debugger/impl/src/com/intellij/debugger/actions/ToggleBreakpointEnabledAction.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class ToggleBreakpointEnabledAction extends AnAction {
FileTypeManager fileTypeManager = FileTypeManager.getInstance();
final VirtualFile virtualFile = file.getVirtualFile();
FileType fileType = virtualFile != null ? fileTypeManager.getFileTypeByFile(virtualFile) : null;
FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
if (DebuggerUtils.supportsJVMDebugging(fileType) || DebuggerUtils.supportsJVMDebugging(file)) {
Breakpoint breakpoint = findBreakpoint(project);
if (breakpoint == null) {
java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
+1 -1
View File
@@ -176,7 +176,7 @@ public class ToggleFieldBreakpointAction extends AnAction {
if (file != null) {
FileTypeManager fileTypeManager = FileTypeManager.getInstance();
final VirtualFile virtualFile = file.getVirtualFile();
FileType fileType = virtualFile != null ? fileTypeManager.getFileTypeByFile(virtualFile) : null;
FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
if (StdFileTypes.JAVA == fileType || StdFileTypes.CLASS == fileType) {
final PsiField field = FieldBreakpoint.findField(project, document, editor.getCaretModel().getOffset());
if(field != null){
java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class ToggleMethodBreakpointAction extends AnAction {
if (file != null) {
FileTypeManager fileTypeManager = FileTypeManager.getInstance();
final VirtualFile virtualFile = file.getVirtualFile();
FileType fileType = virtualFile != null ? fileTypeManager.getFileTypeByFile(virtualFile) : null;
FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
if (StdFileTypes.JAVA == fileType || StdFileTypes.CLASS == fileType) {
method = findMethod(project, editor);
}
java/debugger/impl/src/com/intellij/debugger/impl/HotSwapManager.java
+2 -2
View File
@@ -88,7 +88,7 @@ public class HotSwapManager extends AbstractProjectComponent {
return;
}
progress.setText(DebuggerBundle.message("progress.hotswap.scanning.path", filePath));
if(file.getFileSystem() instanceof JarFileSystem && FileTypes.ARCHIVE.equals(fileTypeManager.getFileTypeByFile(file))) {
if(file.getFileSystem() instanceof JarFileSystem && FileTypes.ARCHIVE.equals(file.getFileType())) {
if(file.getTimeStamp() > timeStamp) {
super.acceptDirectory(file, fileRoot, filePath);
}
@@ -102,7 +102,7 @@ public class HotSwapManager extends AbstractProjectComponent {
if (progress.isCancelled()) {
return;
}
if (file.getTimeStamp() > timeStamp && StdFileTypes.CLASS.equals(fileTypeManager.getFileTypeByFile(file))) {
if (file.getTimeStamp() > timeStamp && StdFileTypes.CLASS.equals(file.getFileType())) {
//noinspection HardCodedStringLiteral
if (SystemInfo.isFileSystemCaseSensitive? filePath.endsWith(CLASS_EXTENSION) : StringUtil.endsWithIgnoreCase(filePath, CLASS_EXTENSION)) {
progress.setText(DebuggerBundle.message("progress.hotswap.scanning.path", filePath));