Merge pull request #180 from skyluc/new-package-structure

Update package names to the new package structure.

org.scalaide.worksheet.tests/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@ 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,
+ org.scalaide.core.testsetup
 Bundle-ClassPath: .,
  target/lib/mockito-all-1.9.0.jar

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
 

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

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

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
 

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: .

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

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()

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

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

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 {

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

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)

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

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

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

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 {

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

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

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

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

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 {
 

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

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 = _

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

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 }

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 = {

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

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

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