Merge pull request #148 from sschaef/t-resolve-warnings

Resolve compiler errors due to code changes in scala-ide master
scala-ide · Jul 4, 2013 · 8889872 · 8889872
2 parents 2cebc54 + 2d5ea46
commit 8889872
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...laide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreferencePage.scala b/...laide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreferencePage.scala
@@ -334,8 +334,9 @@ class SyntaxColouringPreferencePage extends PreferencePage with IWorkbenchPrefer
       massSetEnablement(false)
     case Some(syntaxClass) =>
       import syntaxClass._
-      syntaxForegroundColorEditor.setColorValue(EclipseUtils.prefStoreToPimpedPrefStore(overlayStore) getColor foregroundColourKey)
-      syntaxBackgroundColorEditor.setColorValue(EclipseUtils.prefStoreToPimpedPrefStore(overlayStore) getColor backgroundColourKey)
+      import EclipseUtils._
+      syntaxForegroundColorEditor.setColorValue(overlayStore getColor foregroundColourKey)
+      syntaxBackgroundColorEditor.setColorValue(overlayStore getColor backgroundColourKey)
       val backgroundColorEnabled = overlayStore getBoolean backgroundColourEnabledKey
       backgroundColorEnabledCheckBox.setSelection(backgroundColorEnabled)
       enabledCheckBox.setSelection(overlayStore getBoolean enabledKey)

diff --git a/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizard.scala b/org.scalaide.worksheet/src/org/scalaide/worksheet/wizards/NewWorksheetWizard.scala
@@ -2,7 +2,7 @@ package org.scalaide.worksheet.wizards
 
 import scala.tools.eclipse.logging.HasLogger
 import scala.tools.eclipse.util.SWTUtils
-import scala.tools.eclipse.util.Utils.any2optionable
+import scala.tools.eclipse.util.Utils
 
 import org.eclipse.jface.viewers.IStructuredSelection
 
@@ -22,6 +22,7 @@ class NewWorksheetWizard extends Wizard with INewWizard with HasLogger {
   // from org.eclipse.jface.wizard.Wizard
 
   override def performFinish(): Boolean = {
+    import Utils._
     val file = newFileWizardPage.createNewFile()
 
     if (file != null) {