Android: General java editor related code consolidation

Merge editor files, convert to new editor setup scheme.

Change-Id: Ie498ac5dcb1efc288e55082a285e6daada6b5ebf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/src/plugins/android/javaeditor.h b/src/plugins/android/javaeditor.h
index 058cde57ee..700fcded84 100644
--- a/src/plugins/android/javaeditor.h
+++ b/src/plugins/android/javaeditor.h
@@ -33,12 +33,11 @@
 #include <texteditor/basetextdocument.h>
 #include <texteditor/basetexteditor.h>
 #include <utils/uncommentselection.h>
+#include <coreplugin/editormanager/ieditorfactory.h>
 
 namespace Android {
 namespace Internal {
 
-class JavaEditorFactory;
-
 class JavaEditor : public TextEditor::BaseTextEditor
 {
     Q_OBJECT
@@ -46,29 +45,27 @@ class JavaEditor : public TextEditor::BaseTextEditor
 public:
     JavaEditor();
 
-    Core::IEditor *duplicate();
     TextEditor::CompletionAssistProvider *completionAssistProvider();
 };
 
-class JavaEditorWidget : public TextEditor::BaseTextEditorWidget
+class JavaDocument : public TextEditor::BaseTextDocument
 {
     Q_OBJECT
 
 public:
-    JavaEditorWidget();
-
-protected:
-    TextEditor::BaseTextEditor *createEditor();
+    JavaDocument();
+    QString defaultPath() const;
+    QString suggestedFileName() const;
 };
 
-class JavaDocument : public TextEditor::BaseTextDocument
+
+class JavaEditorFactory : public Core::IEditorFactory
 {
     Q_OBJECT
 
 public:
-    JavaDocument();
-    QString defaultPath() const;
-    QString suggestedFileName() const;
+    JavaEditorFactory();
+    Core::IEditor *createEditor();
 };
 
 } // namespace Internal