From 8e4caf29921709004415a41d4a79221585cf5113 Mon Sep 17 00:00:00 2001 From: Iulian Dragos Date: Fri, 14 Feb 2014 16:43:07 +0100 Subject: [PATCH 1/2] Update package names to the new package structure. Fixup for scala-ide/scala-ide#636 --- .../META-INF/MANIFEST.MF | 3 +-- .../completion/CompletionTests.scala | 10 +++++----- .../worksheet/runtime/ClearResultsTest.scala | 6 +++--- .../worksheet/runtime/WorksheetEvalTest.scala | 6 +++--- .../worksheet/testutil/WorksheetUtils.scala | 2 +- org.scalaide.worksheet/META-INF/MANIFEST.MF | 4 +--- .../worksheet/ScriptCompilationUnit.scala | 12 +++++------ .../worksheet/SourceFileProvider.scala | 4 ++-- .../scalaide/worksheet/WorksheetPlugin.scala | 6 +++--- .../CompletionProposalComputer.scala | 10 +++++----- .../editor/ScriptConfiguration.scala | 20 +++++++------------ .../editor/ScriptDocumentProvider.scala | 2 +- .../worksheet/editor/ScriptEditor.scala | 12 +++++------ .../worksheet/handlers/ClearResults.scala | 2 +- .../worksheet/handlers/EvalScript.scala | 2 +- .../lexical/SingleLineCommentScanner.scala | 4 ++-- .../worksheet/lexical/SyntaxClasses.scala | 2 +- .../ColourPreferenceInitializer.scala | 2 +- .../worksheet/properties/Preferences.scala | 2 +- .../properties/PreviewerFactory.scala | 2 +- .../SyntaxColouringPreferencePage.scala | 16 +++++++-------- .../SyntaxColouringPreviewText.scala | 2 +- ...ColouringTreeContentAndLabelProvider.scala | 2 +- .../reconciler/ScalaReconcilingStrategy.scala | 4 ++-- .../worksheet/runtime/Configuration.scala | 2 +- .../runtime/IncrementalDocumentMixer.scala | 2 +- .../worksheet/runtime/ProgramExecutor.scala | 4 ++-- .../worksheet/runtime/ResidentCompiler.scala | 6 +++--- .../runtime/SourceInstrumenter.scala | 2 +- .../worksheet/runtime/VmArguments.scala | 2 +- .../worksheet/runtime/WorksheetRunner.scala | 8 ++++---- .../worksheet/runtime/WorksheetsManager.scala | 4 ++-- .../org/scalaide/worksheet/text/Mixer.scala | 2 +- .../wizards/NewWorksheetWizard.scala | 6 +++--- .../wizards/NewWorksheetWizardPage.scala | 2 +- .../nsc/interactive/ProgramInstrumenter.scala | 4 ++-- 36 files changed, 86 insertions(+), 95 deletions(-) diff --git a/org.scalaide.worksheet.tests/META-INF/MANIFEST.MF b/org.scalaide.worksheet.tests/META-INF/MANIFEST.MF index d902d01..b2f5615 100644 --- a/org.scalaide.worksheet.tests/META-INF/MANIFEST.MF +++ b/org.scalaide.worksheet.tests/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.scala-lang.scala-library, org.eclipse.equinox.weaving.aspectj, org.scala-ide.sdt.core, org.junit -Import-Package: scala.tools.eclipse.testsetup, - org.aspectj.weaver.loadtime.definition +Import-Package: org.aspectj.weaver.loadtime.definition Bundle-ClassPath: ., target/lib/mockito-all-1.9.0.jar diff --git a/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/completion/CompletionTests.scala b/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/completion/CompletionTests.scala index 6f24c1f..0097bb3 100644 --- a/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/completion/CompletionTests.scala +++ b/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/completion/CompletionTests.scala @@ -1,15 +1,15 @@ package org.scalaide.worksheet.completion -import scala.tools.eclipse.testsetup.TestProjectSetup +import org.scalaide.core.testsetup.TestProjectSetup +import org.scalaide.core.testsetup.SDTTestUtils import scala.reflect.internal.util.OffsetPosition -import scala.tools.eclipse.completion.CompletionProposal +import org.scalaide.core.completion.CompletionProposal +import org.scalaide.core.completion.ScalaCompletions import org.scalaide.worksheet.ScriptCompilationUnit -import scala.tools.eclipse.testsetup.SDTTestUtils import org.eclipse.core.runtime.Path import org.eclipse.core.resources.IFile import scala.tools.nsc.interactive.Response -import scala.tools.eclipse.completion.ScalaCompletions -import scala.tools.eclipse.ScalaWordFinder +import org.scalaide.util.internal.ScalaWordFinder import org.junit.Assert import org.junit.Test diff --git a/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/runtime/ClearResultsTest.scala b/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/runtime/ClearResultsTest.scala index 79d0fd8..692f14a 100644 --- a/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/runtime/ClearResultsTest.scala +++ b/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/runtime/ClearResultsTest.scala @@ -1,8 +1,8 @@ package org.scalaide.worksheet.runtime -import scala.tools.eclipse.ScalaProject -import scala.tools.eclipse.testsetup.SDTTestUtils.createProjects -import scala.tools.eclipse.testsetup.SDTTestUtils.deleteProjects +import org.scalaide.core.internal.project.ScalaProject +import org.scalaide.core.testsetup.SDTTestUtils.createProjects +import org.scalaide.core.testsetup.SDTTestUtils.deleteProjects import org.eclipse.core.resources.IFolder import org.junit.AfterClass import org.junit.Assert diff --git a/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/runtime/WorksheetEvalTest.scala b/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/runtime/WorksheetEvalTest.scala index 11930bb..ceb25d8 100644 --- a/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/runtime/WorksheetEvalTest.scala +++ b/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/runtime/WorksheetEvalTest.scala @@ -1,8 +1,8 @@ package org.scalaide.worksheet.runtime -import scala.tools.eclipse.ScalaProject -import scala.tools.eclipse.testsetup.SDTTestUtils.createProjects -import scala.tools.eclipse.testsetup.SDTTestUtils.deleteProjects +import org.scalaide.core.internal.project.ScalaProject +import org.scalaide.core.testsetup.SDTTestUtils.createProjects +import org.scalaide.core.testsetup.SDTTestUtils.deleteProjects import org.eclipse.core.resources.IFolder import org.junit.AfterClass import org.junit.Assert diff --git a/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/testutil/WorksheetUtils.scala b/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/testutil/WorksheetUtils.scala index e6af092..158b30c 100644 --- a/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/testutil/WorksheetUtils.scala +++ b/org.scalaide.worksheet.tests/src/org/scalaide/worksheet/testutil/WorksheetUtils.scala @@ -2,7 +2,7 @@ package org.scalaide.worksheet.testutil import org.scalaide.worksheet.ScriptCompilationUnit import java.io.ByteArrayInputStream -import scala.tools.eclipse.testsetup.SDTTestUtils +import org.scalaide.core.testsetup.SDTTestUtils import org.eclipse.core.runtime.Path import org.eclipse.core.resources.IResource diff --git a/org.scalaide.worksheet/META-INF/MANIFEST.MF b/org.scalaide.worksheet/META-INF/MANIFEST.MF index df94d4b..22c7ed7 100644 --- a/org.scalaide.worksheet/META-INF/MANIFEST.MF +++ b/org.scalaide.worksheet/META-INF/MANIFEST.MF @@ -34,9 +34,7 @@ Require-Bundle: org.scala-refactoring.library Import-Package: com.ibm.icu.text;apply-aspects:=false;org.eclipse.swt.graphics;apply-aspects:=false, - scala.tools.eclipse;apply-aspects:=false, - scala.tools.eclipse.contribution.weaving.jdt.ui.javaeditor.formatter;apply-aspects:=false, - scala.tools.eclipse.semantichighlighting + scala.tools.eclipse.contribution.weaving.jdt.ui.javaeditor.formatter;apply-aspects:=false Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Activator: org.scalaide.worksheet.WorksheetPlugin Bundle-ClassPath: . diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/ScriptCompilationUnit.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/ScriptCompilationUnit.scala index 530cdb0..dba732a 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/ScriptCompilationUnit.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/ScriptCompilationUnit.scala @@ -1,10 +1,10 @@ package org.scalaide.worksheet -import scala.tools.eclipse.InteractiveCompilationUnit -import scala.tools.eclipse.ScalaPlugin -import scala.tools.eclipse.buildmanager.BuildProblemMarker -import scala.tools.eclipse.util.EclipseResource -import scala.tools.eclipse.util.FileUtils +import org.scalaide.core.compiler.InteractiveCompilationUnit +import org.scalaide.core.ScalaPlugin +import org.scalaide.core.internal.builder.BuildProblemMarker +import org.scalaide.core.resources.EclipseResource +import org.scalaide.util.internal.eclipse.FileUtils import scala.tools.nsc.interactive.Response import scala.tools.nsc.io.AbstractFile import scala.reflect.internal.util.BatchSourceFile @@ -18,7 +18,7 @@ import org.eclipse.ui.IEditorInput import org.eclipse.ui.part.FileEditorInput import org.eclipse.ui.texteditor.ITextEditor import org.scalaide.worksheet.editor.ScriptEditor -import scala.tools.eclipse.resources.MarkerFactory +import org.scalaide.core.resources.MarkerFactory /** A Script compilation unit connects the presentation compiler * view of a script with the Eclipse IDE view of the underlying diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/SourceFileProvider.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/SourceFileProvider.scala index 79bfeb3..f6e9406 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/SourceFileProvider.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/SourceFileProvider.scala @@ -1,13 +1,13 @@ package org.scalaide.worksheet -import scala.tools.eclipse.InteractiveCompilationUnit +import org.scalaide.core.compiler.InteractiveCompilationUnit import scala.util.control.Exception.handling import org.eclipse.core.resources.ResourcesPlugin import org.eclipse.core.runtime.IPath -class SourceFileProvider extends scala.tools.eclipse.sourcefileprovider.SourceFileProvider { +class SourceFileProvider extends org.scalaide.core.extensions.SourceFileProvider { override def createFrom(path: IPath): Option[InteractiveCompilationUnit] = { val file = handling(classOf[Exception]).by(_ => None).apply { val root = ResourcesPlugin.getWorkspace().getRoot() diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/WorksheetPlugin.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/WorksheetPlugin.scala index 16c40df..5f53d9b 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/WorksheetPlugin.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/WorksheetPlugin.scala @@ -2,12 +2,12 @@ package org.scalaide.worksheet import org.eclipse.ui.plugin.AbstractUIPlugin import org.osgi.framework.BundleContext -import scala.tools.eclipse.util.OSGiUtils +import org.scalaide.util.internal.eclipse.OSGiUtils import org.eclipse.core.runtime.Platform import org.osgi.framework.Bundle -import scala.tools.eclipse.util.Utils +import org.scalaide.util.internal.Utils import org.eclipse.core.runtime.IPath -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import org.eclipse.core.runtime.Path import org.scalaide.worksheet.properties.WorksheetPreferences import org.eclipse.core.resources.IProject diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/completion/CompletionProposalComputer.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/completion/CompletionProposalComputer.scala index f57bcc0..139ae55 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/completion/CompletionProposalComputer.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/completion/CompletionProposalComputer.scala @@ -1,10 +1,10 @@ package org.scalaide.worksheet.completion -import scala.tools.eclipse.ScalaPresentationCompiler -import scala.tools.eclipse.ScalaWordFinder -import scala.tools.eclipse.completion.ScalaCompletions -import scala.tools.eclipse.ui.ScalaCompletionProposal -import scala.tools.eclipse.util.EditorUtils +import org.scalaide.core.compiler.ScalaPresentationCompiler +import org.scalaide.util.internal.ScalaWordFinder +import org.scalaide.core.completion.ScalaCompletions +import org.scalaide.ui.internal.completion.ScalaCompletionProposal +import org.scalaide.util.internal.eclipse.EditorUtils import scala.reflect.internal.util.SourceFile import org.eclipse.jface.text.ITextViewer diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptConfiguration.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptConfiguration.scala index ee646ba..25e00c4 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptConfiguration.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptConfiguration.scala @@ -1,17 +1,11 @@ package org.scalaide.worksheet.editor -import scala.tools.eclipse.ScalaPlugin -import scala.tools.eclipse.formatter.ScalaFormattingStrategy -import scala.tools.eclipse.hyperlink.text.detector.DeclarationHyperlinkDetector -import scala.tools.eclipse.lexical.ScalaCodeScanner -import scala.tools.eclipse.lexical.ScalaPartitions -import scala.tools.eclipse.lexical.SingleTokenScanner -import scala.tools.eclipse.lexical.XmlCDATAScanner -import scala.tools.eclipse.lexical.XmlCommentScanner -import scala.tools.eclipse.lexical.XmlPIScanner -import scala.tools.eclipse.lexical.XmlTagScanner -import scala.tools.eclipse.properties.syntaxcolouring.ScalaSyntaxClasses -import scala.tools.eclipse.ui.BracketAutoEditStrategy +import org.scalaide.core.ScalaPlugin +import org.scalaide.core.internal.formatter.ScalaFormattingStrategy +import org.scalaide.core.hyperlink.detector.DeclarationHyperlinkDetector +import org.scalaide.core.internal.lexical._ +import org.scalaide.ui.syntax.ScalaSyntaxClasses +import org.scalaide.ui.internal.editor.autoedits.BracketAutoEditStrategy import org.eclipse.jdt.internal.ui.JavaPlugin import org.eclipse.jdt.ui.text.IJavaPartitions import org.eclipse.jface.preference.IPreferenceStore @@ -39,7 +33,7 @@ import org.scalaide.worksheet.completion.CompletionProposalComputer import org.scalaide.worksheet.lexical.SingleLineCommentScanner import org.scalaide.worksheet.reconciler.ScalaReconcilingStrategy import scalariform.ScalaVersions -import scala.tools.eclipse.ScalaHover +import org.scalaide.ui.internal.editor.ScalaHover import org.scalaide.worksheet.ScriptCompilationUnit class ScriptConfiguration(val pluginPreferenceStore: IPreferenceStore, textEditor: ScriptEditor) extends SourceViewerConfiguration { diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptDocumentProvider.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptDocumentProvider.scala index 54d5316..856f9a4 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptDocumentProvider.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptDocumentProvider.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.editor -import scala.tools.eclipse.lexical.ScalaDocumentPartitioner +import org.scalaide.core.internal.lexical.ScalaDocumentPartitioner import org.eclipse.jface.text.IDocument import org.eclipse.jface.text.IDocumentExtension3 diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptEditor.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptEditor.scala index 701e213..d825b42 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptEditor.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/editor/ScriptEditor.scala @@ -1,10 +1,10 @@ package org.scalaide.worksheet.editor -import scala.tools.eclipse.ISourceViewerEditor -import scala.tools.eclipse.InteractiveCompilationUnit -import scala.tools.eclipse.logging.HasLogger -import scala.tools.eclipse.ui.InteractiveCompilationUnitEditor -import scala.tools.eclipse.util.SWTUtils +import org.scalaide.ui.internal.editor.ISourceViewerEditor +import org.scalaide.core.compiler.InteractiveCompilationUnit +import org.scalaide.logging.HasLogger +import org.scalaide.ui.internal.editor.InteractiveCompilationUnitEditor +import org.scalaide.util.internal.eclipse.SWTUtils import org.eclipse.jdt.core.compiler.IProblem import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitDocumentProvider.ProblemAnnotation import org.eclipse.jface.action.IMenuManager @@ -64,7 +64,7 @@ class ScriptEditor extends TextEditor with SelectionTracker with ISourceViewerEd * the evaluation's result. */ private class DefaultEditorProxy extends DocumentHolder { - import scala.tools.eclipse.util.SWTUtils + import org.scalaide.util.internal.eclipse.SWTUtils @volatile private[ScriptEditor] var ignoreDocumentUpdate = false private val stopEvaluationListener = new StopEvaluationOnKeyPressed(this) diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/handlers/ClearResults.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/handlers/ClearResults.scala index 84f62b9..c1da8bb 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/handlers/ClearResults.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/handlers/ClearResults.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.handlers -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import org.eclipse.core.commands.AbstractHandler import org.eclipse.core.commands.ExecutionEvent diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/handlers/EvalScript.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/handlers/EvalScript.scala index 48b1e47..129be4b 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/handlers/EvalScript.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/handlers/EvalScript.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.handlers -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import org.eclipse.core.commands.AbstractHandler import org.eclipse.core.commands.ExecutionEvent diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/lexical/SingleLineCommentScanner.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/lexical/SingleLineCommentScanner.scala index b53a93f..c1c16fb 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/lexical/SingleLineCommentScanner.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/lexical/SingleLineCommentScanner.scala @@ -1,7 +1,7 @@ package org.scalaide.worksheet.lexical -import scala.tools.eclipse.properties.syntaxcolouring.ScalaSyntaxClass -import scala.tools.eclipse.properties.syntaxcolouring.ScalaSyntaxClasses +import org.scalaide.ui.syntax.ScalaSyntaxClass +import org.scalaide.ui.syntax.ScalaSyntaxClasses import org.eclipse.jface.preference.IPreferenceStore import org.eclipse.jface.text.IDocument diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/lexical/SyntaxClasses.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/lexical/SyntaxClasses.scala index af681c9..1bdb16e 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/lexical/SyntaxClasses.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/lexical/SyntaxClasses.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.lexical -import scala.tools.eclipse.properties.syntaxcolouring.ScalaSyntaxClass +import org.scalaide.ui.syntax.ScalaSyntaxClass object SyntaxClasses { object EvalResult { diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/ColourPreferenceInitializer.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/ColourPreferenceInitializer.scala index 15cbb51..8575aa6 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/ColourPreferenceInitializer.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/ColourPreferenceInitializer.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.properties -import scala.tools.eclipse.properties.syntaxcolouring.ScalaSyntaxClass +import org.scalaide.ui.syntax.ScalaSyntaxClass import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer import org.eclipse.jface.preference.IPreferenceStore diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/Preferences.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/Preferences.scala index 8b1e912..57eaa4f 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/Preferences.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/Preferences.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.properties -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import org.eclipse.jface.preference._ import org.eclipse.ui.IWorkbenchPreferencePage import org.eclipse.ui.IWorkbench diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/PreviewerFactory.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/PreviewerFactory.scala index 275f2f5..e948e48 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/PreviewerFactory.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/PreviewerFactory.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.properties -import scala.tools.eclipse.lexical.ScalaDocumentPartitioner +import org.scalaide.core.internal.lexical.ScalaDocumentPartitioner import org.eclipse.jdt.ui.PreferenceConstants import org.eclipse.jface.preference.IPreferenceStore import org.eclipse.jface.resource.JFaceResources diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreferencePage.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreferencePage.scala index c52f343..fd78bad 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreferencePage.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreferencePage.scala @@ -1,14 +1,14 @@ package org.scalaide.worksheet.properties import scala.PartialFunction.condOpt -import scala.tools.eclipse.properties.syntaxcolouring.GridDataHelper.gridData -import scala.tools.eclipse.properties.syntaxcolouring.ScalaSyntaxClass -import scala.tools.eclipse.util.EclipseUtils -import scala.tools.eclipse.util.SWTUtils.fnToDoubleClickListener -import scala.tools.eclipse.util.SWTUtils.fnToPropertyChangeListener -import scala.tools.eclipse.util.SWTUtils.fnToSelectionAdapter -import scala.tools.eclipse.util.SWTUtils.noArgFnToSelectionAdapter -import scala.tools.eclipse.util.SWTUtils.noArgFnToSelectionChangedListener +import org.scalaide.ui.internal.preferences.GridDataHelper.gridData +import org.scalaide.ui.syntax.ScalaSyntaxClass +import org.scalaide.util.internal.eclipse.EclipseUtils +import org.scalaide.util.internal.eclipse.SWTUtils.fnToDoubleClickListener +import org.scalaide.util.internal.eclipse.SWTUtils.fnToPropertyChangeListener +import org.scalaide.util.internal.eclipse.SWTUtils.fnToSelectionAdapter +import org.scalaide.util.internal.eclipse.SWTUtils.noArgFnToSelectionAdapter +import org.scalaide.util.internal.eclipse.SWTUtils.noArgFnToSelectionChangedListener import org.eclipse.jdt.internal.ui.preferences.OverlayPreferenceStore import org.eclipse.jdt.internal.ui.preferences.OverlayPreferenceStore.BOOLEAN diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreviewText.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreviewText.scala index a0ab0d0..e2bf645 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreviewText.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreviewText.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.properties -import scala.tools.eclipse.properties.syntaxcolouring.ScalaSyntaxClass +import org.scalaide.ui.syntax.ScalaSyntaxClass class SyntaxColouringPreviewText { diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringTreeContentAndLabelProvider.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringTreeContentAndLabelProvider.scala index bd54dae..2024263 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringTreeContentAndLabelProvider.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringTreeContentAndLabelProvider.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.properties -import scala.tools.eclipse.properties.syntaxcolouring.ScalaSyntaxClass +import org.scalaide.ui.syntax.ScalaSyntaxClass import org.eclipse.jface.viewers.ITreeContentProvider import org.eclipse.jface.viewers.LabelProvider diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/reconciler/ScalaReconcilingStrategy.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/reconciler/ScalaReconcilingStrategy.scala index 31a7054..a2912e0 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/reconciler/ScalaReconcilingStrategy.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/reconciler/ScalaReconcilingStrategy.scala @@ -1,6 +1,6 @@ package org.scalaide.worksheet.reconciler -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import org.eclipse.jdt.core.compiler.IProblem import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitDocumentProvider.ProblemAnnotation import org.eclipse.jface.text._ @@ -11,7 +11,7 @@ import org.scalaide.worksheet.ScriptCompilationUnit import scala.collection.JavaConverters import org.scalaide.worksheet.editor.ScriptEditor import org.eclipse.ltk.internal.ui.refactoring.util.SWTUtil -import scala.tools.eclipse.util.SWTUtils +import org.scalaide.util.internal.eclipse.SWTUtils class ScalaReconcilingStrategy(textEditor: ScriptEditor) extends IReconcilingStrategy with HasLogger { private var document: IDocument = _ diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/Configuration.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/Configuration.scala index 37711e5..1130baa 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/Configuration.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/Configuration.scala @@ -5,7 +5,7 @@ import java.io.FileOutputStream import java.io.OutputStreamWriter import java.nio.charset.Charset -import scala.tools.eclipse.ScalaProject +import org.scalaide.core.internal.project.ScalaProject import org.eclipse.core.resources.IProject import org.eclipse.core.runtime.IPath diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/IncrementalDocumentMixer.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/IncrementalDocumentMixer.scala index cbb6ead..d789296 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/IncrementalDocumentMixer.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/IncrementalDocumentMixer.scala @@ -6,7 +6,7 @@ import scala.annotation.tailrec import scala.actors.{Actor, DaemonActor, TIMEOUT} import scala.collection.mutable.LinkedHashMap import scala.collection.mutable.ListBuffer -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import org.scalaide.worksheet.editor.DocumentHolder import org.scalaide.worksheet.text.{ Mixer, SourceInserter } diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/ProgramExecutor.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/ProgramExecutor.scala index d842900..c5d2dea 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/ProgramExecutor.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/ProgramExecutor.scala @@ -4,7 +4,7 @@ import java.io.StringWriter import java.io.Writer import java.util.concurrent.atomic.AtomicReference import scala.actors.{ Actor, DaemonActor } -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import org.eclipse.core.runtime.NullProgressMonitor import org.eclipse.debug.core.DebugEvent import org.eclipse.debug.core.DebugPlugin @@ -24,7 +24,7 @@ import org.scalaide.worksheet.ScriptCompilationUnit import org.scalaide.worksheet.editor.DocumentHolder import org.scalaide.worksheet.WorksheetPlugin import org.scalaide.worksheet.properties.WorksheetPreferences -import scala.tools.eclipse.ui.DisplayThread +import org.scalaide.util.internal.ui.DisplayThread object ProgramExecutor { def apply(): Actor = { diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/ResidentCompiler.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/ResidentCompiler.scala index e17604d..a10c487 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/ResidentCompiler.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/ResidentCompiler.scala @@ -1,9 +1,9 @@ package org.scalaide.worksheet.runtime import java.io.File -import scala.tools.eclipse.ScalaPlugin -import scala.tools.eclipse.ScalaProject -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.core.ScalaPlugin +import org.scalaide.core.internal.project.ScalaProject +import org.scalaide.logging.HasLogger import scala.tools.nsc.CompilerCommand import scala.tools.nsc.Settings import scala.tools.nsc.reporters.StoreReporter diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/SourceInstrumenter.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/SourceInstrumenter.scala index 996db4d..b030a5b 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/SourceInstrumenter.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/SourceInstrumenter.scala @@ -2,7 +2,7 @@ package org.scalaide.worksheet.runtime import java.io.File import scala.tools.nsc.interactive.ProgramInstrumenter -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import org.scalaide.worksheet.ScriptCompilationUnit import org.scalaide.worksheet.text.SourceInserter import java.nio.charset.Charset diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/VmArguments.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/VmArguments.scala index 8412a6c..c00d81e 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/VmArguments.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/VmArguments.scala @@ -3,7 +3,7 @@ package org.scalaide.worksheet.runtime import java.nio.charset.Charset import java.nio.charset.IllegalCharsetNameException import java.nio.charset.UnsupportedCharsetException -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import org.eclipse.core.resources.IProject import scala.Array.canBuildFrom diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/WorksheetRunner.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/WorksheetRunner.scala index 1e750dd..6d3c29c 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/WorksheetRunner.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/WorksheetRunner.scala @@ -1,13 +1,13 @@ package org.scalaide.worksheet.runtime import scala.actors.{ Actor, DaemonActor } -import scala.tools.eclipse.ScalaProject -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.core.internal.project.ScalaProject +import org.scalaide.logging.HasLogger import org.scalaide.worksheet.ScriptCompilationUnit import org.scalaide.worksheet.editor.DocumentHolder import org.scalaide.worksheet.text.SourceInserter -import scala.tools.eclipse.BuildSuccessListener -import scala.tools.eclipse.util.SWTUtils +import org.scalaide.core.internal.project.BuildSuccessListener +import org.scalaide.util.internal.eclipse.SWTUtils import org.scalaide.worksheet.WorksheetPlugin object WorksheetRunner { diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/WorksheetsManager.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/WorksheetsManager.scala index c7b3e01..4f3ed4b 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/WorksheetsManager.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/WorksheetsManager.scala @@ -2,10 +2,10 @@ package org.scalaide.worksheet.runtime import scala.actors.{ Actor, DaemonActor } import scala.collection.immutable -import scala.tools.eclipse.ScalaProject +import org.scalaide.core.internal.project.ScalaProject import org.scalaide.worksheet.ScriptCompilationUnit import scala.actors.Exit -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger import scala.actors.AbstractActor import org.eclipse.core.runtime.IPath import scala.actors.UncaughtException diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/text/Mixer.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/text/Mixer.scala index 4010f83..1dc0a94 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/text/Mixer.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/text/Mixer.scala @@ -5,7 +5,7 @@ import scala.runtime.ScalaRunTime.stringOf import java.lang.reflect.InvocationTargetException import collection.mutable.ArrayBuffer import scala.collection.mutable.ListBuffer -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.logging.HasLogger class Mixer extends HasLogger { diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizard.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizard.scala index 73f56d8..82bc68c 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizard.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizard.scala @@ -1,8 +1,8 @@ package org.scalaide.worksheet.wizards -import scala.tools.eclipse.logging.HasLogger -import scala.tools.eclipse.util.SWTUtils -import scala.tools.eclipse.util.Utils +import org.scalaide.logging.HasLogger +import org.scalaide.util.internal.eclipse.SWTUtils +import org.scalaide.util.internal.Utils import org.eclipse.jface.viewers.IStructuredSelection diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizardPage.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizardPage.scala index 5baf490..1b47fe3 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizardPage.scala +++ b/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizardPage.scala @@ -9,7 +9,7 @@ import org.eclipse.swt.widgets.Composite import org.eclipse.ui.dialogs.WizardNewFileCreationPage import org.eclipse.core.runtime.IPath import org.eclipse.core.resources.ResourcesPlugin -import scala.tools.eclipse.ScalaPlugin +import org.scalaide.core.ScalaPlugin /** Wizard page based of the new file creation page from the framework. * The advanced section has be removed. diff --git a/org.scalaide.worksheet/src/scala/tools/nsc/interactive/ProgramInstrumenter.scala b/org.scalaide.worksheet/src/scala/tools/nsc/interactive/ProgramInstrumenter.scala index 9b75f16..b87288e 100644 --- a/org.scalaide.worksheet/src/scala/tools/nsc/interactive/ProgramInstrumenter.scala +++ b/org.scalaide.worksheet/src/scala/tools/nsc/interactive/ProgramInstrumenter.scala @@ -1,8 +1,8 @@ package scala.tools.nsc.interactive import scala.reflect.internal.util.SourceFile -import scala.tools.eclipse.ScalaPresentationCompiler -import scala.tools.eclipse.logging.HasLogger +import org.scalaide.core.compiler.ScalaPresentationCompiler +import org.scalaide.logging.HasLogger final class ProgramInstrumenter(compiler: ScalaPresentationCompiler) extends HasLogger { self => private object Instrumenter extends ScratchPadMaker2 { From 40d1f5de84f9639d9a9a7208e9e83cec3d8c7938 Mon Sep 17 00:00:00 2001 From: Luc Bourlier Date: Tue, 18 Feb 2014 18:21:35 +0100 Subject: [PATCH 2/2] Adds back dependency to sdt.core.test --- org.scalaide.worksheet.tests/META-INF/MANIFEST.MF | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.scalaide.worksheet.tests/META-INF/MANIFEST.MF b/org.scalaide.worksheet.tests/META-INF/MANIFEST.MF index b2f5615..e4b4235 100644 --- a/org.scalaide.worksheet.tests/META-INF/MANIFEST.MF +++ b/org.scalaide.worksheet.tests/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Require-Bundle: org.scala-lang.scala-library, org.eclipse.equinox.weaving.aspectj, org.scala-ide.sdt.core, org.junit -Import-Package: org.aspectj.weaver.loadtime.definition +Import-Package: org.aspectj.weaver.loadtime.definition, + org.scalaide.core.testsetup Bundle-ClassPath: ., target/lib/mockito-all-1.9.0.jar