diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java index 26b01f25298e..9030a1bc2e2c 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java @@ -539,24 +539,6 @@ public abstract class DebuggerUtils { public abstract PsiClass chooseClassDialog(String title, Project project); - /** - * Don't use directly, will be private in IDEA 14. - * @deprecated to remove in IDEA 15 - */ - @Deprecated - public static boolean supportsJVMDebugging(FileType type) { - return type instanceof LanguageFileType && ((LanguageFileType)type).isJVMDebuggingSupported(); - } - - /** - * @deprecated Use {@link #isBreakpointAware(com.intellij.psi.PsiFile)} - * to remove in IDEA 15 - */ - @Deprecated - public static boolean supportsJVMDebugging(@NotNull PsiFile file) { - return isBreakpointAware(file); - } - /** * IDEA-122113 * Will be removed when Java debugger will be moved to XDebugger API @@ -572,7 +554,7 @@ public abstract class DebuggerUtils { @SuppressWarnings("deprecation") private static boolean isDebugAware(@NotNull PsiFile file, boolean breakpointAware) { FileType fileType = file.getFileType(); - if (supportsJVMDebugging(fileType)) { + if (fileType instanceof LanguageFileType && ((LanguageFileType)fileType).isJVMDebuggingSupported()) { return true; } @@ -581,12 +563,6 @@ public abstract class DebuggerUtils { return true; } } - - for (JVMDebugProvider provider : JVMDebugProvider.EP_NAME.getExtensions()) { - if (provider.supportsJVMDebugging(file)) { - return true; - } - } return false; } } diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/JVMDebugProvider.java b/java/debugger/openapi/src/com/intellij/debugger/engine/JVMDebugProvider.java deleted file mode 100644 index 26430740acf7..000000000000 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/JVMDebugProvider.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.debugger.engine; - -import com.intellij.openapi.extensions.ExtensionPointName; -import com.intellij.psi.PsiFile; - -/** - * @deprecated Use {@link com.intellij.debugger.engine.JavaDebugAware} - * to remove in IDEA 15 - */ -@Deprecated -public interface JVMDebugProvider { - ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.debugger.jvmDebugProvider"); - - boolean supportsJVMDebugging(PsiFile file); -} diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 04e7ee32d1b6..2cfbabe396a1 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -120,8 +120,6 @@ -