diff --git a/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleCodeAssistProcessor.java b/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleCodeAssistProcessor.java
index 849103b46db..6e5950280ef 100644
--- a/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleCodeAssistProcessor.java
+++ b/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleCodeAssistProcessor.java
@@ -17,7 +17,6 @@
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor;
 import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal;
 import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
-import org.eclipse.che.ide.api.notification.NotificationManager;
 import org.eclipse.che.ide.rest.AsyncRequestCallback;
 import org.eclipse.che.ide.rest.Unmarshallable;
 
diff --git a/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleEditorConfiguration.java b/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleEditorConfiguration.java
index 07c135f147c..1ce7fedb28f 100644
--- a/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleEditorConfiguration.java
+++ b/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleEditorConfiguration.java
@@ -15,13 +15,12 @@
 
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor;
 import org.eclipse.che.ide.api.editor.editorconfig.DefaultTextEditorConfiguration;
+import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner;
 import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter.DEFAULT_CONTENT_TYPE;
-
 public class JsonExampleEditorConfiguration extends DefaultTextEditorConfiguration {
 
     private Map<String, CodeAssistProcessor> codeAssist;
@@ -31,7 +30,7 @@ public JsonExampleEditorConfiguration(@Assisted final TextEditor editor,
                                           final JsonExampleCodeAssistProcessorFactory codeAssistProcessorFactory) {
         codeAssist = new LinkedHashMap<>();
         JsonExampleCodeAssistProcessor codeAssistProcessor = codeAssistProcessorFactory.create(editor);
-        codeAssist.put(DEFAULT_CONTENT_TYPE, codeAssistProcessor);
+        codeAssist.put(DocumentPartitioner.DEFAULT_CONTENT_TYPE, codeAssistProcessor);
     }
 
     @Override
diff --git a/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleEditorProvider.java b/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleEditorProvider.java
index 3a3518786fc..b19fd02033e 100644
--- a/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleEditorProvider.java
+++ b/samples/sample-plugin-json/che-sample-plugin-json-ide/src/main/java/org/eclipse/che/plugin/jsonexample/ide/editor/JsonExampleEditorProvider.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.che.ide.api.editor.EditorPartPresenter;
 import org.eclipse.che.ide.api.editor.EditorProvider;
+import org.eclipse.che.ide.api.editor.defaulteditor.AbstractTextEditorProvider;
 import org.eclipse.che.ide.api.editor.defaulteditor.DefaultTextEditorProvider;
 import org.eclipse.che.ide.api.editor.editorconfig.TextEditorConfiguration;
 import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
@@ -21,23 +22,18 @@
 /**
  * The JSON Example specific {@link EditorProvider}.
  */
-public class JsonExampleEditorProvider implements EditorProvider {
+public class JsonExampleEditorProvider extends AbstractTextEditorProvider {
 
-    private final DefaultTextEditorProvider             editorProvider;
     private final JsonExampleEditorConfigurationFactory editorConfigurationFactory;
 
     /**
      * Constructor.
      *
-     * @param editorProvider
-     *         the {@link DefaultTextEditorProvider}
      * @param editorConfigurationFactory
      *         the JSON Example Editor configuration factory
      */
     @Inject
-    public JsonExampleEditorProvider(final DefaultTextEditorProvider editorProvider,
-                                     final JsonExampleEditorConfigurationFactory editorConfigurationFactory) {
-        this.editorProvider = editorProvider;
+    public JsonExampleEditorProvider(final JsonExampleEditorConfigurationFactory editorConfigurationFactory) {
         this.editorConfigurationFactory = editorConfigurationFactory;
     }
 
@@ -52,10 +48,10 @@ public String getDescription() {
     }
 
     @Override
-    public EditorPartPresenter getEditor() {
-        TextEditor editor = editorProvider.getEditor();
+    public TextEditor getEditor() {
+        TextEditor editor = super.getEditor();
         TextEditorConfiguration configuration = this.editorConfigurationFactory.create(editor);
-        editorProvider.getEditor().initialize(configuration);
+        editor.initialize(configuration);
         return editor;
     }
 }