diff options
4 files changed, 18 insertions, 12 deletions
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java index 7b9d0deaf..d87513598 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java @@ -15,6 +15,7 @@ package org.eclipse.jdt.debug.ui.launchConfigurations; +import java.util.List; import java.util.Map; import org.eclipse.core.resources.IProject; @@ -332,13 +333,18 @@ public class JavaJRETab extends JavaLaunchTab { if(vmver != null) { int val = JavaCore.compareJavaVersions(compliance, vmver); if(val > 0) { - String setting = null; - if (environmentId == null) { - setting = LauncherMessages.JavaJRETab_2; - } else { - setting = LauncherMessages.JavaJRETab_1; + List<String> allVersions = JavaCore.getAllVersions(); + String latest = allVersions.get(allVersions.size() - 1); + if (JavaCore.compareJavaVersions(vmver, latest) <= 0) { + String setting = null; + if (environmentId == null) { + setting = LauncherMessages.JavaJRETab_2; + } else { + setting = LauncherMessages.JavaJRETab_1; + } + return new Status(IStatus.ERROR, IJavaDebugUIConstants.PLUGIN_ID, IStatus.ERROR, NLS.bind(LauncherMessages.JavaJRETab_0, new String[] { + setting, source, compliance }), null); } - return new Status(IStatus.ERROR, IJavaDebugUIConstants.PLUGIN_ID, IStatus.ERROR, NLS.bind(LauncherMessages.JavaJRETab_0, new String[] {setting, source, compliance}), null); } } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java index d08ef1392..fface6e75 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java @@ -23,6 +23,7 @@ import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jdt.core.manipulation.SharedASTProviderCore; import org.eclipse.jdt.debug.core.IJavaLineBreakpoint; import org.eclipse.jdt.debug.core.IJavaPatternBreakpoint; import org.eclipse.jdt.debug.core.IJavaStratumLineBreakpoint; @@ -31,7 +32,6 @@ import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin; import org.eclipse.jdt.internal.debug.core.JavaDebugUtils; import org.eclipse.jdt.internal.debug.core.breakpoints.JavaLineBreakpoint; import org.eclipse.jdt.internal.debug.core.breakpoints.ValidBreakpointLocationLocator; -import org.eclipse.jdt.ui.SharedASTProvider; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -107,7 +107,7 @@ public class BreakpointMarkerUpdater implements IMarkerUpdater { if(cunit == null) { return false; } - CompilationUnit unit = SharedASTProvider.getAST(cunit, SharedASTProvider.WAIT_YES, null); + CompilationUnit unit = SharedASTProviderCore.getAST(cunit, SharedASTProviderCore.WAIT_YES, null); if(unit == null) { //remove it - in case it would be left in a bad location return false; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java index 82305741c..8fd5d6f90 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java @@ -39,6 +39,7 @@ import org.eclipse.jdt.core.dom.NodeFinder; import org.eclipse.jdt.core.dom.QualifiedName; import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor; import org.eclipse.jdt.core.dom.ThisExpression; +import org.eclipse.jdt.core.manipulation.SharedASTProviderCore; import org.eclipse.jdt.debug.core.IJavaDebugTarget; import org.eclipse.jdt.debug.core.IJavaObject; import org.eclipse.jdt.debug.core.IJavaReferenceType; @@ -51,7 +52,6 @@ import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin; import org.eclipse.jdt.internal.debug.core.logicalstructures.JDIPlaceholderVariable; import org.eclipse.jdt.internal.debug.eval.ast.engine.ASTEvaluationEngine; import org.eclipse.jdt.ui.JavaUI; -import org.eclipse.jdt.ui.SharedASTProvider; import org.eclipse.jdt.ui.text.java.hover.IJavaEditorTextHover; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; @@ -349,7 +349,7 @@ public class JavaDebugHover implements IJavaEditorTextHover, ITextHoverExtension return null; } ITypeRoot typeRoot = (ITypeRoot) codeAssist; - ASTNode root= SharedASTProvider.getAST(typeRoot, SharedASTProvider.WAIT_NO, null); + ASTNode root = SharedASTProviderCore.getAST(typeRoot, SharedASTProviderCore.WAIT_NO, null); if (root == null) { ASTParser parser = ASTParser.newParser(AST.JLS4); parser.setSource(typeRoot); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java index 2a805ffcb..aadbb3862 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java @@ -67,6 +67,7 @@ import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.NodeFinder; import org.eclipse.jdt.core.dom.SimpleName; import org.eclipse.jdt.core.dom.SimpleType; +import org.eclipse.jdt.core.manipulation.SharedASTProviderCore; import org.eclipse.jdt.debug.core.IJavaBreakpoint; import org.eclipse.jdt.debug.core.IJavaClassPrepareBreakpoint; import org.eclipse.jdt.debug.core.IJavaFieldVariable; @@ -90,7 +91,6 @@ import org.eclipse.jdt.internal.ui.text.template.contentassist.TemplateEngine; import org.eclipse.jdt.internal.ui.text.template.contentassist.TemplateProposal; import org.eclipse.jdt.ui.IWorkingCopyManager; import org.eclipse.jdt.ui.JavaUI; -import org.eclipse.jdt.ui.SharedASTProvider; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialogWithToggle; @@ -1217,7 +1217,7 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTargetExtensio */ static CompilationUnit parseCompilationUnit(ITypeRoot root) { if(root != null) { - return SharedASTProvider.getAST(root, SharedASTProvider.WAIT_YES, null); + return SharedASTProviderCore.getAST(root, SharedASTProviderCore.WAIT_YES, null); } return null; } |