Move AutoSaveMode into suitable module

eclipse-che · May 23, 2017 · aa2c333 · aa2c333
1 parent d57a188
commit aa2c333
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/...ide/editor/orion/client/AutoSaveMode.java → ...ide/api/editor/autosave/AutoSaveMode.java b/...ide/editor/orion/client/AutoSaveMode.java → ...ide/api/editor/autosave/AutoSaveMode.java
@@ -8,12 +8,11 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.editor.orion.client;
+package org.eclipse.che.ide.api.editor.autosave;
 
 import org.eclipse.che.ide.api.editor.document.UseDocumentHandle;
 import org.eclipse.che.ide.api.editor.events.DocumentChangeHandler;
 import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
-import org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties;
 
 /**
  * Editor content auto save functionality.
@@ -38,8 +37,7 @@ public interface AutoSaveMode extends DocumentChangeHandler, UseDocumentHandle {
     void suspend();
 
     /**
-     * Resumes auto save mode for editor content and sets mode corresponding to option {@link EditorProperties#ENABLE_AUTO_SAVE} in editor
-     * preferences.
+     * Resumes auto save mode for editor content and sets mode corresponding to 'Enable Autosave' option in editor preferences.
      */
     void resume();
 
@@ -51,8 +49,7 @@ public interface AutoSaveMode extends DocumentChangeHandler, UseDocumentHandle {
     enum Mode {
         /**
          * The state when auto save mode of editor content is turned on.
-         * Corresponds to the case when the option {@link EditorProperties#ENABLE_AUTO_SAVE} in editor
-         * preferences is enabled.
+         * Corresponds to the case when the 'Enable Autosave' option in editor preferences is enabled.
          */
         ACTIVATED,
 
@@ -61,8 +58,7 @@ enum Mode {
 
         /**
          * The state when auto save mode of editor content is turned off.
-         * Corresponds to the case when the option {@link EditorProperties#ENABLE_AUTO_SAVE} in editor
-         * preferences is disabled.
+         * Corresponds to the case when the 'Enable Autosave' option in editor preferences is disabled.
          */
         DEACTIVATED
     }

diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorApiModule.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorApiModule.java
@@ -18,6 +18,7 @@
 import org.eclipse.che.ide.api.editor.EditorAgent;
 import org.eclipse.che.ide.api.editor.EditorProvider;
 import org.eclipse.che.ide.api.editor.EditorRegistry;
+import org.eclipse.che.ide.api.editor.autosave.AutoSaveMode;
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistant;
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistantFactory;
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistantImpl;
@@ -33,6 +34,7 @@
 import org.eclipse.che.ide.api.editor.reconciler.Reconciler;
 import org.eclipse.che.ide.api.editor.reconciler.ReconcilerFactory;
 import org.eclipse.che.ide.api.editor.texteditor.TextEditorPartView;
+import org.eclipse.che.ide.editor.autosave.AutoSaveModeImpl;
 import org.eclipse.che.ide.editor.quickfix.QuickAssistAssistantImpl;
 import org.eclipse.che.ide.editor.quickfix.QuickAssistWidgetFactory;
 import org.eclipse.che.ide.editor.synchronization.EditorContentSynchronizer;
@@ -61,6 +63,8 @@ public class EditorApiModule extends AbstractGinModule {
     protected void configure() {
         bind(EditorAgent.class).to(EditorAgentImpl.class).in(Singleton.class);
 
+        bind(AutoSaveMode.class).to(AutoSaveModeImpl.class);
+
         bind(UserActivityManager.class).in(Singleton.class);
 
         bind(EditorRegistry.class).to(EditorRegistryImpl.class).in(Singleton.class);

diff --git a/...editor/orion/client/AutoSaveModeImpl.java → ...ide/editor/autosave/AutoSaveModeImpl.java b/...editor/orion/client/AutoSaveModeImpl.java → ...ide/editor/autosave/AutoSaveModeImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.editor.orion.client;
+package org.eclipse.che.ide.editor.autosave;
 
 import com.google.gwt.user.client.Timer;
 import com.google.inject.Inject;
@@ -18,6 +18,7 @@
 import org.eclipse.che.ide.api.editor.EditorOpenedEvent;
 import org.eclipse.che.ide.api.editor.EditorOpenedEventHandler;
 import org.eclipse.che.ide.api.editor.EditorPartPresenter;
+import org.eclipse.che.ide.api.editor.autosave.AutoSaveMode;
 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.reconciler.DirtyRegion;
@@ -32,14 +33,14 @@
 import org.eclipse.che.ide.api.resources.Resource;
 import org.eclipse.che.ide.api.resources.VirtualFile;
 import org.eclipse.che.ide.editor.preferences.EditorPreferencesManager;
+import org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties;
 import org.eclipse.che.ide.editor.synchronization.workingCopy.EditorWorkingCopySynchronizer;
 
 import java.util.HashSet;
 
-import static org.eclipse.che.ide.editor.orion.client.AutoSaveMode.Mode.ACTIVATED;
-import static org.eclipse.che.ide.editor.orion.client.AutoSaveMode.Mode.DEACTIVATED;
-import static org.eclipse.che.ide.editor.orion.client.AutoSaveMode.Mode.SUSPENDED;
-import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.ENABLE_AUTO_SAVE;
+import static org.eclipse.che.ide.api.editor.autosave.AutoSaveMode.Mode.ACTIVATED;
+import static org.eclipse.che.ide.api.editor.autosave.AutoSaveMode.Mode.DEACTIVATED;
+import static org.eclipse.che.ide.api.editor.autosave.AutoSaveMode.Mode.SUSPENDED;
 
 /**
  * Default implementation of {@link AutoSaveMode} which provides auto save function for editor content.
@@ -124,7 +125,7 @@ public void onEditorSettingsChanged(EditorSettingsChangedEvent event) {
     }
 
     private void updateAutoSaveState() {
-        Boolean autoSaveValue = editorPreferencesManager.getBooleanValueFor(ENABLE_AUTO_SAVE);
+        Boolean autoSaveValue = editorPreferencesManager.getBooleanValueFor(EditorProperties.ENABLE_AUTO_SAVE);
         if (autoSaveValue == null) {
             return;
         }

diff --git a/...e-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorInit.java b/...e-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorInit.java
@@ -15,6 +15,7 @@
 import org.eclipse.che.ide.api.editor.annotation.AnnotationModel;
 import org.eclipse.che.ide.api.editor.annotation.HasAnnotationRendering;
 import org.eclipse.che.ide.api.editor.annotation.QueryAnnotationsEvent;
+import org.eclipse.che.ide.api.editor.autosave.AutoSaveMode;
 import org.eclipse.che.ide.api.editor.changeintercept.ChangeInterceptorProvider;
 import org.eclipse.che.ide.api.editor.changeintercept.TextChange;
 import org.eclipse.che.ide.api.editor.changeintercept.TextChangeInterceptor;
@@ -63,11 +64,11 @@ public class OrionEditorInit {
     private static final String CONTENT_ASSIST = "Content assist";
     private static final String QUICK_FIX      = "Quick fix";
 
-    private final AutoSaveMode autoSaveMode;
+    private final AutoSaveMode            autoSaveMode;
     private final TextEditorConfiguration configuration;
-    private final CodeAssistantFactory codeAssistantFactory;
-    private final OrionEditorPresenter textEditor;
-    private final QuickAssistAssistant quickAssist;
+    private final CodeAssistantFactory    codeAssistantFactory;
+    private final OrionEditorPresenter    textEditor;
+    private final QuickAssistAssistant    quickAssist;
 
     /**
      * The quick assist assistant.

diff --git a/...on-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java b/...on-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java
@@ -52,6 +52,7 @@
 import org.eclipse.che.ide.api.editor.annotation.ClearAnnotationModelEvent;
 import org.eclipse.che.ide.api.editor.annotation.ClearAnnotationModelHandler;
 import org.eclipse.che.ide.api.editor.annotation.HasAnnotationRendering;
+import org.eclipse.che.ide.api.editor.autosave.AutoSaveMode;
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor;
 import org.eclipse.che.ide.api.editor.codeassist.CodeAssistantFactory;
 import org.eclipse.che.ide.api.editor.codeassist.CompletionsSource;

diff --git a/...or/src/main/java/org/eclipse/che/ide/editor/orion/client/inject/OrionEditorGinModule.java b/...or/src/main/java/org/eclipse/che/ide/editor/orion/client/inject/OrionEditorGinModule.java
@@ -18,8 +18,6 @@
 import org.eclipse.che.ide.api.editor.defaulteditor.EditorBuilder;
 import org.eclipse.che.ide.api.editor.texteditor.EditorWidgetFactory;
 import org.eclipse.che.ide.api.extension.ExtensionGinModule;
-import org.eclipse.che.ide.editor.orion.client.AutoSaveMode;
-import org.eclipse.che.ide.editor.orion.client.AutoSaveModeImpl;
 import org.eclipse.che.ide.editor.orion.client.ContentAssistWidgetFactory;
 import org.eclipse.che.ide.editor.orion.client.OrionEditorBuilder;
 import org.eclipse.che.ide.editor.orion.client.OrionEditorWidget;
@@ -34,8 +32,6 @@ protected void configure() {
 
         bind(EditorBuilder.class).to(OrionEditorBuilder.class);
 
-        bind(AutoSaveMode.class).to(AutoSaveModeImpl.class);
-
         install(new GinFactoryModuleBuilder().build(new TypeLiteral<EditorWidgetFactory<OrionEditorWidget>>() {}));
 
         bind(OrionCodeEditWidgetOverlay.class).toProvider(OrionCodeEditWidgetProvider.class);