From e8539289008ee9c7a02aa6a8fe87ddc07e1bd071 Mon Sep 17 00:00:00 2001 From: Simon Schaefer Date: Sat, 8 Nov 2014 00:07:06 +0100 Subject: [PATCH] Remove `o.s.u.ui.SWTUtils` This is a duplicate of `o.s.u.eclipse.SWTUtils`. Fixes #1002288 --- .../SyntaxColoringPreferencePage.scala | 5 +---- .../BaseSyntaxColoringPreferencePage.scala | 3 --- .../org/scalaide/util/eclipse/SWTUtils.scala | 15 +++++++++++++ .../src/org/scalaide/util/ui/SWTUtils.scala | 21 ------------------- 4 files changed, 16 insertions(+), 28 deletions(-) delete mode 100644 org.scala-ide.sdt.core/src/org/scalaide/util/ui/SWTUtils.scala diff --git a/org.scala-ide.sdt.core/src/org/scalaide/ui/internal/preferences/SyntaxColoringPreferencePage.scala b/org.scala-ide.sdt.core/src/org/scalaide/ui/internal/preferences/SyntaxColoringPreferencePage.scala index 167f44f6ce..b64c17564a 100644 --- a/org.scala-ide.sdt.core/src/org/scalaide/ui/internal/preferences/SyntaxColoringPreferencePage.scala +++ b/org.scala-ide.sdt.core/src/org/scalaide/ui/internal/preferences/SyntaxColoringPreferencePage.scala @@ -9,8 +9,7 @@ import org.scalaide.core.IScalaPlugin import org.scalaide.ui.syntax.ScalaSyntaxClasses import org.scalaide.ui.syntax.ScalaSyntaxClasses._ import org.scalaide.ui.syntax.preferences.BaseSyntaxColoringPreferencePage -import org.scalaide.util.eclipse.SWTUtils.noArgFnToSelectionAdapter -import org.scalaide.util.ui.SWTUtils.gridData +import org.scalaide.util.eclipse.SWTUtils._ import org.scalaide.core.internal.decorators.semantichighlighting.Position import scalariform.lexer.ScalaLexer import org.scalaide.core.internal.decorators.semantichighlighting.classifier.SymbolTypes @@ -24,8 +23,6 @@ class SyntaxColoringPreferencePage extends BaseSyntaxColoringPreferencePage( SyntaxColoringPreferencePage.PreviewText, SemanticPreviewerFactoryConfiguration) { - import org.scalaide.util.ui.SWTUtils._ - private var enableSemanticHighlightingCheckBox: Button = _ private var extraAccuracyCheckBox: Button = _ private var strikethroughDeprecatedCheckBox: Button = _ diff --git a/org.scala-ide.sdt.core/src/org/scalaide/ui/syntax/preferences/BaseSyntaxColoringPreferencePage.scala b/org.scala-ide.sdt.core/src/org/scalaide/ui/syntax/preferences/BaseSyntaxColoringPreferencePage.scala index d1c7c185a7..c64ce96088 100644 --- a/org.scala-ide.sdt.core/src/org/scalaide/ui/syntax/preferences/BaseSyntaxColoringPreferencePage.scala +++ b/org.scala-ide.sdt.core/src/org/scalaide/ui/syntax/preferences/BaseSyntaxColoringPreferencePage.scala @@ -23,7 +23,6 @@ import org.scalaide.ui.syntax.ScalaSyntaxClass.Category import org.scalaide.ui.syntax.ScalaSyntaxClasses import org.scalaide.util.eclipse.EclipseUtils._ import org.scalaide.util.eclipse.SWTUtils._ -import org.scalaide.util.ui.SWTUtils.gridData import org.scalaide.ui.internal.preferences.PreviewerFactory /** Base class to create a syntax coloring preference page. @@ -54,8 +53,6 @@ abstract class BaseSyntaxColoringPreferencePage(categories: List[ScalaSyntaxClas */ def additionalPerformDefaults() {} - import org.scalaide.util.ui.SWTUtils._ - setPreferenceStore(preferenceStore) protected val overlayStore = makeOverlayPreferenceStore private val previewerFactory = new PreviewerFactory(previewerFactoryConfiguration) diff --git a/org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/SWTUtils.scala b/org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/SWTUtils.scala index e9c22cd9ac..470b3b4d68 100644 --- a/org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/SWTUtils.scala +++ b/org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/SWTUtils.scala @@ -3,7 +3,9 @@ package org.scalaide.util.eclipse import org.eclipse.jface.preference._ import org.eclipse.jface.util._ import org.eclipse.jface.viewers._ +import org.eclipse.swt.SWT import org.eclipse.swt.events._ +import org.eclipse.swt.layout._ import org.eclipse.swt.widgets._ import org.scalaide.util.ui.DisplayThread import org.eclipse.ui.PlatformUI @@ -165,4 +167,17 @@ object SWTUtils { getChangeControl(parent) addSelectionListener { (e: SelectionEvent) => f(e) } } + /** Returns a [[GridData]] configuration, with the given properties. + * + * The possible values for alignment are: [[SWT.BEGINNING]], [[SWT.CENTER]], [[SWT.END]], [[SWT.FILL]] + */ + def gridData( + horizontalAlignment: Int = SWT.BEGINNING, + verticalAlignment: Int = SWT.CENTER, + grabExcessHorizontalSpace: Boolean = false, + grabExcessVerticalSpace: Boolean = false, + horizontalSpan: Int = 1, + verticalSpan: Int = 1): GridData = + new GridData(horizontalAlignment, verticalAlignment, grabExcessHorizontalSpace, grabExcessVerticalSpace, horizontalSpan, verticalSpan) + } diff --git a/org.scala-ide.sdt.core/src/org/scalaide/util/ui/SWTUtils.scala b/org.scala-ide.sdt.core/src/org/scalaide/util/ui/SWTUtils.scala deleted file mode 100644 index 7426e2de47..0000000000 --- a/org.scala-ide.sdt.core/src/org/scalaide/util/ui/SWTUtils.scala +++ /dev/null @@ -1,21 +0,0 @@ -package org.scalaide.util.ui - -import org.eclipse.swt.SWT -import org.eclipse.swt.layout.GridData - -object SWTUtils { - - /** Returns a [[GridData]] configuration, with the given properties. - * - * The possible values for alignment are: [[SWT.BEGINNING]], [[SWT.CENTER]], [[SWT.END]], [[SWT.FILL]] - */ - def gridData( - horizontalAlignment: Int = SWT.BEGINNING, - verticalAlignment: Int = SWT.CENTER, - grabExcessHorizontalSpace: Boolean = false, - grabExcessVerticalSpace: Boolean = false, - horizontalSpan: Int = 1, - verticalSpan: Int = 1): GridData = - new GridData(horizontalAlignment, verticalAlignment, grabExcessHorizontalSpace, grabExcessVerticalSpace, horizontalSpan, verticalSpan) - -}