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>

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,21 +45,9 @@ class JavaEditor : public TextEditor::BaseTextEditor
 public:
     JavaEditor();
 
-    Core::IEditor *duplicate();
     TextEditor::CompletionAssistProvider *completionAssistProvider();
 };
 
-class JavaEditorWidget : public TextEditor::BaseTextEditorWidget
-{
-    Q_OBJECT
-
-public:
-    JavaEditorWidget();
-
-protected:
-    TextEditor::BaseTextEditor *createEditor();
-};
-
 class JavaDocument : public TextEditor::BaseTextDocument
 {
     Q_OBJECT
@@ -71,6 +58,16 @@ public:
     QString suggestedFileName() const;
 };
 
+
+class JavaEditorFactory : public Core::IEditorFactory
+{
+    Q_OBJECT
+
+public:
+    JavaEditorFactory();
+    Core::IEditor *createEditor();
+};
+
 } // namespace Internal
 } // namespace Android