From 2d5ea4646a9f5d13b3aa71f89809c1bfd0448f88 Mon Sep 17 00:00:00 2001 From: Simon Schaefer Date: Sun, 30 Jun 2013 16:20:52 +0200 Subject: [PATCH] Resolve compiler errors due to code changes in scala-ide master --- .../worksheet/properties/SyntaxColouringPreferencePage.scala | 5 +++-- .../org/scalaide/worksheet/wizards/NewWorksheetWizard.scala | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) 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 6d87a0b..504b62f 100644 --- a/org.scalaide.worksheet/src/org/scalaide/worksheet/properties/SyntaxColouringPreferencePage.scala +++ b/org.scalaide.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 index c4b561b..73f56d8 100644 --- 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) {