diff options
author | Roland Grunberg | 2018-08-17 18:14:09 +0000 |
---|---|---|
committer | Lars Vogel | 2018-09-07 07:08:47 +0000 |
commit | f48c8fc3b0bc80f01d45d51ad62d31851805005a (patch) | |
tree | a1a769b1fa78f5fc9f3ee52c8650e2c3e4c1c74b | |
parent | 2e5858cc10f982136302063d69822382180c6384 (diff) | |
download | eclipse.platform.text-f48c8fc3b0bc80f01d45d51ad62d31851805005a.tar.gz eclipse.platform.text-f48c8fc3b0bc80f01d45d51ad62d31851805005a.tar.xz eclipse.platform.text-f48c8fc3b0bc80f01d45d51ad62d31851805005a.zip |
Bug 535964 - Use new API of TemplatePersistenceData, TemplateReaderWriter.
- Use TemplatePersistenceData, TemplateReaderWriter from org.eclipse.text
and not from the deprecated org.eclispe.jface.text bundle.
Change-Id: I022ec34437046a011e9c211cc7071a0af1dfc092
Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
3 files changed, 7 insertions, 5 deletions
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java index dd8c4e0f33a..6a88053c32e 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java @@ -31,13 +31,14 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import org.eclipse.text.templates.TemplatePersistenceData; +import org.eclipse.text.templates.TemplateReaderWriter; + import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.templates.ContextTypeRegistry; import org.eclipse.jface.text.templates.Template; import org.eclipse.jface.text.templates.TemplateException; -import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData; -import org.eclipse.jface.text.templates.persistence.TemplateReaderWriter; import org.eclipse.jface.text.templates.persistence.TemplateStore; import org.eclipse.ui.internal.editors.text.EditorsPlugin; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java index 08bdcc63725..2d93bbb6f98 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java @@ -65,6 +65,9 @@ import org.eclipse.core.expressions.Expression; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.text.templates.TemplatePersistenceData; +import org.eclipse.text.templates.TemplateReaderWriter; + import org.eclipse.jface.action.Action; import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.IAction; @@ -108,8 +111,6 @@ import org.eclipse.jface.text.templates.ContextTypeRegistry; import org.eclipse.jface.text.templates.Template; import org.eclipse.jface.text.templates.TemplateContextType; import org.eclipse.jface.text.templates.TemplateException; -import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData; -import org.eclipse.jface.text.templates.persistence.TemplateReaderWriter; import org.eclipse.jface.text.templates.persistence.TemplateStore; import org.eclipse.ui.ActiveShellExpression; diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesTransfer.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesTransfer.java index 7babdf848be..a8edbdc3907 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesTransfer.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesTransfer.java @@ -16,7 +16,7 @@ package org.eclipse.ui.texteditor.templates; import org.eclipse.swt.dnd.ByteArrayTransfer; import org.eclipse.swt.dnd.TransferData; -import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData; +import org.eclipse.text.templates.TemplatePersistenceData; /** |