From 4cbe2d385abecac73b3f5dd489d732dcd8bd0bb2 Mon Sep 17 00:00:00 2001 From: Stephan Herrmann Date: Thu, 15 Mar 2012 23:27:41 +0100 Subject: Adjust imports: ICommandAccess & CUCorrectionProposal & ASTRewriteCorrectionProposal have become API --- .../objectteams/otdt/ui/tests/core/AddImportQuickFixTest.java | 2 +- .../eclipse/objectteams/otdt/ui/tests/core/JavaQuickFixTests.java | 2 +- .../otdt/ui/tests/core/ModifierCorrectionsQuickFixTest.java | 2 +- .../objectteams/otdt/ui/tests/core/OTJavadocQuickFixTest.java | 2 +- .../objectteams/otdt/ui/tests/core/PrecedenceQuickFixTest.java | 2 +- .../org/eclipse/objectteams/otdt/ui/tests/core/ProposalAdaptor.java | 6 +++--- .../otdt/ui/tests/core/UnresolvedMethodsQuickFixTest.java | 5 +++-- 7 files changed, 11 insertions(+), 10 deletions(-) (limited to 'testplugins') diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/AddImportQuickFixTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/AddImportQuickFixTest.java index 180b64474..a972885b6 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/AddImportQuickFixTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/AddImportQuickFixTest.java @@ -32,9 +32,9 @@ import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.internal.compiler.lookup.ExtraCompilerModifiers; -import org.eclipse.jdt.internal.ui.text.correction.proposals.CUCorrectionProposal; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jdt.ui.tests.core.ProjectTestSetup; +import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; import org.eclipse.jface.text.IDocument; import org.eclipse.objectteams.otdt.ui.tests.util.JavaProjectHelper; import org.eclipse.ui.IEditorPart; diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/JavaQuickFixTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/JavaQuickFixTests.java index 7e863927e..1acba130a 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/JavaQuickFixTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/JavaQuickFixTests.java @@ -25,8 +25,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.internal.ui.text.correction.proposals.CUCorrectionProposal; import org.eclipse.jdt.internal.ui.text.correction.proposals.NewCUUsingWizardProposal; +import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; /** * Testing whether standard Java quickfixes work in OT/J code, too. diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ModifierCorrectionsQuickFixTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ModifierCorrectionsQuickFixTest.java index 1bc7ecff0..e5bbc75f4 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ModifierCorrectionsQuickFixTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ModifierCorrectionsQuickFixTest.java @@ -19,7 +19,7 @@ import junit.framework.TestSuite; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.internal.ui.text.correction.proposals.CUCorrectionProposal; +import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; /** * Test OT-specific quickfixes (here: modifier corrections). diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/OTJavadocQuickFixTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/OTJavadocQuickFixTest.java index c475b0154..9a7133362 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/OTJavadocQuickFixTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/OTJavadocQuickFixTest.java @@ -34,8 +34,8 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility; import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType; -import org.eclipse.jdt.internal.ui.text.correction.proposals.CUCorrectionProposal; import org.eclipse.jdt.testplugin.TestOptions; +import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; import org.eclipse.objectteams.otdt.ui.tests.util.JavaProjectHelper; /** diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/PrecedenceQuickFixTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/PrecedenceQuickFixTest.java index 2f5760abc..fe647ee26 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/PrecedenceQuickFixTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/PrecedenceQuickFixTest.java @@ -24,7 +24,7 @@ import junit.framework.TestSuite; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.internal.ui.text.correction.proposals.CUCorrectionProposal; +import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; /** diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProposalAdaptor.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProposalAdaptor.java index 5b43fa975..df8f5780a 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProposalAdaptor.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProposalAdaptor.java @@ -23,8 +23,8 @@ package org.eclipse.objectteams.otdt.ui.tests.core; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModel; import org.eclipse.jface.text.contentassist.ICompletionProposal; +import base org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedCorrectionProposal; import base org.eclipse.jdt.internal.ui.text.java.ParameterGuessingProposal; -import base org.eclipse.jdt.internal.ui.text.correction.proposals.CUCorrectionProposal; public team class ProposalAdaptor { @@ -41,11 +41,11 @@ public team class ProposalAdaptor { } /** Access to one protected method: */ - protected class CUCorrectionProposal playedBy CUCorrectionProposal { + protected class LinkedCorrectionProposal playedBy LinkedCorrectionProposal { LinkedProposalModel getLinkedProposalModel() -> LinkedProposalModel getLinkedProposalModel(); } /** API */ - public LinkedProposalModel getLinkedProposalModel(CUCorrectionProposal as CUCorrectionProposal proposal) { + public LinkedProposalModel getLinkedProposalModel(LinkedCorrectionProposal as LinkedCorrectionProposal proposal) { return proposal.getLinkedProposalModel(); } } diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/UnresolvedMethodsQuickFixTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/UnresolvedMethodsQuickFixTest.java index 029abd3c2..55ce76b0c 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/UnresolvedMethodsQuickFixTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/UnresolvedMethodsQuickFixTest.java @@ -35,8 +35,9 @@ import org.eclipse.jdt.internal.corext.fix.LinkedProposalPositionGroup; import org.eclipse.jdt.internal.corext.fix.LinkedProposalPositionGroup.Proposal; import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType; import org.eclipse.jdt.internal.ui.JavaPlugin; -import org.eclipse.jdt.internal.ui.text.correction.proposals.CUCorrectionProposal; +import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedCorrectionProposal; import org.eclipse.jdt.ui.PreferenceConstants; +import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; import org.eclipse.jface.preference.IPreferenceStore; @@ -565,7 +566,7 @@ public class UnresolvedMethodsQuickFixTest extends OTQuickFixTest { assertNumberOfProposals(proposals, 1); // don't propose to generate into team!! assertCorrectLabels(proposals); - CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0); + LinkedCorrectionProposal proposal= (LinkedCorrectionProposal) proposals.get(0); String preview= getPreviewContent(proposal); buf= new StringBuffer(); -- cgit v1.2.3