diff options
author | Stephan Herrmann | 2019-05-07 19:03:16 +0000 |
---|---|---|
committer | Stephan Herrmann | 2019-05-07 19:03:16 +0000 |
commit | 4b5bfc33f5ddf94255b23a5a261ff5c301eed0e9 (patch) | |
tree | 4fa8af6ca05a53c4d7dd2ac28156b59bc357707a | |
parent | ac6ae791d1d46f80e0ab2393af9ef2a320f9e6a3 (diff) | |
download | org.eclipse.objectteams-4b5bfc33f5ddf94255b23a5a261ff5c301eed0e9.tar.gz org.eclipse.objectteams-4b5bfc33f5ddf94255b23a5a261ff5c301eed0e9.tar.xz org.eclipse.objectteams-4b5bfc33f5ddf94255b23a5a261ff5c301eed0e9.zip |
Resolved some warnings
9 files changed, 17 insertions, 17 deletions
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF index d3b2dd218..c30069aee 100644 --- a/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF @@ -18,6 +18,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.ui.editors;bundle-version="[3.7.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)", + org.eclipse.jdt.core.manipulation;bundle-version="[1.11.200,2.0.0)", org.eclipse.jdt.ui;bundle-version="[3.10.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.6.0,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)", diff --git a/plugins/org.eclipse.objectteams.otdt.debug.ui/src/org/eclipse/objectteams/otdt/debug/ui/internal/actions/OTBreakpointLocationVerifierJob.java b/plugins/org.eclipse.objectteams.otdt.debug.ui/src/org/eclipse/objectteams/otdt/debug/ui/internal/actions/OTBreakpointLocationVerifierJob.java index fcbcd4089..cfda27a8e 100644 --- a/plugins/org.eclipse.objectteams.otdt.debug.ui/src/org/eclipse/objectteams/otdt/debug/ui/internal/actions/OTBreakpointLocationVerifierJob.java +++ b/plugins/org.eclipse.objectteams.otdt.debug.ui/src/org/eclipse/objectteams/otdt/debug/ui/internal/actions/OTBreakpointLocationVerifierJob.java @@ -117,7 +117,7 @@ public class OTBreakpointLocationVerifierJob extends Job { } public IStatus run(IProgressMonitor monitor) { - ASTParser parser = ASTParser.newParser(AST.JLS8); + ASTParser parser = ASTParser.newParser(AST.JLS12); char[] source = fDocument.get().toCharArray(); parser.setSource(source); IJavaElement javaElement = JavaCore.create(fResource); @@ -168,7 +168,7 @@ public class OTBreakpointLocationVerifierJob extends Job { } } if (unitName != null) { - parser = ASTParser.newParser(AST.JLS8); + parser = ASTParser.newParser(AST.JLS12); parser.setSource(source); parser.setProject(project); parser.setUnitName(unitName); diff --git a/plugins/org.eclipse.objectteams.otdt.debug.ui/src/org/eclipse/objectteams/otdt/debug/ui/internal/actions/OTToggleBreakpointAdapter.java b/plugins/org.eclipse.objectteams.otdt.debug.ui/src/org/eclipse/objectteams/otdt/debug/ui/internal/actions/OTToggleBreakpointAdapter.java index a1001fb05..adf65f746 100644 --- a/plugins/org.eclipse.objectteams.otdt.debug.ui/src/org/eclipse/objectteams/otdt/debug/ui/internal/actions/OTToggleBreakpointAdapter.java +++ b/plugins/org.eclipse.objectteams.otdt.debug.ui/src/org/eclipse/objectteams/otdt/debug/ui/internal/actions/OTToggleBreakpointAdapter.java @@ -44,6 +44,7 @@ import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IOrdinaryClassFile; import org.eclipse.jdt.core.IPackageDeclaration; import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; @@ -78,7 +79,7 @@ import org.eclipse.jdt.internal.debug.ui.actions.ActionDelegateHelper; import org.eclipse.jdt.internal.debug.ui.actions.ActionMessages; import org.eclipse.jdt.ui.IWorkingCopyManager; import org.eclipse.jdt.ui.JavaUI; -import org.eclipse.jdt.ui.SharedASTProvider; +import org.eclipse.jdt.core.manipulation.SharedASTProviderCore; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.text.BadLocationException; @@ -1136,8 +1137,8 @@ public class OTToggleBreakpointAdapter implements IToggleBreakpointsTargetExtens break; } } - } else if (element instanceof IClassFile) { - type = ((IClassFile) element).getType(); + } else if (element instanceof IOrdinaryClassFile) { + type = ((IOrdinaryClassFile) element).getType(); } if (type != null) { String[] sigs = Signature.getParameterTypes(signature); @@ -1208,7 +1209,7 @@ public class OTToggleBreakpointAdapter implements IToggleBreakpointsTargetExtens */ 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; } diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor/OverrideRoleCompletionProposal.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor/OverrideRoleCompletionProposal.java index 182ce13a1..5507b6e83 100644 --- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor/OverrideRoleCompletionProposal.java +++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor/OverrideRoleCompletionProposal.java @@ -37,12 +37,12 @@ import org.eclipse.jdt.core.dom.rewrite.ASTRewrite; import org.eclipse.jdt.core.dom.rewrite.ITrackedNodePosition; import org.eclipse.jdt.core.dom.rewrite.ImportRewrite; import org.eclipse.jdt.core.formatter.IndentManipulation; +import org.eclipse.jdt.core.manipulation.SharedASTProviderCore; import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings; import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings; import org.eclipse.jdt.internal.ui.text.java.JavaTypeCompletionProposal; import org.eclipse.jdt.internal.ui.text.java.TypeProposalInfo; -import org.eclipse.jdt.ui.SharedASTProvider; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -95,7 +95,7 @@ protected class OverrideRoleCompletionProposal extends JavaTypeCompletionProposa } private CompilationUnit getRecoveredAST(IDocument document, int offset, Document recoveredDocument) { - CompilationUnit ast= SharedASTProvider.getAST(fCompilationUnit, SharedASTProvider.WAIT_ACTIVE_ONLY, null); + CompilationUnit ast= SharedASTProviderCore.getAST(fCompilationUnit, SharedASTProviderCore.WAIT_ACTIVE_ONLY, null); if (ast != null) { recoveredDocument.set(document.get()); return ast; @@ -112,7 +112,7 @@ protected class OverrideRoleCompletionProposal extends JavaTypeCompletionProposa recoveredDocument.set(new String(content)); - final ASTParser parser= ASTParser.newParser(AST.JLS8); + final ASTParser parser= ASTParser.newParser(AST.JLS12); parser.setResolveBindings(true); parser.setStatementsRecovery(true); parser.setSource(content); diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/OTQuickFixes.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/OTQuickFixes.java index d3110bdc5..c24429e92 100644 --- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/OTQuickFixes.java +++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/OTQuickFixes.java @@ -320,7 +320,6 @@ public team class OTQuickFixes { ImportRewrite getImportRewrite() -> ImportRewrite getImportRewrite(); ImportRewrite createImportRewrite(CompilationUnit astRoot) -> ImportRewrite createImportRewrite(CompilationUnit astRoot); - @SuppressWarnings("decapsulation") LinkedProposalModel getLinkedProposalModel() -> LinkedProposalModel getLinkedProposalModel(); void addLinkedPosition(ITrackedNodePosition position, boolean isFirst, String groupID) @@ -368,7 +367,6 @@ public team class OTQuickFixes { result |= Modifier.STATIC; return result; } - @SuppressWarnings("decapsulation") int evaluateModifiers(ASTNode targetTypeDecl) <- replace int evaluateModifiers(ASTNode targetTypeDecl); diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/javaeditor/JavaEditorAdaptor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/javaeditor/JavaEditorAdaptor.java index 7eb7cfc7c..6e9152b91 100644 --- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/javaeditor/JavaEditorAdaptor.java +++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/javaeditor/JavaEditorAdaptor.java @@ -22,9 +22,9 @@ package org.eclipse.objectteams.otdt.internal.ui.javaeditor; import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.ITypeRoot;
-import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jdt.core.manipulation.SharedASTProviderCore; import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.SharedASTProvider;
import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.source.IAnnotationModel;
import org.eclipse.ui.IEditorInput;
@@ -94,7 +94,7 @@ public team class JavaEditorAdaptor { fRoleOverrideIndicatorManager = new RoleOverrideIndicatorManager(model, inputElement, null);
if (provideAST) {
- CompilationUnit ast = SharedASTProvider.getAST(inputElement, SharedASTProvider.WAIT_ACTIVE_ONLY, getProgressMonitor());
+ CompilationUnit ast = SharedASTProviderCore.getAST(inputElement, SharedASTProviderCore.WAIT_ACTIVE_ONLY, getProgressMonitor());
fRoleOverrideIndicatorManager.reconciled(ast, true, getProgressMonitor());
}
addReconcileListener(fRoleOverrideIndicatorManager);
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/MappingProposalSubProcessor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/MappingProposalSubProcessor.java index 4264375b3..f069f49dd 100644 --- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/MappingProposalSubProcessor.java +++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/MappingProposalSubProcessor.java @@ -634,7 +634,7 @@ public class MappingProposalSubProcessor { private static AbstractMethodMappingDeclaration getMethodMapping (ASTNode coveringNode) { if (coveringNode instanceof AbstractMethodMappingDeclaration) return (AbstractMethodMappingDeclaration) coveringNode; - return (AbstractMethodMappingDeclaration) ASTNodes.getParent(coveringNode, AbstractMethodMappingDeclaration.class); + return ASTNodes.getParent(coveringNode, AbstractMethodMappingDeclaration.class); } // helper: detect whether a guard predicate uses an argument of the corresponding method spec. diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/PrecedenceProposalSubProcessor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/PrecedenceProposalSubProcessor.java index 3c6390b15..2d4e3de78 100644 --- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/PrecedenceProposalSubProcessor.java +++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/PrecedenceProposalSubProcessor.java @@ -86,7 +86,7 @@ public class PrecedenceProposalSubProcessor { } // get a fresh AST: - ASTParser p = ASTParser.newParser(AST.JLS8); + ASTParser p = ASTParser.newParser(AST.JLS12); p.setSource(cu); p.setResolveBindings(false); p.setFocalPosition(offset); diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/TypeProposalSubProcessor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/TypeProposalSubProcessor.java index 009015958..7120204a6 100644 --- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/TypeProposalSubProcessor.java +++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/TypeProposalSubProcessor.java @@ -228,7 +228,7 @@ public class TypeProposalSubProcessor { } // get a fresh AST: - ASTParser p = ASTParser.newParser(AST.JLS8); + ASTParser p = ASTParser.newParser(AST.JLS12); p.setSource(cu); p.setResolveBindings(false); CompilationUnit astCU = (CompilationUnit) p.createAST(null); |