diff options
author | Sam Davis | 2015-06-03 18:45:58 +0000 |
---|---|---|
committer | Sam Davis | 2015-06-03 18:45:58 +0000 |
commit | de72bf031ee27012e6ad212190f60dde21630091 (patch) | |
tree | c3c268e02a1d906c7b0b38d727f2503d083a582b | |
parent | 5d60e74a42d6e55dd1e94ab90f97efb37ce3f952 (diff) | |
download | org.eclipse.mylyn.tasks-de72bf031ee27012e6ad212190f60dde21630091.tar.gz org.eclipse.mylyn.tasks-de72bf031ee27012e6ad212190f60dde21630091.tar.xz org.eclipse.mylyn.tasks-de72bf031ee27012e6ad212190f60dde21630091.zip |
Revert "423848: move RepositoryTextViewerConfiguration reference to new class"
This reverts commit f59937ca20402419dcd3caf4e52e58353fec1cac.
2 files changed, 4 insertions, 31 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java index 51e4683e6..7ccdf3fde 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java @@ -29,7 +29,6 @@ import org.eclipse.jface.text.source.AnnotationModel; import org.eclipse.jface.text.source.IAnnotationAccess; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.mylyn.commons.ui.FillWidthLayout; import org.eclipse.mylyn.commons.ui.compatibility.CommonThemes; import org.eclipse.mylyn.commons.workbench.editors.CommonTextSupport; @@ -340,9 +339,10 @@ public class RichTextEditor { } private void configureDefaultEditor(SourceViewer defaultEditor) { - SourceViewerConfiguration configuration = ViewerConfigurator.configure(repository, task, - isSpellCheckingEnabled() && !isReadOnly(), getMode()); - defaultEditor.configure(configuration); + RepositoryTextViewerConfiguration viewerConfig = new RepositoryTextViewerConfiguration(repository, task, + isSpellCheckingEnabled() && !isReadOnly()); + viewerConfig.setMode(getMode()); + defaultEditor.configure(viewerConfig); } private BrowserPreviewViewer getBrowserViewer() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/ViewerConfigurator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/ViewerConfigurator.java deleted file mode 100644 index cc4b2eb5d..000000000 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/ViewerConfigurator.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Tasktop Technologies and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Tasktop Technologies - initial API and implementation - *******************************************************************************/ - -package org.eclipse.mylyn.internal.tasks.ui.editors; - -import org.eclipse.jface.text.source.SourceViewerConfiguration; -import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewerConfiguration.Mode; -import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.mylyn.tasks.core.TaskRepository; - -class ViewerConfigurator { - - static SourceViewerConfiguration configure(TaskRepository repository, ITask task, boolean spellCheck, Mode mode) { - RepositoryTextViewerConfiguration viewerConfig = new RepositoryTextViewerConfiguration(repository, task, - spellCheck); - viewerConfig.setMode(mode); - return viewerConfig; - } -} |