1 files changed, 1 insertions, 16 deletions
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index 34d5c38b6f8..6d3af92a43e 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -49,20 +49,6 @@ namespace Android {
 namespace Internal {
 
 //
-// JavaEditorWidget
-//
-
-class JavaEditorWidget : public TextEditor::TextEditorWidget
-{
-public:
-    JavaEditorWidget()
-    {
-        setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<JavaCompletionAssistProvider>());
-    }
-};
-
-
-//
 // JavaDocument
 //
 
@@ -106,12 +92,11 @@ JavaEditorFactory::JavaEditorFactory()
     addMimeType(Constants::JAVA_MIMETYPE);
 
     setDocumentCreator([]() { return new JavaDocument; });
-    setEditorWidgetCreator([]() { return new JavaEditorWidget; });
     setAutoCompleterCreator([]() { return new JavaAutoCompleter; });
     setGenericSyntaxHighlighter(QLatin1String(Constants::JAVA_MIMETYPE));
     setCommentStyle(Utils::CommentDefinition::CppStyle);
-
     setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection);
+    setCompletionAssistProvider(new JavaCompletionAssistProvider);
 }
 
 } // namespace Internal