CHE-390: Simplify Editor API (#1197)

* CHE-390: Simplify Editor API by adding abstract EditorProvider

* Remove unused EditorTypeMapping

* Remove obsolete, useless classes

* Remove editor types

* Fix typo in interface name

* Remove EditorAdapter

* Refactor: EmbeddedTextEditorPresenter -> TextEditorPresenter

* Refactor code

* Clean-up

* Remove mime-types

* Refactor JsEditor

* Remove redundatnd dependency

* Rename codenvyDefaultEditor -> cheDefaultEditor

assembly/assembly-ide-war/pom.xml

@@ -148,10 +148,6 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-ide-app</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-ide-jseditor</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>wsmaster-local</artifactId>
@@ -482,7 +478,6 @@
                         WEB-INF/lib/che-core-commons-gwt-*.jar,
                         WEB-INF/lib/che-core-ide-api-*.jar,
                         WEB-INF/lib/che-core-ide-app-*.jar,
-                        WEB-INF/lib/che-core-ide-jseditor-*.jar,
                         WEB-INF/lib/che-core-ide-ui-*.jar</packagingExcludes>
                 </configuration>
             </plugin>

core/ide/che-core-ide-api/pom.xml

@@ -97,6 +97,11 @@
             <artifactId>gwt-dev</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.gwt.gwtmockito</groupId>
+            <artifactId>gwtmockito</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
@@ -205,12 +210,12 @@
                         <exclude>**/*.png</exclude>
                         <exclude>**/*.gif</exclude>
                         <exclude>**/*.jpg</exclude>
-                        <exclude>**/ide/api/text/TextSelection.java</exclude>
-                        <exclude>**/ide/api/text/TextSelectionImpl.java</exclude>
-                        <exclude>**/ide/api/text/TypedPosition.java</exclude>
+                        <exclude>**/ide/api/editor/text/TypedPosition.java</exclude>
                         <exclude>**/ide/api/text/annotation/AnnotationModelEvent.java</exclude>
-                        <exclude>**/ide/api/text/rules/**/*.*</exclude>
-                        <exclude>**/ide/api/text/undo/**/*.*</exclude>
+                        <exclude>**/ide/api/editor/text/rules/**/*.*</exclude>
+                        <exclude>**/org/eclipse/che/ide/api/editor/reconciler/DirtyRegion.java</exclude>
+                        <exclude>**/org/eclipse/che/ide/api/editor/reconciler/DirtyRegionQueue.java</exclude>
+                        <exclude>**/org/eclipse/che/ide/api/editor/annotation/AnnotationModelEvent.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/Breakpoint.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.debug;
+package org.eclipse.che.ide.api.debug;
 
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointManager.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.debug;
+package org.eclipse.che.ide.api.debug;
 
 import java.util.List;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointManagerObservable.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.debug;
+package org.eclipse.che.ide.api.debug;
 
 /**
  * @author Anatoliy Bazko

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointManagerObserver.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.debug;
+package org.eclipse.che.ide.api.debug;
 
 /**
  * @author Anatoliy Bazko

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointRenderer.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.debug;
+package org.eclipse.che.ide.api.debug;
 
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointRendererFactory.java

@@ -8,12 +8,11 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.debug;
+package org.eclipse.che.ide.api.debug;
 
-import org.eclipse.che.ide.debug.BreakpointRenderer;
-import org.eclipse.che.ide.jseditor.client.document.Document;
-import org.eclipse.che.ide.jseditor.client.gutter.Gutter;
-import org.eclipse.che.ide.jseditor.client.texteditor.LineStyler;
+import org.eclipse.che.ide.api.editor.document.Document;
+import org.eclipse.che.ide.api.editor.gutter.Gutter;
+import org.eclipse.che.ide.api.editor.texteditor.LineStyler;
 
 /** Factory for {@link BreakpointRenderer} instances.*/
 public interface BreakpointRendererFactory {

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/HasBreakpointRenderer.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.debug;
+package org.eclipse.che.ide.api.debug;
 
 public interface HasBreakpointRenderer {
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/CancelCallback.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.ui.dialogs;
+package org.eclipse.che.ide.api.dialogs;
 
 /**
  * Callback called when the user clicks on "Cancel" in the confirmation/input dialog.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/ChoiceDialog.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.ui.dialogs.choice;
+package org.eclipse.che.ide.api.dialogs;
 
 /**
  * Interface to the choice dialog component.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/ConfirmCallback.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.ui.dialogs;
+package org.eclipse.che.ide.api.dialogs;
 
 /**
  * Callback called when the user clicks on "OK" in the confirmation dialog.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/ConfirmDialog.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.ui.dialogs.confirm;
+package org.eclipse.che.ide.api.dialogs;
 
 /**
  * Interface to the confirmation dialog component.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/DialogFactory.java

@@ -8,15 +8,11 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.ui.dialogs;
+package org.eclipse.che.ide.api.dialogs;
 
 import javax.validation.constraints.NotNull;
 import org.eclipse.che.commons.annotation.Nullable;
 
-import org.eclipse.che.ide.ui.dialogs.choice.ChoiceDialog;
-import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog;
-import org.eclipse.che.ide.ui.dialogs.input.InputDialog;
-import org.eclipse.che.ide.ui.dialogs.message.MessageDialog;
 import com.google.gwt.user.client.ui.IsWidget;
 import com.google.inject.assistedinject.Assisted;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/InputCallback.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.ui.dialogs;
+package org.eclipse.che.ide.api.dialogs;
 
 /**
  * Callback called when the user clicks on "OK" in the input dialog.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/InputDialog.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.ui.dialogs.input;
+package org.eclipse.che.ide.api.dialogs;
 
 /**
  * Interface to the input dialog component.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/InputValidator.java

@@ -8,9 +8,10 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.ui.dialogs.input;
+package org.eclipse.che.ide.api.dialogs;
 
 import org.eclipse.che.commons.annotation.Nullable;
+import org.eclipse.che.ide.api.dialogs.InputDialog;
 
 /**
  * Validator for {@link InputDialog}.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/MessageDialog.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.ui.dialogs.message;
+package org.eclipse.che.ide.api.dialogs;
 
 /**
  * Interface to the message/information dialog component.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorInput.java

@@ -11,8 +11,6 @@
 package org.eclipse.che.ide.api.editor;
 
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
-import com.google.gwt.resources.client.ImageResource;
-
 import org.vectomatic.dom.svg.ui.SVGResource;
 
 import javax.validation.constraints.NotNull;
@@ -28,21 +26,6 @@ import javax.validation.constraints.NotNull;
  */
 public interface EditorInput {
 
-    /**
-     * Returns the content description for this editor input. This content description is used for editors' information panel
-     *
-     * @return the content description for this input
-     */
-    String getContentDescription();
-
-    /**
-     * Returns the image descriptor for this input.
-     *
-     * @return the image resource for this input.
-     */
-    @NotNull
-    ImageResource getImageResource();
-
     /**
      * Returns the image descriptor for this input.
      *

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorLocalizationConstants.java

@@ -8,46 +8,16 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client;
+package org.eclipse.che.ide.api.editor;
 
 import com.google.gwt.i18n.client.Messages;
 
 /**
- * I18n Constants for the JsEditor module.
+ * I18n Constants for the Editor module.
  *
  * @author "Mickaël Leduque"
  */
-public interface JsEditorConstants extends Messages {
-
-    @DefaultMessage("Default Editor")
-    String defaultEditorDescription();
-
-    @DefaultMessage("Unidentified File")
-    String infoPanelUnknownFileType();
-
-    // space is meaningful
-    @DefaultMessage("Line ")
-    String infoPaneLineLabel();
-
-    // spaces and comma are meaningful
-    @DefaultMessage(", Char ")
-    String infoPanelCharacterLabel();
-
-    // space is meaningful
-    @DefaultMessage("Tab Size: ")
-    String infoPaneTabSizeLabel();
-
-    @DefaultMessage("Editor: ")
-    String infoPaneEditorLabel();
-
-    @DefaultMessage("Key Bindings: ")
-    String infoPaneKeybindingLabel();
-
-    @DefaultMessage("Unknown")
-    String infoPanelUnknownEditorType();
-
-    @DefaultMessage("Unknown")
-    String infoPanelUnknownKeybindings();
+public interface EditorLocalizationConstants extends Messages {
 
     @DefaultMessage("Close")
     String askWindowCloseTitle();
@@ -64,19 +34,6 @@ public interface JsEditorConstants extends Messages {
     @DefaultMessage("Finishing editor initialization")
     String waitEditorInitMessage();
 
-    @DefaultMessage("File changed")
-    String fileUpdateTitle();
-
-    @DefaultMessage("The content for the file named {0} has been changed on the server.<br>"
-                    + " Do you wish to keep your unsaved changes or do you want to overwrite them with changes from the server?")
-    String fileUpdateMessage(String path);
-
-    @DefaultMessage("Overwrite")
-    String fileUpdateOverwrite();
-
-    @DefaultMessage("Keep my changes")
-    String fileUpdateKeepUnsaved();
-
     @DefaultMessage("Failed to update content of file(s)")
     String failedToUpdateContentOfFiles();
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorProvider.java

@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.che.ide.api.editor;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * Provider interface for creating new instance of {@link EditorPartPresenter}.
  *
@@ -33,6 +31,5 @@ public interface EditorProvider {
      *
      * @return new instance of {@link EditorPartPresenter}
      */
-    @NotNull
     EditorPartPresenter getEditor();
-}
+}

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationGroup.java

@@ -8,11 +8,11 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import java.util.List;
 
-import org.eclipse.che.ide.api.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
 
 import elemental.dom.Element;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationGroupImpl.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import elemental.css.CSSStyleDeclaration;
 import elemental.dom.Element;
@@ -17,7 +17,7 @@ import elemental.html.DivElement;
 import elemental.html.HTMLCollection;
 import elemental.util.Mappable;
 
-import org.eclipse.che.ide.api.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
 import org.eclipse.che.ide.util.dom.Elements;
 
 import java.util.ArrayList;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModel.java

@@ -8,15 +8,15 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import java.util.Iterator;
 import java.util.Map;
 
-import org.eclipse.che.ide.api.text.Position;
-import org.eclipse.che.ide.api.text.annotation.Annotation;
-import org.eclipse.che.ide.jseditor.client.events.DocumentChangeHandler;
-import org.eclipse.che.ide.jseditor.client.document.UseDocumentHandle;
+import org.eclipse.che.ide.api.editor.text.Position;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.events.DocumentChangeHandler;
+import org.eclipse.che.ide.api.editor.document.UseDocumentHandle;
 
 /**
  * This interface defines the model for managing annotations attached to a document. The model maintains a set of annotations for a given

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModelEvent.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17,8 +17,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.che.ide.api.text.Position;
-import org.eclipse.che.ide.api.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.text.Position;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
 import org.eclipse.che.ide.util.loging.Log;
 import com.google.gwt.event.shared.GwtEvent;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModelHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModelImpl.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,15 +18,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.eclipse.che.ide.api.text.BadPositionCategoryException;
-import org.eclipse.che.ide.api.text.Position;
-import org.eclipse.che.ide.api.text.TypedPosition;
-import org.eclipse.che.ide.api.text.annotation.Annotation;
-import org.eclipse.che.ide.jseditor.client.document.DocumentHandle;
-import org.eclipse.che.ide.jseditor.client.events.DocumentChangeEvent;
-import org.eclipse.che.ide.jseditor.client.partition.DocumentPositionMap;
-import org.eclipse.che.ide.jseditor.client.text.LinearRange;
-import org.eclipse.che.ide.jseditor.client.text.TextPosition;
+import org.eclipse.che.ide.api.editor.text.BadPositionCategoryException;
+import org.eclipse.che.ide.api.editor.text.Position;
+import org.eclipse.che.ide.api.editor.text.TypedPosition;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.document.DocumentHandle;
+import org.eclipse.che.ide.api.editor.events.DocumentChangeEvent;
+import org.eclipse.che.ide.api.editor.partition.DocumentPositionMap;
+import org.eclipse.che.ide.api.editor.text.LinearRange;
+import org.eclipse.che.ide.api.editor.text.TextPosition;
 import org.eclipse.che.ide.util.loging.Log;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationsIterator.java

@@ -8,15 +8,15 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.che.ide.api.text.Position;
-import org.eclipse.che.ide.api.text.TypedPosition;
-import org.eclipse.che.ide.api.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.text.Position;
+import org.eclipse.che.ide.api.editor.text.TypedPosition;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
 
 /**
  * An iterator iteration over a Positions and mapping positions to

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/ClearAnnotationModelEvent.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import com.google.gwt.event.shared.GwtEvent;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/ClearAnnotationModelHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/GutterAnnotationRenderer.java

@@ -8,19 +8,19 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
-import static org.eclipse.che.ide.jseditor.client.gutter.Gutters.ANNOTATION_GUTTER;
+import static org.eclipse.che.ide.api.editor.gutter.Gutters.ANNOTATION_GUTTER;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.eclipse.che.ide.api.text.Position;
-import org.eclipse.che.ide.api.text.annotation.Annotation;
-import org.eclipse.che.ide.jseditor.client.document.Document;
-import org.eclipse.che.ide.jseditor.client.gutter.Gutter;
-import org.eclipse.che.ide.jseditor.client.text.TextPosition;
+import org.eclipse.che.ide.api.editor.text.Position;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.document.Document;
+import org.eclipse.che.ide.api.editor.gutter.Gutter;
+import org.eclipse.che.ide.api.editor.text.TextPosition;
 import org.eclipse.che.ide.ui.Tooltip;
 import org.eclipse.che.ide.ui.menu.PositionController;
 import org.eclipse.che.ide.util.loging.Log;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/HasAnnotationRendering.java

@@ -8,9 +8,9 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
-import org.eclipse.che.ide.jseditor.client.document.DocumentHandle;
+import org.eclipse.che.ide.api.editor.document.DocumentHandle;
 
 /**
  * Interface for objects that may render annotations.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/InlineAnnotationRenderer.java

@@ -8,18 +8,18 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-import org.eclipse.che.ide.api.text.Position;
-import org.eclipse.che.ide.api.text.annotation.Annotation;
-import org.eclipse.che.ide.jseditor.client.document.Document;
-import org.eclipse.che.ide.jseditor.client.text.TextPosition;
-import org.eclipse.che.ide.jseditor.client.text.TextRange;
-import org.eclipse.che.ide.jseditor.client.texteditor.HasTextMarkers;
-import org.eclipse.che.ide.jseditor.client.texteditor.HasTextMarkers.MarkerRegistration;
+import org.eclipse.che.ide.api.editor.text.Position;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.document.Document;
+import org.eclipse.che.ide.api.editor.text.TextPosition;
+import org.eclipse.che.ide.api.editor.text.TextRange;
+import org.eclipse.che.ide.api.editor.texteditor.HasTextMarkers;
+import org.eclipse.che.ide.api.editor.texteditor.HasTextMarkers.MarkerRegistration;
 import org.eclipse.che.ide.util.loging.Log;
 
 /**

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/ListTooltipFactory.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import elemental.dom.Element;
 import elemental.html.LIElement;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/MinimapAnnotationRenderer.java

@@ -8,14 +8,14 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
-import org.eclipse.che.ide.api.text.Position;
-import org.eclipse.che.ide.api.text.annotation.Annotation;
-import org.eclipse.che.ide.jseditor.client.document.Document;
-import org.eclipse.che.ide.jseditor.client.minimap.Minimap;
-import org.eclipse.che.ide.jseditor.client.text.LinearRange;
-import org.eclipse.che.ide.jseditor.client.text.TextPosition;
+import org.eclipse.che.ide.api.editor.text.Position;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.document.Document;
+import org.eclipse.che.ide.api.editor.minimap.Minimap;
+import org.eclipse.che.ide.api.editor.text.LinearRange;
+import org.eclipse.che.ide.api.editor.text.TextPosition;
 import org.eclipse.che.ide.util.loging.Log;
 
 import java.util.ArrayList;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/QueryAnnotationsEvent.java

@@ -8,15 +8,15 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import java.util.Map;
 
 import org.eclipse.che.commons.annotation.Nullable;
 
-import org.eclipse.che.ide.api.text.Position;
-import org.eclipse.che.ide.api.text.annotation.Annotation;
-import org.eclipse.che.ide.jseditor.client.text.LinearRange;
+import org.eclipse.che.ide.api.editor.text.Position;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.text.LinearRange;
 import com.google.gwt.event.shared.GwtEvent;
 
 /**

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/QueryAnnotationsHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/RegionIterator.java

@@ -8,13 +8,13 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.annotation;
+package org.eclipse.che.ide.api.editor.annotation;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.eclipse.che.ide.api.text.Position;
-import org.eclipse.che.ide.api.text.annotation.Annotation;
+import org.eclipse.che.ide.api.editor.text.Position;
+import org.eclipse.che.ide.api.editor.text.annotation.Annotation;
 
 /** Iterator that returns the annotations for a given region. */
 final class RegionIterator implements Iterator<Annotation> {

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/ChangeInterceptorProvider.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.changeintercept;
+package org.eclipse.che.ide.api.editor.changeintercept;
 
 import java.util.List;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/CloseCStyleCommentChangeInterceptor.java

@@ -8,9 +8,9 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.changeintercept;
+package org.eclipse.che.ide.api.editor.changeintercept;
 
-import org.eclipse.che.ide.jseditor.client.document.ReadOnlyDocument;
+import org.eclipse.che.ide.api.editor.document.ReadOnlyDocument;
 import com.google.gwt.regexp.shared.MatchResult;
 import com.google.gwt.regexp.shared.RegExp;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/TextChange.java

@@ -8,12 +8,12 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.changeintercept;
+package org.eclipse.che.ide.api.editor.changeintercept;
 
-import org.eclipse.che.ide.jseditor.client.text.TextPosition;
+import org.eclipse.che.ide.api.editor.text.TextPosition;
 
 /**
- * The decription of a change to be examined and processed through {@link TextChangeInterceptor}s.
+ * The description of a change to be examined and processed through {@link TextChangeInterceptor}s.
  */
 public final class TextChange {
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/TextChangeInterceptor.java

@@ -8,9 +8,9 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.changeintercept;
+package org.eclipse.che.ide.api.editor.changeintercept;
 
-import org.eclipse.che.ide.jseditor.client.document.ReadOnlyDocument;
+import org.eclipse.che.ide.api.editor.document.ReadOnlyDocument;
 
 /**
  * Interface for components that modify changes in the text.<br>

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/AdditionalInfoCallback.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
 import elemental.dom.Element;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistCallback.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
 import java.util.List;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistProcessor.java

@@ -8,9 +8,9 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
-import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor;
+import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
 
 /**
  * A code assist processor proposes completions for a particular content type.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistant.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
 
 /**

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistantFactory.java

@@ -8,10 +8,10 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
-import org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner;
-import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor;
+import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner;
+import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
 
 /**
  * Factory for {@link CodeAssistant} objects.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistantImpl.java

@@ -8,11 +8,12 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
 import org.eclipse.che.ide.api.autocomplete.AutoCompleteResources;
-import org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner;
-import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor;
+import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner;
+import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
+
 import com.google.gwt.core.client.GWT;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/Completion.java

@@ -8,10 +8,10 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
-import org.eclipse.che.ide.jseditor.client.document.Document;
-import org.eclipse.che.ide.jseditor.client.text.LinearRange;
+import org.eclipse.che.ide.api.editor.document.Document;
+import org.eclipse.che.ide.api.editor.text.LinearRange;
 
 /**
  * Interface for completion objects.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionProposal.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
 import com.google.gwt.user.client.ui.Widget;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionProposalExtension.java

@@ -8,9 +8,9 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
-import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal.CompletionCallback;
+import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal.CompletionCallback;
 
 /**
  * Extends {@link CompletionProposal} with the following

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionReadyCallback.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
 import java.util.List;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionsSource.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
 /**
  * Interface for an asynchronous source of completions.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/DefaultChainedCodeAssistProcessor.java

@@ -8,15 +8,14 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
+import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor;
-
 /**
  * Allows to chain code assist processor for the default given content type. It will delegate to sub processors.
  * 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/HasCompletionInformation.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.codeassist;
+package org.eclipse.che.ide.api.editor.codeassist;
 
 /**
  * @author Evgen Vidolob

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/AbstractTextEditorProvider.java

@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2016 Codenvy, S.A.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.ide.api.editor.defaulteditor;
+
+import com.google.inject.Inject;
+
+import org.eclipse.che.ide.api.editor.EditorProvider;
+import org.eclipse.che.ide.api.editor.editorconfig.AutoSaveTextEditorConfiguration;
+import org.eclipse.che.ide.api.editor.editorconfig.TextEditorConfiguration;
+import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
+import org.eclipse.che.ide.util.loging.Log;
+
+/**
+ * This class provides an abstract implementation of the {@link EditorProvider}
+ * interface to minimize the effort required to implement this interface.
+ * <p>To implement an editor provider, the programmer needs only to extend this class and provide an
+ * implementation for the {@link #getId()} and {@link #getDescription()} methods.
+ * <p>The method {@link #getEditor()} returns {@link TextEditor}
+ * that is initialized by configuration returned by {@link #getEditorConfiguration()} method.
+ * <p>The method {@link #getEditorConfiguration()} returns {@link AutoSaveTextEditorConfiguration}
+ * instance and may be overridden in order to provide another configuration for the editor
+ * which is returned by {@link #getEditor()} method.
+ *
+ * @author Artem Zatsarynnyi
+ */
+public abstract class AbstractTextEditorProvider implements EditorProvider {
+
+    @Inject
+    private EditorBuilder editorBuilder;
+
+    /** Returns configuration for initializing an editor returned by {@link #getEditor()} method. */
+    protected TextEditorConfiguration getEditorConfiguration() {
+        return new AutoSaveTextEditorConfiguration();
+    }
+
+    @Override
+    public TextEditor getEditor() {
+        if (editorBuilder == null) {
+            Log.debug(AbstractTextEditorProvider.class, "No builder registered for default editor type - giving up.");
+            return null;
+        }
+
+        final TextEditor editor = editorBuilder.buildEditor();
+        editor.initialize(getEditorConfiguration());
+        return editor;
+    }
+}

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/DefaultTextEditorProvider.java

@@ -8,10 +8,17 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.preference.dataprovider;
+package org.eclipse.che.ide.api.editor.defaulteditor;
 
+public class DefaultTextEditorProvider extends AbstractTextEditorProvider {
 
-public interface RefreshableDataProvider {
+    @Override
+    public String getId() {
+        return "cheDefaultEditor";
+    }
 
-    void refresh();
+    @Override
+    public String getDescription() {
+        return "Che Default Editor";
+    }
 }

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/EditorBuilder.java

@@ -8,12 +8,11 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.defaulteditor;
+package org.eclipse.che.ide.api.editor.defaulteditor;
 
-import org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor;
+import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
 
 public interface EditorBuilder {
 
-    ConfigurableTextEditor buildEditor();
-
+    TextEditor buildEditor();
 }

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/AbstractDocument.java

@@ -8,14 +8,14 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.document;
+package org.eclipse.che.ide.api.editor.document;
 
+import org.eclipse.che.ide.api.editor.text.LinearRange;
+import org.eclipse.che.ide.api.editor.text.TextRange;
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
-import org.eclipse.che.ide.jseditor.client.text.LinearRange;
-import org.eclipse.che.ide.jseditor.client.text.TextRange;
 
 /** An abstract implementation of {@link Document}. */
-public abstract class AbstractEmbeddedDocument implements Document, DocumentHandle {
+public abstract class AbstractDocument implements Document, DocumentHandle {
 
     /** The document event bus. */
     private final DocumentEventBus eventBus = new DocumentEventBus();
@@ -76,5 +76,4 @@ public abstract class AbstractEmbeddedDocument implements Document, DocumentHand
     public void setSelectedRange(final LinearRange range, final boolean show) {
      // does nothing by default
     }
-
 }

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/Document.java

@@ -8,15 +8,15 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.document;
+package org.eclipse.che.ide.api.editor.document;
 
 import com.google.web.bindery.event.shared.HandlerRegistration;
 
+import org.eclipse.che.ide.api.editor.events.CursorActivityHandler;
+import org.eclipse.che.ide.api.editor.text.LinearRange;
+import org.eclipse.che.ide.api.editor.text.TextPosition;
+import org.eclipse.che.ide.api.editor.text.TextRange;
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
-import org.eclipse.che.ide.jseditor.client.events.CursorActivityHandler;
-import org.eclipse.che.ide.jseditor.client.text.LinearRange;
-import org.eclipse.che.ide.jseditor.client.text.TextPosition;
-import org.eclipse.che.ide.jseditor.client.text.TextRange;
 
 /**
  * An abstraction over the editor representation of the document.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentEventBus.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.document;
+package org.eclipse.che.ide.api.editor.document;
 
 import com.google.web.bindery.event.shared.SimpleEventBus;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentHandle.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.document;
+package org.eclipse.che.ide.api.editor.document;
 
 /**
  * Handle on an editor document.

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentStorage.java

@@ -8,38 +8,44 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.document;
+package org.eclipse.che.ide.api.editor.document;
 
-
-import org.eclipse.che.ide.api.editor.EditorInput;
-import org.eclipse.che.ide.api.project.tree.VirtualFile;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.inject.ImplementedBy;
 
-import javax.validation.constraints.NotNull;
 import org.eclipse.che.commons.annotation.Nullable;
+import org.eclipse.che.ide.api.editor.EditorInput;
+import org.eclipse.che.ide.api.project.tree.VirtualFile;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * Interface for file retrieval and storage operations.
  */
-
 @ImplementedBy(DocumentStorageImpl.class)
 public interface DocumentStorage {
 
     /**
      * Retrieves the file content.
-     * @param file the file
-     * @param callback operation to do when the content is ready
+     *
+     * @param file
+     *         the file
+     * @param callback
+     *         operation to do when the content is ready
      */
     void getDocument(@NotNull VirtualFile file,
-                     @NotNull final EmbeddedDocumentCallback callback);
+                     @NotNull final DocumentCallback callback);
 
     /**
      * Saves the file content.
-     * @param editorInput the editor input
-     * @param document the document
+     *
+     * @param editorInput
+     *         the editor input
+     * @param document
+     *         the document
      * @param overwrite
-     * @param callback operation to do when the content is ready
+     * @param callback
+     *         operation to do when the content is ready
      */
     void saveDocument(@Nullable final EditorInput editorInput,
                       @NotNull Document document,
@@ -48,23 +54,29 @@ public interface DocumentStorage {
 
     /**
      * Action taken when the document is closed.
-     * @param document the document
+     *
+     * @param document
+     *         the document
      */
-    public void documentClosed(@NotNull Document document);
+    void documentClosed(@NotNull Document document);
 
     /**
      * Action taken when retrieve action is successful.
      */
-    public interface EmbeddedDocumentCallback {
+    interface DocumentCallback {
         /**
          * Action taken when retrieve action is successful.
-         * @param content the content that was received
+         *
+         * @param content
+         *         the content that was received
          */
         void onDocumentReceived(String content);
 
         /**
          * Action taken when retrieve action fails.
-         * @param caught the exception
+         *
+         * @param caught
+         *         the exception
          */
         void onDocumentLoadFailure(Throwable caught);
     }

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentStorageImpl.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.document;
+package org.eclipse.che.ide.api.editor.document;
 
 import org.eclipse.che.api.promises.client.Operation;
 import org.eclipse.che.api.promises.client.OperationException;
@@ -18,10 +18,10 @@ import org.eclipse.che.ide.api.event.FileEvent;
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
 import org.eclipse.che.ide.util.loging.Log;
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.inject.Inject;
 import com.google.web.bindery.event.shared.EventBus;
 
 import javax.validation.constraints.NotNull;
-import javax.inject.Inject;
 
 /**
  * Implementation of {@link DocumentStorage}.
@@ -36,7 +36,7 @@ public class DocumentStorageImpl implements DocumentStorage {
     }
 
     @Override
-    public void getDocument(@NotNull final VirtualFile file, @NotNull final EmbeddedDocumentCallback callback) {
+    public void getDocument(@NotNull final VirtualFile file, @NotNull final DocumentCallback callback) {
         file.getContent().then(new Operation<String>() {
             @Override
             public void apply(String result) throws OperationException {
@@ -92,5 +92,4 @@ public class DocumentStorageImpl implements DocumentStorage {
     @Override
     public void documentClosed(final Document document) {
     }
-
 }

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/ReadOnlyDocument.java

@@ -8,11 +8,11 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.document;
+package org.eclipse.che.ide.api.editor.document;
 
-import org.eclipse.che.ide.jseditor.client.text.LinearRange;
-import org.eclipse.che.ide.jseditor.client.text.TextPosition;
-import org.eclipse.che.ide.jseditor.client.text.TextRange;
+import org.eclipse.che.ide.api.editor.text.LinearRange;
+import org.eclipse.che.ide.api.editor.text.TextPosition;
+import org.eclipse.che.ide.api.editor.text.TextRange;
 
 public interface ReadOnlyDocument {
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/UseDocumentHandle.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.document;
+package org.eclipse.che.ide.api.editor.document;
 
 /**
  * Interface for components that use a document handle.<br>

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/AutoSaveTextEditorConfiguration.java

@@ -8,11 +8,11 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.editorconfig;
+package org.eclipse.che.ide.api.editor.editorconfig;
 
-import org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner;
-import org.eclipse.che.ide.jseditor.client.reconciler.Reconciler;
-import org.eclipse.che.ide.jseditor.client.reconciler.ReconcilerWithAutoSave;
+import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner;
+import org.eclipse.che.ide.api.editor.reconciler.Reconciler;
+import org.eclipse.che.ide.api.editor.reconciler.ReconcilerWithAutoSave;
 
 /**
  * @author Evgen Vidolob

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/DefaultTextEditorConfiguration.java

@@ -8,17 +8,17 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.editorconfig;
+package org.eclipse.che.ide.api.editor.editorconfig;
 
-import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel;
-import org.eclipse.che.ide.jseditor.client.changeintercept.ChangeInterceptorProvider;
-import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor;
-import org.eclipse.che.ide.jseditor.client.formatter.ContentFormatter;
-import org.eclipse.che.ide.jseditor.client.partition.ConstantPartitioner;
-import org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner;
-import org.eclipse.che.ide.jseditor.client.partition.DocumentPositionMap;
-import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistProcessor;
-import org.eclipse.che.ide.jseditor.client.reconciler.Reconciler;
+import org.eclipse.che.ide.api.editor.annotation.AnnotationModel;
+import org.eclipse.che.ide.api.editor.changeintercept.ChangeInterceptorProvider;
+import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor;
+import org.eclipse.che.ide.api.editor.formatter.ContentFormatter;
+import org.eclipse.che.ide.api.editor.partition.ConstantPartitioner;
+import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner;
+import org.eclipse.che.ide.api.editor.partition.DocumentPositionMap;
+import org.eclipse.che.ide.api.editor.quickfix.QuickAssistProcessor;
+import org.eclipse.che.ide.api.editor.reconciler.Reconciler;
 
 import java.util.Map;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/EditorUpdateAction.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.editorconfig;
+package org.eclipse.che.ide.api.editor.editorconfig;
 
 /** Interface for update operations on the editor. */
 public interface EditorUpdateAction {

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/TextEditorConfiguration.java

@@ -8,17 +8,17 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.editorconfig;
+package org.eclipse.che.ide.api.editor.editorconfig;
 
 import org.eclipse.che.commons.annotation.Nullable;
-import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel;
-import org.eclipse.che.ide.jseditor.client.changeintercept.ChangeInterceptorProvider;
-import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor;
-import org.eclipse.che.ide.jseditor.client.formatter.ContentFormatter;
-import org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner;
-import org.eclipse.che.ide.jseditor.client.partition.DocumentPositionMap;
-import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistProcessor;
-import org.eclipse.che.ide.jseditor.client.reconciler.Reconciler;
+import org.eclipse.che.ide.api.editor.annotation.AnnotationModel;
+import org.eclipse.che.ide.api.editor.changeintercept.ChangeInterceptorProvider;
+import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor;
+import org.eclipse.che.ide.api.editor.formatter.ContentFormatter;
+import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner;
+import org.eclipse.che.ide.api.editor.partition.DocumentPositionMap;
+import org.eclipse.che.ide.api.editor.quickfix.QuickAssistProcessor;
+import org.eclipse.che.ide.api.editor.reconciler.Reconciler;
 
 import javax.validation.constraints.NotNull;
 import java.util.Map;
@@ -33,7 +33,7 @@ public interface TextEditorConfiguration {
      *
      * @return the tab width
      */
-    public int getTabWidth();
+    int getTabWidth();
 
     /**
      * Returns the content formatter.
@@ -41,7 +41,7 @@ public interface TextEditorConfiguration {
      * @return the content formatter
      */
     @Nullable
-    public ContentFormatter getContentFormatter();
+    ContentFormatter getContentFormatter();
 
     /**
      * Returns the content assistant (completion) processors.
@@ -49,7 +49,7 @@ public interface TextEditorConfiguration {
      * @return the code assist processors
      */
     @Nullable
-    public Map<String, CodeAssistProcessor> getContentAssistantProcessors();
+    Map<String, CodeAssistProcessor> getContentAssistantProcessors();
 
     /**
      * Returns the reconciler.
@@ -57,7 +57,7 @@ public interface TextEditorConfiguration {
      * @return the reconciler
      */
     @Nullable
-    public Reconciler getReconciler();
+    Reconciler getReconciler();
 
     /**
      * Returns the document partitioner.
@@ -65,7 +65,7 @@ public interface TextEditorConfiguration {
      * @return the document partitioner
      */
     @NotNull
-    public DocumentPartitioner getPartitioner();
+    DocumentPartitioner getPartitioner();
 
     /**
      * Return the document position model.
@@ -73,7 +73,7 @@ public interface TextEditorConfiguration {
      * @return the position model
      */
     @Nullable
-    public DocumentPositionMap getDocumentPositionMap();
+    DocumentPositionMap getDocumentPositionMap();
 
     /**
      * Return the annotation model.
@@ -81,7 +81,7 @@ public interface TextEditorConfiguration {
      * @return the annotation model
      */
     @Nullable
-    public AnnotationModel getAnnotationModel();
+    AnnotationModel getAnnotationModel();
 
     /**
      * Return the Quickassist assistant processor.
@@ -89,10 +89,10 @@ public interface TextEditorConfiguration {
      * @return the quickassist assistant processor
      */
     @Nullable
-    public QuickAssistProcessor getQuickAssistProcessor();
+    QuickAssistProcessor getQuickAssistProcessor();
 
     /**
-     * Return the {@link org.eclipse.che.ide.jseditor.client.changeintercept.ChangeInterceptorProvider}.<br>
+     * Return the {@link ChangeInterceptorProvider}.<br>
      * @return the change interceptors
      */
     @Nullable

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/BeforeSelectionChangeEvent.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.GwtEvent;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/BeforeSelectionChangeHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CompletionRequestEvent.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.GwtEvent;
 /**

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CompletionRequestHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CursorActivityEvent.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.GwtEvent;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CursorActivityHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentChangeEvent.java

@@ -8,9 +8,9 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
-import org.eclipse.che.ide.jseditor.client.document.DocumentHandle;
+import org.eclipse.che.ide.api.editor.document.DocumentHandle;
 import com.google.gwt.event.shared.GwtEvent;
 
 public class DocumentChangeEvent extends GwtEvent<DocumentChangeHandler> {

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentChangeHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentReadyEvent.java

@@ -8,10 +8,11 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
+
+import org.eclipse.che.ide.api.editor.document.Document;
+import org.eclipse.che.ide.api.editor.texteditor.EditorHandle;
 
-import org.eclipse.che.ide.jseditor.client.document.Document;
-import org.eclipse.che.ide.jseditor.client.texteditor.EditorHandle;
 import com.google.gwt.event.shared.GwtEvent;
 
 public class DocumentReadyEvent extends GwtEvent<DocumentReadyHandler> {

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentReadyHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/GutterClickEvent.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import elemental.events.MouseEvent;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/GutterClickHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasBeforeSelectionChangeHandlers.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.event.shared.HasHandlers;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasCursorActivityHandlers.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.event.shared.HasHandlers;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasDocumentReadyHandlers.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.event.shared.HasHandlers;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasGutterClickHandlers.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.event.shared.HasHandlers;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasViewPortChangeHandlers.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.event.shared.HasHandlers;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/TextChangeEvent.java

@@ -8,13 +8,14 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import javax.validation.constraints.NotNull;
 
-import org.eclipse.che.ide.jseditor.client.changeintercept.TextChange;
 import com.google.gwt.event.shared.GwtEvent;
 
+import org.eclipse.che.ide.api.editor.changeintercept.TextChange;
+
 /**
  * An event describing a change in the text of an editor.
  */

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/TextChangeHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/ViewPortChangeEvent.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.GwtEvent;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/ViewPortChangeHandler.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events;
+package org.eclipse.che.ide.api.editor.events;
 
 import com.google.gwt.event.shared.EventHandler;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/doc/DocReadyWrapper.java

@@ -8,14 +8,15 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.events.doc;
+package org.eclipse.che.ide.api.editor.events.doc;
 
 import org.eclipse.che.commons.annotation.Nullable;
 
-import org.eclipse.che.ide.jseditor.client.document.DocumentHandle;
-import org.eclipse.che.ide.jseditor.client.events.DocumentReadyEvent;
-import org.eclipse.che.ide.jseditor.client.events.DocumentReadyHandler;
-import org.eclipse.che.ide.jseditor.client.texteditor.EditorHandle;
+import org.eclipse.che.ide.api.editor.document.DocumentHandle;
+import org.eclipse.che.ide.api.editor.events.DocumentReadyEvent;
+import org.eclipse.che.ide.api.editor.events.DocumentReadyHandler;
+import org.eclipse.che.ide.api.editor.texteditor.EditorHandle;
+
 import com.google.web.bindery.event.shared.EventBus;
 import com.google.web.bindery.event.shared.HandlerRegistration;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/ExtensionFileTypeIdentifier.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.filetype;
+package org.eclipse.che.ide.api.editor.filetype;
 
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
 import org.eclipse.che.ide.util.loging.Log;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/FileNameFileTypeIdentifier.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.filetype;
+package org.eclipse.che.ide.api.editor.filetype;
 
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/FileTypeIdentifier.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.filetype;
+package org.eclipse.che.ide.api.editor.filetype;
 
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/FirstLineFileTypeIdentifier.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.filetype;
+package org.eclipse.che.ide.api.editor.filetype;
 
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/MultipleMethodFileIdentifier.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.filetype;
+package org.eclipse.che.ide.api.editor.filetype;
 
 import org.eclipse.che.ide.api.project.tree.VirtualFile;
 import org.eclipse.che.ide.util.loging.Log;

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/formatter/ContentFormatter.java

@@ -8,16 +8,16 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.formatter;
+package org.eclipse.che.ide.api.editor.formatter;
 
-import org.eclipse.che.ide.jseditor.client.document.Document;
+import org.eclipse.che.ide.api.editor.document.Document;
 
 /**
  * The interface of a document content formatter. The formatter formats ranges within documents.
  */
 public interface ContentFormatter {
     /**
-     * Formats the given region of the specified document.The org.eclipse.che.ide.jseditor.client.formatter may safely
+     * Formats the given region of the specified document.The org.eclipse.che.ide.api.editor.formatter may safely
      * assume that it is the only subject that modifies the document at this point in time.
      *
      * @param document

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/gutter/Gutter.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.gutter;
+package org.eclipse.che.ide.api.editor.gutter;
 
 import elemental.dom.Element;
 

core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/gutter/Gutters.java

@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.jseditor.client.gutter;
+package org.eclipse.che.ide.api.editor.gutter;
 
 public final class Gutters {