From 07d341f4e350fcec10366e9d0c7d7f6fe8520317 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Fri, 6 May 2016 16:54:34 +0300 Subject: [PATCH] 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 | 5 - core/ide/che-core-ide-api/pom.xml | 15 +- .../che/ide/api}/debug/Breakpoint.java | 2 +- .../che/ide/api}/debug/BreakpointManager.java | 2 +- .../debug/BreakpointManagerObservable.java | 2 +- .../api}/debug/BreakpointManagerObserver.java | 2 +- .../ide/api}/debug/BreakpointRenderer.java | 2 +- .../api}/debug/BreakpointRendererFactory.java | 9 +- .../ide/api}/debug/HasBreakpointRenderer.java | 2 +- .../che/ide/api}/dialogs/CancelCallback.java | 2 +- .../che/ide/api/dialogs}/ChoiceDialog.java | 2 +- .../che/ide/api}/dialogs/ConfirmCallback.java | 2 +- .../che/ide/api/dialogs}/ConfirmDialog.java | 2 +- .../che/ide/api}/dialogs/DialogFactory.java | 6 +- .../che/ide/api}/dialogs/InputCallback.java | 2 +- .../che/ide/api/dialogs}/InputDialog.java | 2 +- .../che/ide/api/dialogs}/InputValidator.java | 3 +- .../che/ide/api/dialogs}/MessageDialog.java | 2 +- .../che/ide/api/editor/EditorInput.java | 17 - .../editor/EditorLocalizationConstants.java} | 49 +- .../che/ide/api/editor/EditorProvider.java | 5 +- .../editor}/annotation/AnnotationGroup.java | 4 +- .../annotation/AnnotationGroupImpl.java | 4 +- .../editor}/annotation/AnnotationModel.java | 10 +- .../annotation/AnnotationModelEvent.java | 6 +- .../annotation/AnnotationModelHandler.java | 2 +- .../annotation/AnnotationModelImpl.java | 20 +- .../annotation/AnnotationsIterator.java | 8 +- .../annotation/ClearAnnotationModelEvent.java | 2 +- .../ClearAnnotationModelHandler.java | 2 +- .../annotation/GutterAnnotationRenderer.java | 14 +- .../annotation/HasAnnotationRendering.java | 4 +- .../annotation/InlineAnnotationRenderer.java | 16 +- .../annotation/ListTooltipFactory.java | 2 +- .../annotation/MinimapAnnotationRenderer.java | 14 +- .../annotation/QueryAnnotationsEvent.java | 8 +- .../annotation/QueryAnnotationsHandler.java | 2 +- .../editor}/annotation/RegionIterator.java | 6 +- .../ChangeInterceptorProvider.java | 2 +- .../CloseCStyleCommentChangeInterceptor.java | 4 +- .../editor}/changeintercept/TextChange.java | 6 +- .../TextChangeInterceptor.java | 4 +- .../codeassist/AdditionalInfoCallback.java | 2 +- .../codeassist/CodeAssistCallback.java | 2 +- .../codeassist/CodeAssistProcessor.java | 4 +- .../api/editor}/codeassist/CodeAssistant.java | 2 +- .../codeassist/CodeAssistantFactory.java | 6 +- .../editor}/codeassist/CodeAssistantImpl.java | 7 +- .../api/editor}/codeassist/Completion.java | 6 +- .../codeassist/CompletionProposal.java | 2 +- .../CompletionProposalExtension.java | 4 +- .../codeassist/CompletionReadyCallback.java | 2 +- .../editor}/codeassist/CompletionsSource.java | 2 +- .../DefaultChainedCodeAssistProcessor.java | 5 +- .../codeassist/HasCompletionInformation.java | 2 +- .../AbstractTextEditorProvider.java | 55 ++ .../DefaultTextEditorProvider.java} | 13 +- .../editor}/defaulteditor/EditorBuilder.java | 7 +- .../editor/document/AbstractDocument.java} | 9 +- .../ide/api/editor}/document/Document.java | 10 +- .../editor}/document/DocumentEventBus.java | 2 +- .../api/editor}/document/DocumentHandle.java | 2 +- .../api/editor}/document/DocumentStorage.java | 46 +- .../editor}/document/DocumentStorageImpl.java | 7 +- .../editor}/document/ReadOnlyDocument.java | 8 +- .../editor}/document/UseDocumentHandle.java | 2 +- .../AutoSaveTextEditorConfiguration.java | 8 +- .../DefaultTextEditorConfiguration.java | 20 +- .../editorconfig/EditorUpdateAction.java | 2 +- .../editorconfig/TextEditorConfiguration.java | 36 +- .../events/BeforeSelectionChangeEvent.java | 2 +- .../events/BeforeSelectionChangeHandler.java | 2 +- .../events/CompletionRequestEvent.java | 2 +- .../events/CompletionRequestHandler.java | 2 +- .../editor}/events/CursorActivityEvent.java | 2 +- .../editor}/events/CursorActivityHandler.java | 2 +- .../editor}/events/DocumentChangeEvent.java | 4 +- .../editor}/events/DocumentChangeHandler.java | 2 +- .../editor}/events/DocumentReadyEvent.java | 7 +- .../editor}/events/DocumentReadyHandler.java | 2 +- .../api/editor}/events/GutterClickEvent.java | 2 +- .../editor}/events/GutterClickHandler.java | 2 +- .../HasBeforeSelectionChangeHandlers.java | 2 +- .../events/HasCursorActivityHandlers.java | 2 +- .../events/HasDocumentReadyHandlers.java | 2 +- .../events/HasGutterClickHandlers.java | 2 +- .../events/HasViewPortChangeHandlers.java | 2 +- .../api/editor}/events/TextChangeEvent.java | 5 +- .../api/editor}/events/TextChangeHandler.java | 2 +- .../editor}/events/ViewPortChangeEvent.java | 2 +- .../editor}/events/ViewPortChangeHandler.java | 2 +- .../editor}/events/doc/DocReadyWrapper.java | 11 +- .../filetype/ExtensionFileTypeIdentifier.java | 2 +- .../filetype/FileNameFileTypeIdentifier.java | 2 +- .../editor}/filetype/FileTypeIdentifier.java | 2 +- .../filetype/FirstLineFileTypeIdentifier.java | 2 +- .../MultipleMethodFileIdentifier.java | 2 +- .../editor}/formatter/ContentFormatter.java | 6 +- .../che/ide/api/editor}/gutter/Gutter.java | 2 +- .../che/ide/api/editor}/gutter/Gutters.java | 2 +- .../che/ide/api/editor}/gutter/HasGutter.java | 2 +- .../ide/api/editor/keymap/KeyBinding.java} | 8 +- .../api/editor}/keymap/KeyBindingAction.java | 2 +- .../che/ide/api/editor}/keymap/Keymap.java | 49 +- .../api/editor}/keymap/KeymapChangeEvent.java | 19 +- .../editor}/keymap/KeymapChangeHandler.java | 2 +- .../ide/api/editor}/link/HasLinkedMode.java | 2 +- .../che/ide/api/editor}/link/LinkedMode.java | 2 +- .../che/ide/api/editor}/link/LinkedModel.java | 2 +- .../ide/api/editor}/link/LinkedModelData.java | 2 +- .../api/editor}/link/LinkedModelGroup.java | 4 +- .../ide/api/editor}/minimap/HasMinimap.java | 2 +- .../che/ide/api/editor}/minimap/Minimap.java | 2 +- .../editor}/partition/CharacterScanner.java | 2 +- .../partition/ConstantPartitioner.java | 10 +- .../editor}/partition/DefaultPartitioner.java | 20 +- .../partition/DocumentPartitioner.java | 10 +- .../partition/DocumentPositionMap.java | 8 +- .../partition/DocumentPositionMapImpl.java | 10 +- .../editor}/partition/PartitionScanner.java | 2 +- .../editor}/partition/PartitionerFactory.java | 2 +- .../partition/StringCharacterScanner.java | 2 +- .../api/editor}/partition/TokenScanner.java | 4 +- .../editor}/position/PositionConverter.java | 4 +- .../quickfix/QuickAssistAssistant.java | 4 +- .../QuickAssistInvocationContext.java | 7 +- .../quickfix/QuickAssistProcessor.java | 5 +- .../quickfix/QuickAssistantFactory.java | 6 +- .../api/editor}/reconciler/DirtyRegion.java | 4 +- .../editor}/reconciler/DirtyRegionQueue.java | 2 +- .../api/editor}/reconciler/Reconciler.java | 8 +- .../editor}/reconciler/ReconcilerFactory.java | 4 +- .../reconciler/ReconcilerWithAutoSave.java | 21 +- .../reconciler/ReconcilingStrategy.java | 10 +- .../text/BadLocationException.java | 2 +- .../text/BadPositionCategoryException.java | 2 +- .../che/ide/api/editor}/text/LinearRange.java | 2 +- .../ide/api/{ => editor}/text/Position.java | 2 +- .../che/ide/api/{ => editor}/text/Region.java | 2 +- .../ide/api/{ => editor}/text/RegionImpl.java | 2 +- .../ide/api/editor}/text/TextPosition.java | 2 +- .../che/ide/api/editor}/text/TextRange.java | 2 +- .../api/{ => editor}/text/TypedPosition.java | 2 +- .../api/{ => editor}/text/TypedRegion.java | 2 +- .../{ => editor}/text/TypedRegionImpl.java | 2 +- .../text/annotation/Annotation.java | 8 +- .../api/{ => editor}/text/rules/Token.java | 2 +- .../{ => editor}/text/rules/TokenImpl.java | 2 +- .../texteditor/AbstractEditorModule.java | 4 +- .../texteditor/CompositeEditorWidget.java | 14 +- .../texteditor/ContentInitializedHandler.java | 2 +- .../{ => editor}/texteditor/CursorModel.java | 4 +- .../texteditor}/CursorModelWithHandler.java | 7 +- .../api/editor}/texteditor/EditorHandle.java | 2 +- .../texteditor/EditorInitCallback.java | 10 +- .../api/editor}/texteditor/EditorModule.java | 8 +- .../editor}/texteditor/EditorResources.java | 2 +- .../api/editor}/texteditor/EditorWidget.java | 38 +- .../texteditor/EditorWidgetFactory.java | 4 +- .../texteditor/HandlesTextOperations.java | 2 +- .../texteditor/HandlesUndoRedo.java | 2 +- .../editor/texteditor/HasKeyBindings.java} | 14 +- .../texteditor/HasNotificationPanel.java | 2 +- .../texteditor/HasReadOnlyProperty.java | 2 +- .../editor}/texteditor/HasTextMarkers.java | 7 +- .../api/editor}/texteditor/LineStyler.java | 23 +- .../TemporaryKeyBindingsManager.java | 37 ++ .../api/editor}/texteditor/TextEditor.java | 68 ++- .../texteditor/TextEditorCursorModel.java} | 19 +- .../editor}/texteditor/TextEditorInit.java | 95 ++-- .../texteditor/TextEditorOperations.java | 2 +- .../texteditor/TextEditorPartView.java} | 65 ++- .../texteditor/TextEditorPresenter.java} | 244 +++++---- .../TextEditorPresenterFactory.java} | 23 +- .../texteditor/UndoableEditor.java | 2 +- .../che/ide/api/filetypes/FileType.java | 112 +---- .../ide/api/filetypes/FileTypeRegistry.java | 9 - .../che/ide/api}/hotkeys/HasHotKeyItems.java | 2 +- .../che/ide/api}/hotkeys/HotKeyItem.java | 2 +- .../AbstractPreferencePagePresenter.java | 30 +- .../preferences/PreferencePagePresenter.java | 8 - .../ide/api/texteditor/IsConfigurable.java | 21 - .../resources/org/eclipse/che/ide/Api.gwt.xml | 1 + .../autocomplete/AutocompleteComponent.css | 1 - .../che/ide/api/editor}/texteditor/Editor.css | 0 ...oseCStyleCommentChangeInterceptorTest.java | 9 +- .../texteditor/TextEditorPresenterTest.java} | 70 ++- core/ide/che-core-ide-app/pom.xml | 4 - .../che/ide/actions/CompleteAction.java | 4 +- .../che/ide/actions/DeleteItemAction.java | 6 +- .../che/ide/actions/ExportConfigAction.java | 2 +- .../che/ide/actions/FindReplaceAction.java | 91 ---- .../che/ide/actions/FormatterAction.java | 4 +- .../che/ide/actions/OpenFileAction.java | 5 +- .../eclipse/che/ide/actions/PasteAction.java | 10 +- .../eclipse/che/ide/actions/RedoAction.java | 4 +- .../che/ide/actions/RenameItemAction.java | 10 +- .../eclipse/che/ide/actions/UndoAction.java | 4 +- .../ide/actions/WorkspaceSnapshotCreator.java | 6 +- .../ide/client/StartUpActionsProcessor.java | 4 +- .../che/ide/context/AppContextImpl.java | 2 +- .../eclipse/che/ide/core/CoreGinModule.java | 10 +- .../core/StandardComponentInitializer.java | 19 +- .../che/ide}/debug/BreakpointManagerImpl.java | 34 +- .../ide}/debug/BreakpointRendererImpl.java | 16 +- .../che/ide}/debug/BreakpointResources.java | 2 +- .../eclipse/che/ide}/debug/Breakpoints.java | 4 +- .../che/ide/debug/DebuggerObserver.java | 1 + .../che/ide/debug/dto/BreakpointDto.java | 5 +- .../che/ide/editor/EditorAgentImpl.java | 5 +- .../che/ide/editor/EditorGinModule.java | 91 ++++ .../che/ide/editor/EditorInputImpl.java | 14 +- .../che/ide/editor/EditorRegistryImpl.java | 22 +- .../AdditionalInformationWidget.java | 6 +- .../EditorPrefLocalizationConstant.java | 5 +- .../EditorPreferencePresenter.java | 11 +- .../preferences}/EditorPreferenceSection.java | 4 +- .../preferences}/EditorPreferenceView.java | 2 +- .../EditorPreferenceViewImpl.java | 9 +- .../EditorPreferenceViewImpl.ui.xml | 0 .../EditorPreferencesGinModule.java | 36 +- .../editorproperties/EditorProperties.java | 2 +- .../EditorPropertiesManager.java | 40 +- .../EditorPropertiesPresenter.java | 10 +- .../EditorPropertiesView.java | 2 +- .../EditorPropertiesViewImpl.java | 2 +- .../EditorPropertiesViewImpl.ui.xml | 1 - .../EditorPropertiesSectionPresenter.java | 16 +- .../EditorPropertiesSectionView.java | 2 +- .../EditorPropertiesSectionViewImpl.java | 8 +- .../EditorPropertiesSectionViewImpl.ui.xml | 1 - .../property/EditorBooleanPropertyWidget.java | 2 +- .../property/EditorNumberPropertyWidget.java | 2 +- .../property/EditorPropertyBaseWidget.java | 2 +- .../property/EditorPropertyBaseWidget.ui.xml | 0 .../property/EditorPropertyWidget.java | 2 +- .../property/EditorPropertyWidgetFactory.java | 2 +- .../property/EditorStringPropertyWidget.java | 2 +- .../EditorPreferenceSectionFactory.java | 4 +- .../sections/EditorPropertiesSection.java | 2 +- .../LanguageToolsPropertiesSection.java | 14 +- .../sections/RulersPropertiesSection.java | 20 +- .../sections/TabsPropertiesSection.java | 14 +- .../sections/TypingPropertiesSection.java | 24 +- .../WhiteSpacesPropertiesSection.java | 16 +- .../keymaps/KeyMapsPreferencePresenter.java | 106 ++++ .../keymaps/KeymapsPreferenceView.java | 31 +- .../keymaps/KeymapsPreferenceViewImpl.java | 77 +++ .../keymaps/KeymapsPreferenceViewImpl.ui.xml | 7 +- .../quickfix/QuickAssistAssistantImpl.java | 13 +- .../editor}/quickfix/QuickAssistWidget.java | 18 +- .../quickfix/QuickAssistWidgetFactory.java | 6 +- .../texteditor/TextEditorPartViewImpl.java} | 41 +- .../texteditor/TextEditorPartViewImpl.ui.xml} | 4 +- .../texteditor}/infopanel/InfoPanel.java | 20 +- .../texteditor}/infopanel/InfoPanel.ui.xml | 0 .../che/ide/filetypes/FileTypeModule.java | 26 +- .../ide/filetypes/FileTypeRegistryImpl.java | 13 - .../dialog/HotKeysDialogPresenter.java | 4 +- .../ide/hotkeys/dialog/HotKeysDialogView.java | 2 +- .../hotkeys/dialog/HotKeysDialogViewImpl.java | 2 +- .../che/ide/imageviewer/ImageViewer.java | 8 +- .../ide/imageviewer/ImageViewerProvider.java | 1 - .../AbstractNewResourceAction.java | 13 +- .../che/ide/newresource/NewFolderAction.java | 4 +- .../oauth/DefaultOAuthAuthenticatorImpl.java | 9 +- .../OAuth2AuthenticatorRegistryImpl.java | 5 +- .../ProjectConfigSynchronizationListener.java | 6 +- .../widgets/editortab/EditorTabWidget.java | 2 +- .../ide/preferences/PreferencesPresenter.java | 6 +- .../pages/appearance/AppearancePresenter.java | 2 +- .../extensions/ExtensionManagerPresenter.java | 2 +- .../project/node/icon/FileIconProvider.java | 4 +- .../node/remove/DeleteNodeHandler.java | 6 +- .../projectimport/wizard/ProjectImporter.java | 2 +- .../ImportProjectWizardPresenter.java | 2 +- .../ide/projecttype/wizard/ProjectWizard.java | 6 +- .../presenter/ProjectWizardPresenter.java | 2 +- .../workspace/DefaultWorkspaceComponent.java | 2 +- .../workspace/FactoryWorkspaceComponent.java | 2 +- .../che/ide/workspace/WorkspaceComponent.java | 6 +- .../org/eclipse/che/ide}/debug/breakpoint.css | 0 .../EditorPrefLocalizationConstant.properties | 0 .../NotificationManagerImplTest.java | 2 +- ...jectConfigSynchronizationListenerTest.java | 12 +- .../editortab/EditorTabWidgetTest.java | 2 +- .../LocalZipImporterPagePresenterTest.java | 2 +- .../projecttype/wizard/ProjectWizardTest.java | 8 +- core/ide/che-core-ide-jseditor/pom.xml | 168 ------- .../jseditor/client/JsEditorExtension.java | 58 --- .../defaulteditor/DefaultEditorProvider.java | 66 --- .../EditorWithoutAutoSaveProvider.java | 52 -- .../editoradapter/DefaultEditorAdapter.java | 367 -------------- .../editoradapter/DefaultEditorAdapter.ui.xml | 33 -- .../editoradapter/DummyHandlesUndoRedo.java | 48 -- .../client/editoradapter/EditorAdapter.java | 26 - .../client/editoradapter/HasEditor.java | 24 - .../client/editortype/EditorType.java | 134 ----- .../client/editortype/EditorTypeMapping.java | 58 --- .../editortype/EditorTypeMappingImpl.java | 205 -------- .../client/editortype/EditorTypeRegistry.java | 62 --- .../editortype/EditorTypeRegistryImpl.java | 100 ---- .../client/inject/JsEditorGinModule.java | 140 ------ .../client/inject/PlainTextFileType.java | 32 -- .../client/keymap/KeymapPrefReader.java | 145 ------ .../client/keymap/KeymapValuesHolder.java | 61 --- .../preference/EditorPreferenceResource.java | 40 -- .../dataprovider/FileTypeDataProvider.java | 66 --- .../dataprovider/FileTypeKeyProvider.java | 26 - .../RefreshableListDataProvider.java | 35 -- .../keymaps/KeyMapsPreferencePresenter.java | 132 ----- .../keymaps/KeymapSelectionCell.java | 131 ----- .../keymaps/KeymapSelectionColumn.java | 54 -- .../keymaps/KeymapsPreferenceViewImpl.java | 135 ----- .../DefaultEditorTypePrefReader.java | 92 ---- .../prefmodel/EditorPreferenceReader.java | 93 ---- .../client/prefmodel/EditorPreferences.java | 56 --- .../client/prefmodel/KeymapPrefReader.java | 105 ---- .../texteditor/ConfigurableTextEditor.java | 45 -- .../client/texteditor/EmbeddedTextEditor.java | 46 -- .../EmbeddedTextEditorPresenterFactory.java | 24 - .../TemporaryKeybindingsManager.java | 39 -- .../ide/jseditor/client/util/PrintMap.java | 103 ---- .../eclipse/che/ide/jseditor/JsEditor.gwt.xml | 25 - .../jseditor/client/preference/CellStyle.css | 23 - .../preference/CellTable-properties.css | 114 ----- .../client/preference/editor-icon.svg | 45 -- .../DefaultEditorAdapterTest.java | 474 ------------------ .../src/test/resources/logback-test.xml | 34 -- .../dialogs/choice/ChoiceDialogPresenter.java | 3 +- .../confirm/ConfirmDialogPresenter.java | 5 +- .../dialogs/input/InputDialogPresenter.java | 6 +- .../message/MessageDialogPresenter.java | 7 +- .../ide/ui}/popup/PopupKeyDownListener.java | 2 +- .../che/ide/ui}/popup/PopupResources.java | 2 +- .../che/ide/ui}/popup/PopupWidget.java | 2 +- .../org/eclipse/che/ide/ui}/popup/popup.css | 2 - .../eclipse/che/ide/ui/dialogs/BaseTest.java | 3 + .../input/InputDialogPresenterTest.java | 1 + .../message/MessageDialogPresenterTest.java | 3 +- core/ide/pom.xml | 1 - .../che-plugin-cpp-lang-ide/pom.xml | 8 - .../plugin/cpp/ide/CppJsEditorExtension.java | 39 -- .../cpp/ide/editor/CEditorProvider.java | 61 --- .../cpp/ide/editor/CppEditorProvider.java | 41 -- .../plugin/cpp/ide/inject/CppGinModule.java | 7 +- .../org/eclipse/che/plugin/cpp/Cpp.gwt.xml | 1 - .../debugger/client/actions/DebugAction.java | 2 +- .../actions/DeleteAllBreakpointsAction.java | 2 +- .../EditDebugConfigurationsPresenter.java | 8 +- .../client/debug/AbstractDebugger.java | 2 +- .../client/debug/DebuggerPresenter.java | 6 +- .../debugger/client/debug/DebuggerView.java | 2 +- .../client/debug/DebuggerViewImpl.java | 2 +- .../client/fqn/FqnResolverFactory.java | 8 +- .../client/actions/DebugActionTest.java | 2 +- .../client/debug/DebuggerPresenterTest.java | 7 +- .../debugger/client/debug/DebuggerTest.java | 4 +- .../CredentialsPreferencesPresenter.java | 6 +- .../gdb/client/GdbDebuggerFileHandler.java | 12 +- .../action/CompareWithLatestAction.java | 4 +- .../client/action/DeleteRepositoryAction.java | 4 +- .../client/action/InitRepositoryAction.java | 4 +- .../git/client/branch/BranchPresenter.java | 6 +- .../ext/git/client/branch/BranchViewImpl.java | 4 +- .../git/client/commit/CommitPresenter.java | 4 +- .../git/client/compare/ComparePresenter.java | 6 +- .../branchList/BranchListPresenter.java | 4 +- .../revisionsList/RevisionListPresenter.java | 4 +- .../git/client/history/HistoryPresenter.java | 2 +- .../ext/git/client/merge/MergePresenter.java | 4 +- .../CommitterPreferencePresenter.java | 2 +- .../ext/git/client/pull/PullPresenter.java | 2 +- .../ext/git/client/remote/RemoteViewImpl.java | 4 +- .../reset/commit/ResetToCommitPresenter.java | 2 +- .../reset/files/ResetFilesPresenter.java | 2 +- .../che/ide/ext/git/client/BaseTest.java | 2 +- .../client/branch/BranchPresenterTest.java | 10 +- .../reset/files/ResetFilesPresenterTest.java | 4 +- .../client/manage/SshKeyManagerPresenter.java | 10 +- .../manage/SshKeyManagerPresenterTest.java | 14 +- .../github/ide/GitHubSshKeyUploader.java | 6 +- .../GitHubAuthenticatorImpl.java | 2 +- .../GitHubAuthenticatorViewImpl.java | 6 +- .../GitHubAuthenticatorImplTest.java | 6 +- .../java/jdi/client/JavaRuntimeExtension.java | 14 +- .../java/jdi/client/debug/JavaDebugger.java | 11 +- .../client/debug/JavaDebuggerFileHandler.java | 12 +- .../che-plugin-java-ext-lang-client/pom.xml | 4 - ...xtension.java => JavaEditorExtension.java} | 14 +- .../java/client/action/FindUsagesAction.java | 2 +- .../java/client/action/JavaEditorAction.java | 18 +- .../java/client/action/NewPackageAction.java | 6 +- .../action/OpenImplementationAction.java | 2 +- .../client/action/ParametersHintsAction.java | 6 +- .../action/QuickDocumentationAction.java | 8 +- .../java/client/action/QuickFixAction.java | 6 +- .../client/document/FormatterDocument.java | 2 +- .../java/client/document/FormatterStore.java | 2 +- .../documentation/QuickDocPresenter.java | 10 +- .../editor/ActionCompletionProposal.java | 2 +- .../ext/java/client/editor/FileWatcher.java | 16 +- .../client/editor/JavaAnnotationModel.java | 12 +- .../editor/JavaAnnotationModelFactory.java | 4 +- .../client/editor/JavaAnnotationUtil.java | 2 +- .../editor/JavaChangeInterceptorProvider.java | 6 +- .../editor/JavaCodeAssistProcessor.java | 10 +- .../client/editor/JavaCompletionProposal.java | 22 +- .../ext/java/client/editor/JavaFormatter.java | 8 +- .../client/editor/JavaPartitionScanner.java | 8 +- .../client/editor/JavaPartitionerFactory.java | 10 +- .../editor/JavaQuickAssistProcessor.java | 26 +- .../client/editor/JavaReconcilerStrategy.java | 28 +- .../editor/JavaReconcilerStrategyFactory.java | 6 +- .../editor/JsJavaEditorConfiguration.java | 28 +- .../JsJavaEditorConfigurationFactory.java | 4 +- .../client/editor/JsJavaEditorProvider.java | 55 +- .../client/editor/OpenDeclarationFinder.java | 14 +- .../java/client/editor/ProblemAnnotation.java | 4 +- .../editor/SemanticHighlightRenderer.java | 8 +- ...inModule.java => JavaEditorGinModule.java} | 4 +- .../ext/java/client/inject/JavaGinModule.java | 9 +- .../filestructure/FileStructurePresenter.java | 20 +- .../NoImplementationWidget.java | 4 +- .../OpenImplementationPresenter.java | 28 +- .../paraminfo/ParametersHintsPresenter.java | 12 +- .../NewJavaSourceFilePresenter.java | 2 +- .../OrganizeImportsPresenter.java | 8 +- .../classpath/ProjectClasspathPresenter.java | 7 +- .../node/JavaItemReferenceProcessor.java | 2 +- .../move/wizard/MovePresenter.java | 2 +- .../refactoring/preview/PreviewPresenter.java | 2 +- .../rename/JavaRefactoringRename.java | 28 +- .../rename/RenameRefactoringAction.java | 10 +- .../rename/wizard/RenamePresenter.java | 8 +- .../client/search/FindUsagesPresenter.java | 2 +- .../java/client/search/node/MatchNode.java | 8 +- .../JavaCompilerPreferencePresenter.java | 2 +- .../ext/java/jdt/text/AbstractDocument.java | 12 +- .../java/jdt/text/AbstractLineTracker.java | 4 +- .../java/jdt/text/DefaultPositionUpdater.java | 4 +- .../che/ide/ext/java/jdt/text/Document.java | 10 +- .../java/jdt/text/DocumentPartitioner.java | 2 +- .../DocumentPartitioningChangedEvent.java | 4 +- .../jdt/text/FindReplaceDocumentAdapter.java | 8 +- .../che/ide/ext/java/jdt/text/Line.java | 2 +- .../ide/ext/java/jdt/text/LineTracker.java | 4 +- .../ext/java/jdt/text/ListLineTracker.java | 6 +- .../ide/ext/java/jdt/text/TextUtilities.java | 8 +- .../ext/java/jdt/text/TreeLineTracker.java | 8 +- .../java/jdt/text/edits/CopySourceEdit.java | 2 +- .../java/jdt/text/edits/CopyTargetEdit.java | 2 +- .../jdt/text/edits/CopyingRangeMarker.java | 2 +- .../ext/java/jdt/text/edits/DeleteEdit.java | 2 +- .../ext/java/jdt/text/edits/EditDocument.java | 10 +- .../ext/java/jdt/text/edits/InsertEdit.java | 2 +- .../java/jdt/text/edits/MoveSourceEdit.java | 6 +- .../java/jdt/text/edits/MoveTargetEdit.java | 2 +- .../java/jdt/text/edits/MultiTextEdit.java | 4 +- .../ext/java/jdt/text/edits/RangeMarker.java | 2 +- .../ext/java/jdt/text/edits/ReplaceEdit.java | 2 +- .../ide/ext/java/jdt/text/edits/TextEdit.java | 6 +- .../java/jdt/text/edits/TextEditGroup.java | 2 +- .../jdt/text/edits/TextEditProcessor.java | 2 +- .../java/jdt/text/edits/UndoCollector.java | 2 +- .../ide/ext/java/jdt/text/edits/UndoEdit.java | 2 +- .../ext/java/jdt/text/rules/TokenScanner.java | 2 +- .../org/eclipse/che/ide/ext/java/Java.gwt.xml | 1 - .../action/OrganizeImportsActionTest.java | 4 +- .../FileStructurePresenterTest.java | 24 +- .../OpenImplementationPresenterTest.java | 10 +- .../OrganizeImportsPresenterTest.java | 4 +- .../ProjectClasspathPresenterTest.java | 9 +- .../move/wizard/MovePresenterTest.java | 2 +- .../preview/PreviewPresenterTest.java | 2 +- .../rename/JavaRefactoringRenameTest.java | 24 +- .../rename/wizard/RenamePresenterTest.java | 10 +- .../eclipse/che/ide/ext/java/JavaTest.gwt.xml | 1 - .../che-plugin-machine-ext-client/pom.xml | 4 - .../command/edit/EditCommandsPresenter.java | 8 +- .../OutputsContainerPresenter.java | 4 +- .../recipe/editor/RecipeEditorInput.java | 17 +- .../recipe/editor/RecipeEditorPanel.java | 25 +- .../processes/ConsolesPanelPresenter.java | 4 +- .../client/targets/TargetsPresenter.java | 6 +- .../actions/DestroyMachineActionTest.java | 2 +- .../edit/EditCommandsPresenterTest.java | 2 +- .../panel/MachinePanelPresenterTest.java | 2 +- .../recipe/editor/RecipeEditorInputTest.java | 23 +- .../recipe/editor/RecipeEditorPanelTest.java | 14 +- .../processes/ConsolesPanelPresenterTest.java | 4 +- .../client/manage/SshKeyManagerPresenter.java | 10 +- .../plugin-maven/che-plugin-maven-ide/pom.xml | 4 - .../plugin/maven/client/MavenExtension.java | 5 +- .../comunnication/PomEditorReconciler.java | 12 +- .../editor/ClassFileSourcesDownloader.java | 14 +- .../client/editor/PomEditorConfiguration.java | 14 +- .../editor/PomEditorConfigurationFactory.java | 4 +- .../client/editor/PomEditorProvider.java | 32 +- .../client/editor/PomReconsilingStrategy.java | 18 +- .../editor/PomReconsilingStrategyFactory.java | 6 +- .../module/CreateMavenModulePresenter.java | 2 +- .../client/wizard/MavenPagePresenter.java | 2 +- .../che/ide/orion/OrionCompare.gwt.xml | 5 +- .../che-plugin-orion-editor/pom.xml | 27 +- .../orion/client/ContentAssistWidget.java | 16 +- .../che/ide/editor/orion/client/KeyMode.java | 15 +- .../editor/orion/client/KeyModeInstances.java | 2 +- .../orion/client/OrionBreakpointRuler.java | 4 +- .../editor/orion/client/OrionDocument.java | 21 +- .../orion/client/OrionEditorBuilder.java | 40 ++ .../orion/client/OrionEditorExtension.java | 41 +- .../orion/client/OrionEditorModule.java | 2 +- .../orion/client/OrionEditorPresenter.java | 77 +-- .../orion/client/OrionEditorWidget.java | 134 +++-- ...Contants.java => OrionEventConstants.java} | 2 +- .../editor/orion/client/OrionLineStyler.java | 2 +- .../orion/client/OrionTextEditorFactory.java | 14 +- .../editor/orion/client/OrionUndoRedo.java | 2 +- .../client/events/HasScrollHandlers.java | 2 +- .../orion}/client/events/ScrollEvent.java | 2 +- .../orion}/client/events/ScrollHandler.java | 2 +- .../client/inject/OrionEditorGinModule.java | 47 +- .../client/jso/OrionLinkedModeOverlay.java | 6 +- .../jso/OrionLinkedModelDataOverlay.java | 2 +- .../jso/OrionLinkedModelGroupOverlay.java | 6 +- .../client/jso/OrionLinkedModelOverlay.java | 4 +- .../che/ide}/requirejs/ModuleHolder.java | 4 +- .../che/ide}/requirejs/RequireJsLoader.java | 6 +- .../eclipse/che/ide}/requirejs/Requirejs.java | 12 +- .../che/ide}/requirejs/RequirejsCallback.java | 4 +- .../ide}/requirejs/RequirejsErrorHandler.java | 6 +- .../che/ide}/requirejs/RequirejsModule.java | 4 +- .../config/AssocitativeJsObject.java | 4 +- .../config/BundlesConfigProperty.java | 4 +- .../config/ConfigConfigProperty.java | 4 +- .../che/ide}/requirejs/config/ConfigItem.java | 4 +- .../requirejs/config/MapConfigProperty.java | 4 +- .../che/ide}/requirejs/config/MapItem.java | 4 +- .../requirejs/config/PathsConfigProperty.java | 4 +- .../requirejs/config/RequirejsConfig.java | 4 +- .../requirejs/config/ShimConfigProperty.java | 4 +- .../che/ide}/requirejs/config/ShimItem.java | 6 +- .../che/ide/editor/orion/OrionEditor.gwt.xml | 2 +- .../che-plugin-python-lang-ide/pom.xml | 8 - .../python/ide/PythonJsEditorExtension.java | 33 -- .../ide/editor/PythonEditorProvider.java | 59 --- .../python/ide/inject/PythonGinModule.java | 3 +- .../eclipse/che/plugin/python/Python.gwt.xml | 1 - .../che-plugin-sdk-env-local/pom.xml | 4 - .../client/CheConnectionClosedInformer.java | 2 +- .../threechoices/ChoiceDialogFactory.java | 4 +- .../threechoices/ChoiceDialogPresenter.java | 2 +- .../ide/lockunlock/LockUnlockPresenter.java | 4 +- .../svn/ide/resolve/ResolvePresenter.java | 4 +- .../svn/ide/revert/RevertPresenter.java | 8 +- .../svn/ide/export/ExportPresenterTest.java | 2 +- .../plugin-web/che-plugin-web-ext-web/pom.xml | 6 - .../html/editor/AutoEditStrategyFactory.java | 2 +- .../editor/DefaultCodeAssistProcessor.java | 2 +- .../html/editor/HTMLCodeAssistProcessor.java | 2 +- .../html/editor/HtmlEditorConfiguration.java | 10 +- .../web/html/editor/HtmlEditorProvider.java | 27 +- .../che/ide/ext/web/inject/WebModule.java | 19 +- .../js/editor/DefaultCodeAssistProcessor.java | 2 +- .../web/js/editor/JsCodeAssistProcessor.java | 2 +- .../web/js/editor/JsEditorConfiguration.java | 10 +- .../editor/JsEditorConfigurationProvider.java | 5 +- .../ext/web/js/editor/JsEditorProvider.java | 22 +- .../org/eclipse/che/ide/ext/web/Web.gwt.xml | 3 +- pom.xml | 5 - 571 files changed, 2398 insertions(+), 6503 deletions(-) rename core/ide/{che-core-ide-app/src/main/java/org/eclipse/che/ide => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/debug/Breakpoint.java (98%) rename core/ide/{che-core-ide-app/src/main/java/org/eclipse/che/ide => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/debug/BreakpointManager.java (96%) rename core/ide/{che-core-ide-app/src/main/java/org/eclipse/che/ide => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/debug/BreakpointManagerObservable.java (95%) rename core/ide/{che-core-ide-app/src/main/java/org/eclipse/che/ide => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/debug/BreakpointManagerObserver.java (96%) rename core/ide/{che-core-ide-app/src/main/java/org/eclipse/che/ide => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/debug/BreakpointRenderer.java (98%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/debug/BreakpointRendererFactory.java (78%) rename core/ide/{che-core-ide-app/src/main/java/org/eclipse/che/ide => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/debug/HasBreakpointRenderer.java (94%) rename core/ide/{che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/dialogs/CancelCallback.java (95%) rename core/ide/{che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/choice => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs}/ChoiceDialog.java (93%) rename core/ide/{che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/dialogs/ConfirmCallback.java (94%) rename core/ide/{che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/confirm => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs}/ConfirmDialog.java (94%) rename core/ide/{che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/dialogs/DialogFactory.java (98%) rename core/ide/{che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/dialogs/InputCallback.java (95%) rename core/ide/{che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs}/InputDialog.java (96%) rename core/ide/{che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs}/InputValidator.java (95%) rename core/ide/{che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/message => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs}/MessageDialog.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/JsEditorConstants.java => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorLocalizationConstants.java} (69%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/AnnotationGroup.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/AnnotationGroupImpl.java (98%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/AnnotationModel.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/AnnotationModelEvent.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/AnnotationModelHandler.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/AnnotationModelImpl.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/AnnotationsIterator.java (89%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/ClearAnnotationModelEvent.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/ClearAnnotationModelHandler.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/GutterAnnotationRenderer.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/HasAnnotationRendering.java (85%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/InlineAnnotationRenderer.java (89%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/ListTooltipFactory.java (98%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/MinimapAnnotationRenderer.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/QueryAnnotationsEvent.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/QueryAnnotationsHandler.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/annotation/RegionIterator.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/changeintercept/ChangeInterceptorProvider.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/changeintercept/CloseCStyleCommentChangeInterceptor.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/changeintercept/TextChange.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/changeintercept/TextChangeInterceptor.java (89%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/AdditionalInfoCallback.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/CodeAssistCallback.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/CodeAssistProcessor.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/CodeAssistant.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/CodeAssistantFactory.java (82%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/CodeAssistantImpl.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/Completion.java (89%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/CompletionProposal.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/CompletionProposalExtension.java (85%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/CompletionReadyCallback.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/CompletionsSource.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/DefaultChainedCodeAssistProcessor.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/codeassist/HasCompletionInformation.java (91%) create mode 100644 core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/AbstractTextEditorProvider.java rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/RefreshableDataProvider.java => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/DefaultTextEditorProvider.java} (63%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/defaulteditor/EditorBuilder.java (75%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/AbstractEmbeddedDocument.java => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/AbstractDocument.java} (88%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/document/Document.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/document/DocumentEventBus.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/document/DocumentHandle.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/document/DocumentStorage.java (70%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/document/DocumentStorageImpl.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/document/ReadOnlyDocument.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/document/UseDocumentHandle.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/editorconfig/AutoSaveTextEditorConfiguration.java (76%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/editorconfig/DefaultTextEditorConfiguration.java (70%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/editorconfig/EditorUpdateAction.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/editorconfig/TextEditorConfiguration.java (61%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/BeforeSelectionChangeEvent.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/BeforeSelectionChangeHandler.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/CompletionRequestEvent.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/CompletionRequestHandler.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/CursorActivityEvent.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/CursorActivityHandler.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/DocumentChangeEvent.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/DocumentChangeHandler.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/DocumentReadyEvent.java (88%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/DocumentReadyHandler.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/GutterClickEvent.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/GutterClickHandler.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/HasBeforeSelectionChangeHandlers.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/HasCursorActivityHandlers.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/HasDocumentReadyHandlers.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/HasGutterClickHandlers.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/HasViewPortChangeHandlers.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/TextChangeEvent.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/TextChangeHandler.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/ViewPortChangeEvent.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/ViewPortChangeHandler.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/events/doc/DocReadyWrapper.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/filetype/ExtensionFileTypeIdentifier.java (99%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/filetype/FileNameFileTypeIdentifier.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/filetype/FileTypeIdentifier.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/filetype/FirstLineFileTypeIdentifier.java (98%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/filetype/MultipleMethodFileIdentifier.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/formatter/ContentFormatter.java (84%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/gutter/Gutter.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/gutter/Gutters.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/gutter/HasGutter.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/Keybinding.java => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeyBinding.java} (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/keymap/KeyBindingAction.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/keymap/Keymap.java (70%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/keymap/KeymapChangeEvent.java (74%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/keymap/KeymapChangeHandler.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/link/HasLinkedMode.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/link/LinkedMode.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/link/LinkedModel.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/link/LinkedModelData.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/link/LinkedModelGroup.java (87%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/minimap/HasMinimap.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/minimap/Minimap.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/CharacterScanner.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/ConstantPartitioner.java (90%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/DefaultPartitioner.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/DocumentPartitioner.java (87%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/DocumentPositionMap.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/DocumentPositionMapImpl.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/PartitionScanner.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/PartitionerFactory.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/StringCharacterScanner.java (98%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/partition/TokenScanner.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/position/PositionConverter.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/quickfix/QuickAssistAssistant.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/quickfix/QuickAssistInvocationContext.java (91%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/quickfix/QuickAssistProcessor.java (85%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/quickfix/QuickAssistantFactory.java (88%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/reconciler/DirtyRegion.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/reconciler/DirtyRegionQueue.java (98%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/reconciler/Reconciler.java (88%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/reconciler/ReconcilerFactory.java (84%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/reconciler/ReconcilerWithAutoSave.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/reconciler/ReconcilingStrategy.java (90%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/BadLocationException.java (96%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/BadPositionCategoryException.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/text/LinearRange.java (98%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/Position.java (99%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/Region.java (96%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/RegionImpl.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/text/TextPosition.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/text/TextRange.java (98%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/TypedPosition.java (98%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/TypedRegion.java (96%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/TypedRegionImpl.java (97%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/annotation/Annotation.java (96%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/rules/Token.java (96%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/text/rules/TokenImpl.java (98%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/AbstractEditorModule.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/CompositeEditorWidget.java (76%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/ContentInitializedHandler.java (92%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/texteditor/CursorModel.java (88%) rename core/ide/{che-core-ide-app/src/main/java/org/eclipse/che/ide/texteditor/selection => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor}/CursorModelWithHandler.java (86%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/EditorHandle.java (91%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/EditorInitCallback.java (90%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/EditorModule.java (86%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/EditorResources.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/EditorWidget.java (81%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/EditorWidgetFactory.java (88%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/texteditor/HandlesTextOperations.java (96%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/texteditor/HandlesUndoRedo.java (97%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasKeybindings.java => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasKeyBindings.java} (72%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/HasNotificationPanel.java (94%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/texteditor/HasReadOnlyProperty.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/HasTextMarkers.java (86%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/LineStyler.java (74%) create mode 100644 core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TemporaryKeyBindingsManager.java rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/TextEditor.java (56%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedEditorCursorModel.java => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorCursorModel.java} (75%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor}/texteditor/TextEditorInit.java (80%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/texteditor/TextEditorOperations.java (98%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartView.java => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPartView.java} (60%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenter.java => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenter.java} (76%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/NestablePresenter.java => che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenterFactory.java} (51%) rename core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/{ => editor}/texteditor/UndoableEditor.java (93%) rename core/ide/{che-core-ide-app/src/main/java/org/eclipse/che/ide => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/hotkeys/HasHotKeyItems.java (95%) rename core/ide/{che-core-ide-app/src/main/java/org/eclipse/che/ide => che-core-ide-api/src/main/java/org/eclipse/che/ide/api}/hotkeys/HotKeyItem.java (96%) delete mode 100644 core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/IsConfigurable.java rename core/ide/{che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/main/resources/org/eclipse/che/ide/api/editor}/texteditor/Editor.css (100%) rename core/ide/{che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client => che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept}/changeintercept/CloseCStyleCommentChangeInterceptorTest.java (95%) rename core/ide/{che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenterTest.java => che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenterTest.java} (71%) delete mode 100644 core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/FindReplaceAction.java rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide}/debug/BreakpointManagerImpl.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide}/debug/BreakpointRendererImpl.java (89%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide}/debug/BreakpointResources.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide}/debug/Breakpoints.java (85%) create mode 100644 core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorGinModule.java rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor}/codeassist/AdditionalInformationWidget.java (83%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/EditorPrefLocalizationConstant.java (87%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/EditorPreferencePresenter.java (83%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/EditorPreferenceSection.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/EditorPreferenceView.java (93%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/EditorPreferenceViewImpl.java (83%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/EditorPreferenceViewImpl.ui.xml (100%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/inject => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/EditorPreferencesGinModule.java (56%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/EditorProperties.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/EditorPropertiesManager.java (77%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/EditorPropertiesPresenter.java (89%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/EditorPropertiesView.java (92%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/EditorPropertiesViewImpl.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/EditorPropertiesViewImpl.ui.xml (88%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/propertiessection/EditorPropertiesSectionPresenter.java (85%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/propertiessection/EditorPropertiesSectionView.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.java (90%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.ui.xml (91%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/property/EditorBooleanPropertyWidget.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/property/EditorNumberPropertyWidget.java (96%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/property/EditorPropertyBaseWidget.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/property/EditorPropertyBaseWidget.ui.xml (100%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/property/EditorPropertyWidget.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/property/EditorPropertyWidgetFactory.java (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/property/EditorStringPropertyWidget.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/sections/EditorPreferenceSectionFactory.java (87%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/sections/EditorPropertiesSection.java (91%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/sections/LanguageToolsPropertiesSection.java (68%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/sections/RulersPropertiesSection.java (61%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/sections/TabsPropertiesSection.java (69%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/sections/TypingPropertiesSection.java (58%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/editorproperties/sections/WhiteSpacesPropertiesSection.java (65%) create mode 100644 core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeyMapsPreferencePresenter.java rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/keymaps/KeymapsPreferenceView.java (51%) create mode 100644 core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceViewImpl.java rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences}/keymaps/KeymapsPreferenceViewImpl.ui.xml (80%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor}/quickfix/QuickAssistAssistantImpl.java (84%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor}/quickfix/QuickAssistWidget.java (89%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor}/quickfix/QuickAssistWidgetFactory.java (83%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartViewImpl.java => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/TextEditorPartViewImpl.java} (78%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartViewImpl.ui.xml => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/TextEditorPartViewImpl.ui.xml} (94%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor}/infopanel/InfoPanel.java (85%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor}/infopanel/InfoPanel.ui.xml (100%) rename core/ide/{che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client => che-core-ide-app/src/main/resources/org/eclipse/che/ide}/debug/breakpoint.css (100%) rename core/ide/{che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference => che-core-ide-app/src/main/resources/org/eclipse/che/ide/editor/preferences}/EditorPrefLocalizationConstant.properties (100%) delete mode 100644 core/ide/che-core-ide-jseditor/pom.xml delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/JsEditorExtension.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/DefaultEditorProvider.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/EditorWithoutAutoSaveProvider.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapter.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapter.ui.xml delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DummyHandlesUndoRedo.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/EditorAdapter.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/HasEditor.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorType.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeMapping.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeMappingImpl.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeRegistry.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeRegistryImpl.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/inject/JsEditorGinModule.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/inject/PlainTextFileType.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapPrefReader.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapValuesHolder.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceResource.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/FileTypeDataProvider.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/FileTypeKeyProvider.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/RefreshableListDataProvider.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeyMapsPreferencePresenter.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapSelectionCell.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapSelectionColumn.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceViewImpl.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/DefaultEditorTypePrefReader.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/EditorPreferenceReader.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/EditorPreferences.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/KeymapPrefReader.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/ConfigurableTextEditor.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditor.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenterFactory.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TemporaryKeybindingsManager.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/util/PrintMap.java delete mode 100644 core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/JsEditor.gwt.xml delete mode 100644 core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/CellStyle.css delete mode 100644 core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/CellTable-properties.css delete mode 100644 core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/editor-icon.svg delete mode 100644 core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapterTest.java delete mode 100644 core/ide/che-core-ide-jseditor/src/test/resources/logback-test.xml rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui}/popup/PopupKeyDownListener.java (98%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui}/popup/PopupResources.java (95%) rename core/ide/{che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui}/popup/PopupWidget.java (99%) rename core/ide/{che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client => che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui}/popup/popup.css (97%) delete mode 100644 plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/CppJsEditorExtension.java delete mode 100644 plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/editor/CEditorProvider.java delete mode 100644 plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/editor/CppEditorProvider.java rename plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/{JavaJsEditorExtension.java => JavaEditorExtension.java} (69%) rename plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/{JavaJsEditorGinModule.java => JavaEditorGinModule.java} (93%) create mode 100644 plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorBuilder.java rename plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/{OrionEventContants.java => OrionEventConstants.java} (96%) rename plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/{jseditor => editor/orion}/client/events/HasScrollHandlers.java (93%) rename plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/{jseditor => editor/orion}/client/events/ScrollEvent.java (94%) rename plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/{jseditor => editor/orion}/client/events/ScrollHandler.java (93%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/ModuleHolder.java (91%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/RequireJsLoader.java (97%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/Requirejs.java (79%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/RequirejsCallback.java (89%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/RequirejsErrorHandler.java (88%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/RequirejsModule.java (89%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/AssocitativeJsObject.java (90%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/BundlesConfigProperty.java (92%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/ConfigConfigProperty.java (91%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/ConfigItem.java (87%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/MapConfigProperty.java (91%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/MapItem.java (86%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/PathsConfigProperty.java (87%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/RequirejsConfig.java (97%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/ShimConfigProperty.java (91%) rename {core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client => plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide}/requirejs/config/ShimItem.java (86%) delete mode 100644 plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/PythonJsEditorExtension.java delete mode 100644 plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/editor/PythonEditorProvider.java diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index 2eed1c8f8a..16bfb68dad 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -148,10 +148,6 @@ org.eclipse.che.core che-core-ide-app - - org.eclipse.che.core - che-core-ide-jseditor - org.eclipse.che.core wsmaster-local @@ -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 diff --git a/core/ide/che-core-ide-api/pom.xml b/core/ide/che-core-ide-api/pom.xml index 83d2585cfa..8d0be3cb27 100644 --- a/core/ide/che-core-ide-api/pom.xml +++ b/core/ide/che-core-ide-api/pom.xml @@ -97,6 +97,11 @@ gwt-dev test + + com.google.gwt.gwtmockito + gwtmockito + test + javax.ws.rs javax.ws.rs-api @@ -205,12 +210,12 @@ **/*.png **/*.gif **/*.jpg - **/ide/api/text/TextSelection.java - **/ide/api/text/TextSelectionImpl.java - **/ide/api/text/TypedPosition.java + **/ide/api/editor/text/TypedPosition.java **/ide/api/text/annotation/AnnotationModelEvent.java - **/ide/api/text/rules/**/*.* - **/ide/api/text/undo/**/*.* + **/ide/api/editor/text/rules/**/*.* + **/org/eclipse/che/ide/api/editor/reconciler/DirtyRegion.java + **/org/eclipse/che/ide/api/editor/reconciler/DirtyRegionQueue.java + **/org/eclipse/che/ide/api/editor/annotation/AnnotationModelEvent.java diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/Breakpoint.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/Breakpoint.java similarity index 98% rename from core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/Breakpoint.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/Breakpoint.java index 3038e41152..af54671ba4 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/Breakpoint.java +++ b/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; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManager.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointManager.java similarity index 96% rename from core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManager.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointManager.java index 5dcead5fe7..86fa04ff31 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManager.java +++ b/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; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerObservable.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointManagerObservable.java similarity index 95% rename from core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerObservable.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointManagerObservable.java index 4ce47e7983..4fbb65491f 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerObservable.java +++ b/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 diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerObserver.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointManagerObserver.java similarity index 96% rename from core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerObserver.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointManagerObserver.java index e0d9e2046c..aae888aae4 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerObserver.java +++ b/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 diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointRenderer.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointRenderer.java similarity index 98% rename from core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointRenderer.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointRenderer.java index ed656f458a..4b46e6e68a 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointRenderer.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointRendererFactory.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointRendererFactory.java similarity index 78% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointRendererFactory.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/BreakpointRendererFactory.java index 8cd43c60ff..418e4bf922 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointRendererFactory.java +++ b/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 { diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/HasBreakpointRenderer.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/HasBreakpointRenderer.java similarity index 94% rename from core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/HasBreakpointRenderer.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/HasBreakpointRenderer.java index 4d2d199f48..646478729e 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/HasBreakpointRenderer.java +++ b/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 { diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/CancelCallback.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/CancelCallback.java similarity index 95% rename from core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/CancelCallback.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/CancelCallback.java index 3f1cfc6012..8379d83e28 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/CancelCallback.java +++ b/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. diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/choice/ChoiceDialog.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/ChoiceDialog.java similarity index 93% rename from core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/choice/ChoiceDialog.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/ChoiceDialog.java index 84be4cba7e..e4c5c6cf23 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/choice/ChoiceDialog.java +++ b/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. diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/ConfirmCallback.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/ConfirmCallback.java similarity index 94% rename from core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/ConfirmCallback.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/ConfirmCallback.java index d5543e952b..6dedb4e35b 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/ConfirmCallback.java +++ b/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. diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialog.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/ConfirmDialog.java similarity index 94% rename from core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialog.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/ConfirmDialog.java index 01bd39c370..8c749b24da 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialog.java +++ b/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. diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/DialogFactory.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/DialogFactory.java similarity index 98% rename from core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/DialogFactory.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/DialogFactory.java index 9f078a186b..954ec74db8 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/DialogFactory.java +++ b/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; diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/InputCallback.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/InputCallback.java similarity index 95% rename from core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/InputCallback.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/InputCallback.java index 0ab5cd9f23..613eeda0c9 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/InputCallback.java +++ b/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. diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputDialog.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/InputDialog.java similarity index 96% rename from core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputDialog.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/InputDialog.java index 360b3a518e..a8830971a2 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputDialog.java +++ b/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. diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputValidator.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/InputValidator.java similarity index 95% rename from core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputValidator.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/InputValidator.java index bbae72988a..4a5eb5865f 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputValidator.java +++ b/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}. diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialog.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/MessageDialog.java similarity index 94% rename from core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialog.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/dialogs/MessageDialog.java index c4baf0582c..93cf3a55ef 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialog.java +++ b/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. diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorInput.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorInput.java index 195d300fcd..aea6d7f8ed 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorInput.java +++ b/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. * diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/JsEditorConstants.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorLocalizationConstants.java similarity index 69% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/JsEditorConstants.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorLocalizationConstants.java index d8c359faf3..70e9fabe2b 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/JsEditorConstants.java +++ b/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.
" - + " 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(); diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorProvider.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorProvider.java index fd4b368bc3..c2996288fb 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/EditorProvider.java +++ b/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(); -} \ No newline at end of file +} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationGroup.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationGroup.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationGroup.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationGroup.java index 3a7e98f24c..05a1a7f7ec 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationGroup.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationGroupImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationGroupImpl.java similarity index 98% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationGroupImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationGroupImpl.java index 8488f50a79..d787a27103 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationGroupImpl.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModel.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModel.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModel.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModel.java index 1acf0efff4..1b53fb95bc 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModel.java +++ b/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 diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModelEvent.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModelEvent.java index 912954540c..c675465536 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelEvent.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModelHandler.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModelHandler.java index 1aaa26ae72..72156fe501 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModelImpl.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationModelImpl.java index 7057260598..b7deb60ece 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelImpl.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationsIterator.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationsIterator.java similarity index 89% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationsIterator.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/AnnotationsIterator.java index 42e928bdd3..3c745b0aa9 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/AnnotationsIterator.java +++ b/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 diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/ClearAnnotationModelEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/ClearAnnotationModelEvent.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/ClearAnnotationModelEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/ClearAnnotationModelEvent.java index 7f6ff8c716..f133b5144f 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/ClearAnnotationModelEvent.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/ClearAnnotationModelHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/ClearAnnotationModelHandler.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/ClearAnnotationModelHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/ClearAnnotationModelHandler.java index f242552ea3..fbc2dd0aa3 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/ClearAnnotationModelHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/GutterAnnotationRenderer.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/GutterAnnotationRenderer.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/GutterAnnotationRenderer.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/GutterAnnotationRenderer.java index 8be97f8f20..abe920a783 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/GutterAnnotationRenderer.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/HasAnnotationRendering.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/HasAnnotationRendering.java similarity index 85% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/HasAnnotationRendering.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/HasAnnotationRendering.java index 1721dde501..aa02e62e2d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/HasAnnotationRendering.java +++ b/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. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/InlineAnnotationRenderer.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/InlineAnnotationRenderer.java similarity index 89% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/InlineAnnotationRenderer.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/InlineAnnotationRenderer.java index 935422a1ef..311bc8438f 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/InlineAnnotationRenderer.java +++ b/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; /** diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/ListTooltipFactory.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/ListTooltipFactory.java similarity index 98% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/ListTooltipFactory.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/ListTooltipFactory.java index e063a2f3e7..c08db3e11b 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/ListTooltipFactory.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/MinimapAnnotationRenderer.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/MinimapAnnotationRenderer.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/MinimapAnnotationRenderer.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/MinimapAnnotationRenderer.java index 533a16d160..18871fc12d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/MinimapAnnotationRenderer.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/QueryAnnotationsEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/QueryAnnotationsEvent.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/QueryAnnotationsEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/QueryAnnotationsEvent.java index 955aca31e1..6c9b3f1672 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/QueryAnnotationsEvent.java +++ b/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; /** diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/QueryAnnotationsHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/QueryAnnotationsHandler.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/QueryAnnotationsHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/QueryAnnotationsHandler.java index a603145696..5a63745708 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/QueryAnnotationsHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/RegionIterator.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/RegionIterator.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/RegionIterator.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/annotation/RegionIterator.java index e693efde2c..5ac8008cfa 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/annotation/RegionIterator.java +++ b/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 { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/ChangeInterceptorProvider.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/ChangeInterceptorProvider.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/ChangeInterceptorProvider.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/ChangeInterceptorProvider.java index bfda627851..66f9170467 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/ChangeInterceptorProvider.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/CloseCStyleCommentChangeInterceptor.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/CloseCStyleCommentChangeInterceptor.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/CloseCStyleCommentChangeInterceptor.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/CloseCStyleCommentChangeInterceptor.java index e1ba74df31..4b46f98730 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/CloseCStyleCommentChangeInterceptor.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/TextChange.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/TextChange.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/TextChange.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/TextChange.java index ae08800bc4..d3ec05e028 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/TextChange.java +++ b/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 { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/TextChangeInterceptor.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/TextChangeInterceptor.java similarity index 89% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/TextChangeInterceptor.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/changeintercept/TextChangeInterceptor.java index 3837dc03c4..b8664073dc 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/changeintercept/TextChangeInterceptor.java +++ b/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.
diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/AdditionalInfoCallback.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/AdditionalInfoCallback.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/AdditionalInfoCallback.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/AdditionalInfoCallback.java index 1f2c842606..589c5acc3d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/AdditionalInfoCallback.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistCallback.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistCallback.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistCallback.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistCallback.java index 2a5db15584..2516f1751d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistCallback.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistProcessor.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistProcessor.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistProcessor.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistProcessor.java index a69331e644..14bffe8c74 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistProcessor.java +++ b/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. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistant.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistant.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistant.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistant.java index ac7a671224..d291190d3c 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistant.java +++ b/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; /** diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistantFactory.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistantFactory.java similarity index 82% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistantFactory.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistantFactory.java index 676bda6bd0..0a9b8dd3fb 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistantFactory.java +++ b/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. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistantImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistantImpl.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistantImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CodeAssistantImpl.java index 5725ac1271..8d7b98f5b2 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CodeAssistantImpl.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/Completion.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/Completion.java similarity index 89% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/Completion.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/Completion.java index cd5db075e3..a4d4800b31 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/Completion.java +++ b/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. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionProposal.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionProposal.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionProposal.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionProposal.java index cf0a50ff05..596fd6b64b 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionProposal.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionProposalExtension.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionProposalExtension.java similarity index 85% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionProposalExtension.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionProposalExtension.java index 7cfad837cd..a34624bb64 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionProposalExtension.java +++ b/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 diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionReadyCallback.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionReadyCallback.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionReadyCallback.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionReadyCallback.java index 371a031009..9528e33e9e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionReadyCallback.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionsSource.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionsSource.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionsSource.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/CompletionsSource.java index 59863afb72..51f61853b2 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/CompletionsSource.java +++ b/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. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/DefaultChainedCodeAssistProcessor.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/DefaultChainedCodeAssistProcessor.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/DefaultChainedCodeAssistProcessor.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/DefaultChainedCodeAssistProcessor.java index 50eb8e0c54..1bd994e7d4 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/DefaultChainedCodeAssistProcessor.java +++ b/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. * diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/HasCompletionInformation.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/HasCompletionInformation.java similarity index 91% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/HasCompletionInformation.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/codeassist/HasCompletionInformation.java index 4827d3fec7..f2b1ae9f61 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/HasCompletionInformation.java +++ b/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 diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/AbstractTextEditorProvider.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/AbstractTextEditorProvider.java new file mode 100644 index 0000000000..efccc22070 --- /dev/null +++ b/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. + *

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. + *

The method {@link #getEditor()} returns {@link TextEditor} + * that is initialized by configuration returned by {@link #getEditorConfiguration()} method. + *

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; + } +} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/RefreshableDataProvider.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/DefaultTextEditorProvider.java similarity index 63% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/RefreshableDataProvider.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/DefaultTextEditorProvider.java index 80810a2025..92ab9e6dd6 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/RefreshableDataProvider.java +++ b/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"; + } } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/EditorBuilder.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/EditorBuilder.java similarity index 75% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/EditorBuilder.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/defaulteditor/EditorBuilder.java index 506587f0d3..2a63ba1065 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/EditorBuilder.java +++ b/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(); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/AbstractEmbeddedDocument.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/AbstractDocument.java similarity index 88% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/AbstractEmbeddedDocument.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/AbstractDocument.java index 4472034f09..4812e10e1f 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/AbstractEmbeddedDocument.java +++ b/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 } - } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/Document.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/Document.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/Document.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/Document.java index 43f7effbc5..e03a590247 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/Document.java +++ b/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. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentEventBus.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentEventBus.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentEventBus.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentEventBus.java index e68d38004f..48bd988475 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentEventBus.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentHandle.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentHandle.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentHandle.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentHandle.java index f1ef87c73f..bbaad4d158 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentHandle.java +++ b/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. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentStorage.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentStorage.java similarity index 70% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentStorage.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentStorage.java index 4478ba3be6..72b5b3b737 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentStorage.java +++ b/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); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentStorageImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentStorageImpl.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentStorageImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/DocumentStorageImpl.java index aaa6349296..05478a81fc 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/DocumentStorageImpl.java +++ b/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() { @Override public void apply(String result) throws OperationException { @@ -92,5 +92,4 @@ public class DocumentStorageImpl implements DocumentStorage { @Override public void documentClosed(final Document document) { } - } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/ReadOnlyDocument.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/ReadOnlyDocument.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/ReadOnlyDocument.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/ReadOnlyDocument.java index d7a88ca6a0..bcb1c6c018 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/ReadOnlyDocument.java +++ b/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 { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/UseDocumentHandle.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/UseDocumentHandle.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/UseDocumentHandle.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/document/UseDocumentHandle.java index e5648ae3f9..fb94ef49ef 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/document/UseDocumentHandle.java +++ b/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.
diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/AutoSaveTextEditorConfiguration.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/AutoSaveTextEditorConfiguration.java similarity index 76% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/AutoSaveTextEditorConfiguration.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/AutoSaveTextEditorConfiguration.java index ca1a3a543a..98f4c8e4b4 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/AutoSaveTextEditorConfiguration.java +++ b/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 diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/DefaultTextEditorConfiguration.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/DefaultTextEditorConfiguration.java similarity index 70% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/DefaultTextEditorConfiguration.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/DefaultTextEditorConfiguration.java index b316135e97..eb1d4de942 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/DefaultTextEditorConfiguration.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/EditorUpdateAction.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/EditorUpdateAction.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/EditorUpdateAction.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/EditorUpdateAction.java index d52796935d..b576e33702 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/EditorUpdateAction.java +++ b/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 { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/TextEditorConfiguration.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/TextEditorConfiguration.java similarity index 61% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/TextEditorConfiguration.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/editorconfig/TextEditorConfiguration.java index b3cd858660..4966dd3275 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editorconfig/TextEditorConfiguration.java +++ b/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 getContentAssistantProcessors(); + Map 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}.
+ * Return the {@link ChangeInterceptorProvider}.
* @return the change interceptors */ @Nullable diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/BeforeSelectionChangeEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/BeforeSelectionChangeEvent.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/BeforeSelectionChangeEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/BeforeSelectionChangeEvent.java index 4b2c747ba3..4c32a87763 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/BeforeSelectionChangeEvent.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/BeforeSelectionChangeHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/BeforeSelectionChangeHandler.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/BeforeSelectionChangeHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/BeforeSelectionChangeHandler.java index 7c92628b88..d2a3dcdf92 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/BeforeSelectionChangeHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CompletionRequestEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CompletionRequestEvent.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CompletionRequestEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CompletionRequestEvent.java index 435d70ab02..efb51fc84c 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CompletionRequestEvent.java +++ b/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; /** diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CompletionRequestHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CompletionRequestHandler.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CompletionRequestHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CompletionRequestHandler.java index 45d5621b1d..4772b21860 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CompletionRequestHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CursorActivityEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CursorActivityEvent.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CursorActivityEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CursorActivityEvent.java index c2d0ccf165..f95d711f9d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CursorActivityEvent.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CursorActivityHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CursorActivityHandler.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CursorActivityHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/CursorActivityHandler.java index ac865c6e50..7a57cdadc3 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/CursorActivityHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentChangeEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentChangeEvent.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentChangeEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentChangeEvent.java index 8b6e69dd01..0c66bebad6 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentChangeEvent.java +++ b/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 { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentChangeHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentChangeHandler.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentChangeHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentChangeHandler.java index 26052fd948..544b57ecab 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentChangeHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentReadyEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentReadyEvent.java similarity index 88% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentReadyEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentReadyEvent.java index 7d344d19c7..8361da364b 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentReadyEvent.java +++ b/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 { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentReadyHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentReadyHandler.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentReadyHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/DocumentReadyHandler.java index 82a1fdae7f..79dfca0116 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/DocumentReadyHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/GutterClickEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/GutterClickEvent.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/GutterClickEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/GutterClickEvent.java index c9335f830d..2e108f2389 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/GutterClickEvent.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/GutterClickHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/GutterClickHandler.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/GutterClickHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/GutterClickHandler.java index 0984907fcf..64bf1919d2 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/GutterClickHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasBeforeSelectionChangeHandlers.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasBeforeSelectionChangeHandlers.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasBeforeSelectionChangeHandlers.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasBeforeSelectionChangeHandlers.java index 2568d446e4..e378f0cd43 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasBeforeSelectionChangeHandlers.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasCursorActivityHandlers.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasCursorActivityHandlers.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasCursorActivityHandlers.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasCursorActivityHandlers.java index 9b445202fa..98b0501b90 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasCursorActivityHandlers.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasDocumentReadyHandlers.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasDocumentReadyHandlers.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasDocumentReadyHandlers.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasDocumentReadyHandlers.java index 70dd4cf1bd..f42036e42e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasDocumentReadyHandlers.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasGutterClickHandlers.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasGutterClickHandlers.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasGutterClickHandlers.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasGutterClickHandlers.java index f3cda46302..e060961003 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasGutterClickHandlers.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasViewPortChangeHandlers.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasViewPortChangeHandlers.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasViewPortChangeHandlers.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/HasViewPortChangeHandlers.java index b8cf3b27a6..f873ff7592 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasViewPortChangeHandlers.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/TextChangeEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/TextChangeEvent.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/TextChangeEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/TextChangeEvent.java index c53036e378..7e7da715ff 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/TextChangeEvent.java +++ b/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. */ diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/TextChangeHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/TextChangeHandler.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/TextChangeHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/TextChangeHandler.java index 73e1e86578..a2122b2be2 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/TextChangeHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ViewPortChangeEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/ViewPortChangeEvent.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ViewPortChangeEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/ViewPortChangeEvent.java index 68297ff395..e249b5c166 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ViewPortChangeEvent.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ViewPortChangeHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/ViewPortChangeHandler.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ViewPortChangeHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/ViewPortChangeHandler.java index 8bfd3a133c..1c636775d0 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ViewPortChangeHandler.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/doc/DocReadyWrapper.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/doc/DocReadyWrapper.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/doc/DocReadyWrapper.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/events/doc/DocReadyWrapper.java index 262bb3d974..2f99d5617b 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/events/doc/DocReadyWrapper.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/ExtensionFileTypeIdentifier.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/ExtensionFileTypeIdentifier.java similarity index 99% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/ExtensionFileTypeIdentifier.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/ExtensionFileTypeIdentifier.java index 72d6a9c3ec..3fdf5b7edc 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/ExtensionFileTypeIdentifier.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/FileNameFileTypeIdentifier.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/FileNameFileTypeIdentifier.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/FileNameFileTypeIdentifier.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/FileNameFileTypeIdentifier.java index e529923455..623f57e075 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/FileNameFileTypeIdentifier.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/FileTypeIdentifier.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/FileTypeIdentifier.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/FileTypeIdentifier.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/FileTypeIdentifier.java index 5301636ccf..d79c7413ac 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/FileTypeIdentifier.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/FirstLineFileTypeIdentifier.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/FirstLineFileTypeIdentifier.java similarity index 98% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/FirstLineFileTypeIdentifier.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/FirstLineFileTypeIdentifier.java index dfd3da80d9..99ab1c2961 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/FirstLineFileTypeIdentifier.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/MultipleMethodFileIdentifier.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/MultipleMethodFileIdentifier.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/MultipleMethodFileIdentifier.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/filetype/MultipleMethodFileIdentifier.java index 6d7d394fe2..402365f08d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/filetype/MultipleMethodFileIdentifier.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/formatter/ContentFormatter.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/formatter/ContentFormatter.java similarity index 84% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/formatter/ContentFormatter.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/formatter/ContentFormatter.java index 0f623b3c57..1085e5724d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/formatter/ContentFormatter.java +++ b/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 diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/gutter/Gutter.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/gutter/Gutter.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/gutter/Gutter.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/gutter/Gutter.java index 31ad9ff715..68b8edd176 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/gutter/Gutter.java +++ b/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; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/gutter/Gutters.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/gutter/Gutters.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/gutter/Gutters.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/gutter/Gutters.java index 91e1f73000..a743c7a4c2 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/gutter/Gutters.java +++ b/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 { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/gutter/HasGutter.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/gutter/HasGutter.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/gutter/HasGutter.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/gutter/HasGutter.java index 90dd9d02ea..9c263a2f72 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/gutter/HasGutter.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/gutter/HasGutter.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; /** * Interface for components that manage a gutter. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/Keybinding.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeyBinding.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/Keybinding.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeyBinding.java index 617efbd38f..f536cd7ef7 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/Keybinding.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeyBinding.java @@ -8,26 +8,26 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.keymap; +package org.eclipse.che.ide.api.editor.keymap; /** * Description of a key binding. */ -public class Keybinding { +public class KeyBinding { /** Is the control key pressed? */ private final boolean control; /** Is the shift key pressed? */ private final boolean shift; /** Is the alt key pressed? */ private final boolean alt; - /** Is the cmdkey pressed? */ + /** Is the cmd key pressed? */ private final boolean cmd; /** The key code. */ private final int keycode; /** The action taken on the key binding. */ private final KeyBindingAction action; - public Keybinding(final boolean control, final boolean shift, final boolean alt, + public KeyBinding(final boolean control, final boolean shift, final boolean alt, final boolean cmd, final int keycode, final KeyBindingAction action) { this.control = control; this.shift = shift; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeyBindingAction.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeyBindingAction.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeyBindingAction.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeyBindingAction.java index f1f6ab3d02..dbd61d10ce 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeyBindingAction.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeyBindingAction.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.keymap; +package org.eclipse.che.ide.api.editor.keymap; /** * An action executed on a keybinding in the editor. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/Keymap.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/Keymap.java similarity index 70% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/Keymap.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/Keymap.java index 2db00827a1..b63d0285d5 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/Keymap.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/Keymap.java @@ -8,9 +8,8 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.keymap; +package org.eclipse.che.ide.api.editor.keymap; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; import org.eclipse.che.ide.util.loging.Log; import java.util.ArrayList; @@ -18,7 +17,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - /** * Value object for keymaps. * @@ -30,16 +28,13 @@ public class Keymap { private final String keymapKey; /** The name displayed to a user. */ private final String displayString; - private final EditorType editorType; - /** The already built instances. */ private static final Map instances = new HashMap<>(); - private Keymap(final String key, final String displayString, final EditorType editorType) { + private Keymap(final String key, final String displayString) { this.keymapKey = key; this.displayString = displayString; - this.editorType = editorType; } /** @@ -60,15 +55,6 @@ public class Keymap { return this.displayString; } - /** - * Returns the editor type wjich the keymap is associated with. - * - * @return the editor type - */ - public EditorType getEditorType() { - return this.editorType; - } - /** * Retrieve an keymap instance by its key. * @@ -91,26 +77,21 @@ public class Keymap { * the key (must not already exist) * @param displayString * the name displayed to a user - * @param editorType - * the editor type this keymap is linked to * @return a new keymap instance */ - public static Keymap newKeymap(final String key, final String displayString, final EditorType editorType) { + public static Keymap newKeymap(final String key, final String displayString) { if (key == null) { throw new IllegalArgumentException("Keymap key can't be null"); } if (displayString == null) { throw new IllegalArgumentException("Keymap display string can't be null"); } - if (editorType == null) { - throw new IllegalArgumentException("Keymap editor can't be null"); - } if (fromKey(key) != null) { throw new RuntimeException("Keymap with key " + key + " already exists"); } - Log.debug(Keymap.class, "Creation of new keymap " + key + " for editor type " + editorType); - Keymap keymap = new Keymap(key, displayString, editorType); + Log.debug(Keymap.class, "Creation of new keymap " + key); + Keymap keymap = new Keymap(key, displayString); instances.put(key, keymap); return keymap; } @@ -124,26 +105,6 @@ public class Keymap { return new ArrayList<>(instances.values()); } - /** - * Return all instances of {@link Keymap} assicoated with the given editor type. - * - * @param editorType - * the editor type - * @return keymaps for this editor type - */ - public static List getInstances(final EditorType editorType) { - if (editorType == null) { - return null; - } - final List result = new ArrayList<>(); - for (final Keymap keymap : instances.values()) { - if (editorType.equals(keymap.getEditorType())) { - result.add(keymap); - } - } - return result; - } - @Override public String toString() { return this.keymapKey; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapChangeEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeymapChangeEvent.java similarity index 74% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapChangeEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeymapChangeEvent.java index 4d05d879ad..cd46392600 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapChangeEvent.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeymapChangeEvent.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.keymap; +package org.eclipse.che.ide.api.editor.keymap; import com.google.gwt.event.shared.GwtEvent; @@ -21,21 +21,16 @@ public class KeymapChangeEvent extends GwtEvent { /** Type instance for the event. */ public static final Type TYPE = new Type<>(); - /** The key of the editor type. */ - private final String editorTypeKey; /** The key of the new keymap. */ private final String keymapKey; /** * Creates a new keymap change event * - * @param editorTypeKey - * the editor type which had a keymap change * @param keymapKey * the new keymap */ - public KeymapChangeEvent(final String editorTypeKey, final String keymapKey) { - this.editorTypeKey = editorTypeKey; + public KeymapChangeEvent(final String keymapKey) { this.keymapKey = keymapKey; } @@ -49,15 +44,6 @@ public class KeymapChangeEvent extends GwtEvent { handler.onKeymapChanged(this); } - /** - * Returns the editor type. - * - * @return the editor type - */ - public String getEditorTypeKey() { - return editorTypeKey; - } - /** * Returns the keymap key. * @@ -66,5 +52,4 @@ public class KeymapChangeEvent extends GwtEvent { public String getKeymapKey() { return keymapKey; } - } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapChangeHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeymapChangeHandler.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapChangeHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeymapChangeHandler.java index 2909e2242a..b72e4da5e5 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapChangeHandler.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/keymap/KeymapChangeHandler.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.keymap; +package org.eclipse.che.ide.api.editor.keymap; import com.google.gwt.event.shared.EventHandler; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/HasLinkedMode.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/HasLinkedMode.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/HasLinkedMode.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/HasLinkedMode.java index c54627cb26..33bd2740dd 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/HasLinkedMode.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/HasLinkedMode.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.link; +package org.eclipse.che.ide.api.editor.link; /** * Interface for editor that supports linked mode diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedMode.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedMode.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedMode.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedMode.java index bb6ec7e3e4..d8638b5c8c 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedMode.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedMode.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.link; +package org.eclipse.che.ide.api.editor.link; /** * Represents linked mode in editor. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedModel.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedModel.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedModel.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedModel.java index 6d2c99e3cc..c05c30e74c 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedModel.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedModel.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.link; +package org.eclipse.che.ide.api.editor.link; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedModelData.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedModelData.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedModelData.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedModelData.java index 4c2a204360..b19749d155 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedModelData.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedModelData.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.link; +package org.eclipse.che.ide.api.editor.link; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedModelGroup.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedModelGroup.java similarity index 87% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedModelGroup.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedModelGroup.java index ad8c81ddb3..963e25c307 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/link/LinkedModelGroup.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/link/LinkedModelGroup.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.link; +package org.eclipse.che.ide.api.editor.link; -import org.eclipse.che.ide.api.text.Position; +import org.eclipse.che.ide.api.editor.text.Position; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/minimap/HasMinimap.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/minimap/HasMinimap.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/minimap/HasMinimap.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/minimap/HasMinimap.java index e7113bdd09..2581dcc9c7 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/minimap/HasMinimap.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/minimap/HasMinimap.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.minimap; +package org.eclipse.che.ide.api.editor.minimap; /** * Interface for objects that own a minimap. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/minimap/Minimap.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/minimap/Minimap.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/minimap/Minimap.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/minimap/Minimap.java index 723cde56c2..03337598a8 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/minimap/Minimap.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/minimap/Minimap.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.minimap; +package org.eclipse.che.ide.api.editor.minimap; /** * Interface for editor minimaps. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/CharacterScanner.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/CharacterScanner.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/CharacterScanner.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/CharacterScanner.java index 63f1e3fe62..200a2a7541 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/CharacterScanner.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/CharacterScanner.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/ConstantPartitioner.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/ConstantPartitioner.java similarity index 90% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/ConstantPartitioner.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/ConstantPartitioner.java index a4143cb935..324a980521 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/ConstantPartitioner.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/ConstantPartitioner.java @@ -8,15 +8,15 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; import java.util.Collections; import java.util.List; -import org.eclipse.che.ide.api.text.TypedRegion; -import org.eclipse.che.ide.api.text.TypedRegionImpl; -import org.eclipse.che.ide.jseditor.client.document.DocumentHandle; -import org.eclipse.che.ide.jseditor.client.events.DocumentChangeEvent; +import org.eclipse.che.ide.api.editor.events.DocumentChangeEvent; +import org.eclipse.che.ide.api.editor.text.TypedRegion; +import org.eclipse.che.ide.api.editor.text.TypedRegionImpl; +import org.eclipse.che.ide.api.editor.document.DocumentHandle; /** * A no-op partitioner which partitions the document in one single default type partititon. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DefaultPartitioner.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DefaultPartitioner.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DefaultPartitioner.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DefaultPartitioner.java index 576cb53f96..2793861485 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DefaultPartitioner.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DefaultPartitioner.java @@ -8,21 +8,21 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import org.eclipse.che.ide.api.text.BadLocationException; -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.TypedRegion; -import org.eclipse.che.ide.api.text.TypedRegionImpl; -import org.eclipse.che.ide.api.text.rules.Token; -import org.eclipse.che.ide.jseditor.client.document.DocumentHandle; -import org.eclipse.che.ide.jseditor.client.events.DocumentChangeEvent; +import org.eclipse.che.ide.api.editor.events.DocumentChangeEvent; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +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.TypedRegion; +import org.eclipse.che.ide.api.editor.text.TypedRegionImpl; +import org.eclipse.che.ide.api.editor.text.rules.Token; +import org.eclipse.che.ide.api.editor.document.DocumentHandle; import org.eclipse.che.ide.util.loging.Log; /** diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DocumentPartitioner.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DocumentPartitioner.java similarity index 87% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DocumentPartitioner.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DocumentPartitioner.java index 8156568341..ee07e5cd48 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DocumentPartitioner.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DocumentPartitioner.java @@ -8,13 +8,13 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; import java.util.List; -import org.eclipse.che.ide.api.text.TypedRegion; -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.events.DocumentChangeHandler; +import org.eclipse.che.ide.api.editor.text.TypedRegion; +import org.eclipse.che.ide.api.editor.document.UseDocumentHandle; /** * Interface for document partitioner.
@@ -24,7 +24,7 @@ import org.eclipse.che.ide.jseditor.client.document.UseDocumentHandle; public interface DocumentPartitioner extends DocumentChangeHandler, UseDocumentHandle { /** The identifier of the default partition content type. */ - public static final String DEFAULT_CONTENT_TYPE = "__dftl_partition_content_type"; + String DEFAULT_CONTENT_TYPE = "__dftl_partition_content_type"; void initialize(); diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DocumentPositionMap.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DocumentPositionMap.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DocumentPositionMap.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DocumentPositionMap.java index 00ebc2a590..f04100ef40 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DocumentPositionMap.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DocumentPositionMap.java @@ -8,13 +8,13 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; import java.util.List; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.BadPositionCategoryException; -import org.eclipse.che.ide.api.text.TypedPosition; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadPositionCategoryException; +import org.eclipse.che.ide.api.editor.text.TypedPosition; /** * Model for document partitions. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DocumentPositionMapImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DocumentPositionMapImpl.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DocumentPositionMapImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DocumentPositionMapImpl.java index 18f36a1ac2..c1235c5f6a 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/DocumentPositionMapImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/DocumentPositionMapImpl.java @@ -8,17 +8,17 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.che.ide.api.text.BadLocationException; -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.editor.text.BadLocationException; +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.runtime.Assert; import org.eclipse.che.ide.util.loging.Log; /** Implementation for {@link DocumentPositionMap}. */ diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/PartitionScanner.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/PartitionScanner.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/PartitionScanner.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/PartitionScanner.java index eb50ac4bb0..8a64b6ec89 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/PartitionScanner.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/PartitionScanner.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/PartitionerFactory.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/PartitionerFactory.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/PartitionerFactory.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/PartitionerFactory.java index f3ca6bbde5..f91933cf2b 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/PartitionerFactory.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/PartitionerFactory.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; /** * Interface for a factory of {@link DocumentPartitioner}. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/StringCharacterScanner.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/StringCharacterScanner.java similarity index 98% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/StringCharacterScanner.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/StringCharacterScanner.java index b25adb960d..f8ea55bbf7 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/StringCharacterScanner.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/StringCharacterScanner.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/TokenScanner.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/TokenScanner.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/TokenScanner.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/TokenScanner.java index 78d6861dce..20f76d794f 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/partition/TokenScanner.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/partition/TokenScanner.java @@ -8,10 +8,10 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.partition; +package org.eclipse.che.ide.api.editor.partition; -import org.eclipse.che.ide.api.text.rules.Token; +import org.eclipse.che.ide.api.editor.text.rules.Token; /** * A token scanner scans a range of a document and reports about the token it finds. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/position/PositionConverter.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/position/PositionConverter.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/position/PositionConverter.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/position/PositionConverter.java index 9d88cbac3c..889723937b 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/position/PositionConverter.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/position/PositionConverter.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.position; +package org.eclipse.che.ide.api.editor.position; -import org.eclipse.che.ide.jseditor.client.text.TextPosition; +import org.eclipse.che.ide.api.editor.text.TextPosition; /** Conversion utility for text/pixel coordinates. */ public interface PositionConverter { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistAssistant.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistAssistant.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistAssistant.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistAssistant.java index db54bc01e4..346251ae3a 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistAssistant.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistAssistant.java @@ -8,11 +8,11 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.quickfix; +package org.eclipse.che.ide.api.editor.quickfix; import elemental.dom.Element; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistCallback; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistCallback; /** * An QuickAssistAssistant provides support for quick fixes and quick diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistInvocationContext.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistInvocationContext.java similarity index 91% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistInvocationContext.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistInvocationContext.java index cb123b3fa0..5b7ccff209 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistInvocationContext.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistInvocationContext.java @@ -8,12 +8,11 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.quickfix; - -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +package org.eclipse.che.ide.api.editor.quickfix; import javax.validation.constraints.NotNull; import org.eclipse.che.commons.annotation.Nullable; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; /** * MachineContext information for quick fix and quick assist processors. @@ -22,7 +21,7 @@ import org.eclipse.che.commons.annotation.Nullable; */ public final class QuickAssistInvocationContext { - private final int offset; + private final int offset; private final TextEditor textEditor; public QuickAssistInvocationContext(@Nullable final Integer offset, diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistProcessor.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistProcessor.java similarity index 85% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistProcessor.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistProcessor.java index ebd703ad02..2dd1b902c4 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistProcessor.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistProcessor.java @@ -8,10 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.quickfix; - -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistCallback; +package org.eclipse.che.ide.api.editor.quickfix; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistCallback; /** * Quick assist processor for quick fixes and quick assists. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistantFactory.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistantFactory.java similarity index 88% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistantFactory.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistantFactory.java index a3fbf6779e..627051a203 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistantFactory.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/quickfix/QuickAssistantFactory.java @@ -8,12 +8,12 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.quickfix; +package org.eclipse.che.ide.api.editor.quickfix; + +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import javax.validation.constraints.NotNull; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; - /** Factory of {@link QuickAssistAssistant}. */ public interface QuickAssistantFactory { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/DirtyRegion.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/DirtyRegion.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/DirtyRegion.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/DirtyRegion.java index 2b21d8c903..4de9714976 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/DirtyRegion.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/DirtyRegion.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.reconciler; +package org.eclipse.che.ide.api.editor.reconciler; -import org.eclipse.che.ide.api.text.TypedRegion; +import org.eclipse.che.ide.api.editor.text.TypedRegion; /** A dirty region describes a document range which has been changed. */ public class DirtyRegion implements TypedRegion { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/DirtyRegionQueue.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/DirtyRegionQueue.java similarity index 98% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/DirtyRegionQueue.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/DirtyRegionQueue.java index 0a46c30bed..8ed26b323e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/DirtyRegionQueue.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/DirtyRegionQueue.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.reconciler; +package org.eclipse.che.ide.api.editor.reconciler; import java.util.ArrayList; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/Reconciler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/Reconciler.java similarity index 88% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/Reconciler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/Reconciler.java index 8005539860..71e5d0119e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/Reconciler.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/Reconciler.java @@ -8,11 +8,11 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.reconciler; +package org.eclipse.che.ide.api.editor.reconciler; -import org.eclipse.che.ide.jseditor.client.document.UseDocumentHandle; -import org.eclipse.che.ide.jseditor.client.events.DocumentChangeHandler; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +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; /** * An Reconciler defines and maintains a model of the content of the text view document in the presence of changes applied to diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/ReconcilerFactory.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/ReconcilerFactory.java similarity index 84% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/ReconcilerFactory.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/ReconcilerFactory.java index 90f6812c0a..8ba9490134 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/ReconcilerFactory.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/ReconcilerFactory.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.reconciler; +package org.eclipse.che.ide.api.editor.reconciler; -import org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner; +import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner; /** * Factory for {@link Reconciler} instances. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/ReconcilerWithAutoSave.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/ReconcilerWithAutoSave.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/ReconcilerWithAutoSave.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/ReconcilerWithAutoSave.java index 7e38fd2f3c..48e82f64a2 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/ReconcilerWithAutoSave.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/ReconcilerWithAutoSave.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.reconciler; +package org.eclipse.che.ide.api.editor.reconciler; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -16,25 +16,24 @@ import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; import org.eclipse.che.ide.api.editor.EditorInput; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.RegionImpl; -import org.eclipse.che.ide.api.text.TypedRegion; -import org.eclipse.che.ide.jseditor.client.document.Document; -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.DocumentPartitioner; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.events.DocumentChangeEvent; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.editor.text.RegionImpl; +import org.eclipse.che.ide.api.editor.text.TypedRegion; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.document.DocumentHandle; +import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.ide.util.loging.Log; import java.util.HashMap; import java.util.List; import java.util.Map; - /** * Default implementation of {@link Reconciler}. * Also this implementation provide autosave function. - * Avtosave will performed before 'reconcile'. + * Autosave will performed before 'reconcile'. */ /* Maybe this class not proper place for autosave function, but for this issue: https://jira.codenvycorp.com/browse/IDEX-2099 diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/ReconcilingStrategy.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/ReconcilingStrategy.java similarity index 90% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/ReconcilingStrategy.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/ReconcilingStrategy.java index 7d0c67e133..88cf10fc9d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/reconciler/ReconcilingStrategy.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/reconciler/ReconcilingStrategy.java @@ -8,10 +8,10 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.reconciler; +package org.eclipse.che.ide.api.editor.reconciler; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.jseditor.client.document.Document; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.editor.document.Document; /** * A reconciling strategy is used by an reconciler to reconcile a model @@ -38,7 +38,7 @@ public interface ReconcilingStrategy { * As a dirty region might span multiple content types, the segment of the * dirty region which should be investigated is also provided to this * reconciling strategy. The given regions refer to the document passed into - * the most recent call of {@link #setDocument(org.eclipse.che.ide.jseditor.client.document.Document)}. + * the most recent call of {@link #setDocument(org.eclipse.che.ide.api.editor.document.Document)}. * * @param dirtyRegion * the document region which has been changed @@ -50,7 +50,7 @@ public interface ReconcilingStrategy { /** * Activates non-incremental reconciling. The reconciling strategy is just told * that there are changes and that it should reconcile the given partition of the - * document most recently passed into {@link #setDocument(org.eclipse.che.ide.jseditor.client.document.Document)}. + * document most recently passed into {@link #setDocument(org.eclipse.che.ide.api.editor.document.Document)}. * * @param partition * the document partition to be reconciled diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/BadLocationException.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/BadLocationException.java similarity index 96% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/BadLocationException.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/BadLocationException.java index 05c622453d..c6cf5d829d 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/BadLocationException.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/BadLocationException.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text; +package org.eclipse.che.ide.api.editor.text; /** * Indicates the attempt to access a non-existing position. The attempt has been performed on a text store such as a document or diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/BadPositionCategoryException.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/BadPositionCategoryException.java similarity index 96% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/BadPositionCategoryException.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/BadPositionCategoryException.java index a72bf24dc3..e5481fbd97 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/BadPositionCategoryException.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/BadPositionCategoryException.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text; +package org.eclipse.che.ide.api.editor.text; /** diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/text/LinearRange.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/LinearRange.java similarity index 98% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/text/LinearRange.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/LinearRange.java index 1956220784..fbc93cc178 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/text/LinearRange.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/LinearRange.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.text; +package org.eclipse.che.ide.api.editor.text; /** * Range of text described using linear position (ie by character index starting from the text beginning).
diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/Position.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/Position.java similarity index 99% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/Position.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/Position.java index 4781976c8f..38eb75217b 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/Position.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/Position.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text; +package org.eclipse.che.ide.api.editor.text; import org.eclipse.che.ide.runtime.Assert; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/Region.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/Region.java similarity index 96% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/Region.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/Region.java index 5a5f4cd4b2..885aba4d1a 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/Region.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/Region.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text; +package org.eclipse.che.ide.api.editor.text; /** * A region describes a certain range in an indexed text store. Text stores are for example documents or strings. A region is diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/RegionImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/RegionImpl.java similarity index 97% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/RegionImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/RegionImpl.java index 485beb48ac..27a943e57a 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/RegionImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/RegionImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text; +package org.eclipse.che.ide.api.editor.text; /** The default implementation of the {@link Region} interface. */ public class RegionImpl implements Region { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/text/TextPosition.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TextPosition.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/text/TextPosition.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TextPosition.java index 0f9decb547..b89e3eac31 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/text/TextPosition.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TextPosition.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.text; +package org.eclipse.che.ide.api.editor.text; /** A position in the text editor. */ public class TextPosition { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/text/TextRange.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TextRange.java similarity index 98% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/text/TextRange.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TextRange.java index f5b2b4c9a3..6c27d3ff36 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/text/TextRange.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TextRange.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.text; +package org.eclipse.che.ide.api.editor.text; /** Oriented range of text. */ diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/TypedPosition.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TypedPosition.java similarity index 98% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/TypedPosition.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TypedPosition.java index abe66f668d..1dfadecece 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/TypedPosition.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TypedPosition.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text; +package org.eclipse.che.ide.api.editor.text; /** diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/TypedRegion.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TypedRegion.java similarity index 96% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/TypedRegion.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TypedRegion.java index 06dfad1983..be6dd4d2f4 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/TypedRegion.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TypedRegion.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text; +package org.eclipse.che.ide.api.editor.text; /** * Describes a region of an indexed text store such as a document or a string. The region consists of offset, length, and type. diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/TypedRegionImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TypedRegionImpl.java similarity index 97% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/TypedRegionImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TypedRegionImpl.java index ced9d9ac20..a9bfb7b676 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/TypedRegionImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/TypedRegionImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text; +package org.eclipse.che.ide.api.editor.text; /** Default implementation of {@link TypedRegion}. A TypedRegion is a value object. */ public class TypedRegionImpl extends RegionImpl implements TypedRegion { diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/annotation/Annotation.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/annotation/Annotation.java similarity index 96% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/annotation/Annotation.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/annotation/Annotation.java index 99b350b09c..0aeabdf135 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/annotation/Annotation.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/annotation/Annotation.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text.annotation; +package org.eclipse.che.ide.api.editor.text.annotation; import elemental.dom.Element; @@ -21,16 +21,16 @@ import org.vectomatic.dom.svg.ui.SVGResource; *

* Annotations are typed, can have an associated text and can be marked as persistent and * deleted. Annotations which are not explicitly initialized with an annotation - * type are of type "org.eclipse.che.ide.api.text.annotation.unknown". + * type are of type "org.eclipse.che.ide.api.editor.text.annotation.unknown". *

*/ public class Annotation { /** * Constant for unknown annotation types.

- * Value: "org.eclipse.che.ide.api.text.annotation.unknown" + * Value: "org.eclipse.che.ide.api.editor.text.annotation.unknown" */ - public final static String TYPE_UNKNOWN = "org.eclipse.che.ide.api.text.annotation.unknown"; //$NON-NLS-1$ + public final static String TYPE_UNKNOWN = "org.eclipse.che.ide.api.editor.text.annotation.unknown"; //$NON-NLS-1$ /** The type of this annotation. */ private String type; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/rules/Token.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/rules/Token.java similarity index 96% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/rules/Token.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/rules/Token.java index acb4ba05d7..382d8ed8c6 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/rules/Token.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/rules/Token.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text.rules; +package org.eclipse.che.ide.api.editor.text.rules; /** A token to be returned by a rule. */ diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/rules/TokenImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/rules/TokenImpl.java similarity index 98% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/rules/TokenImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/rules/TokenImpl.java index 648e34d89b..d5b82374f7 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/text/rules/TokenImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/text/rules/TokenImpl.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.text.rules; +package org.eclipse.che.ide.api.editor.text.rules; import org.eclipse.che.ide.runtime.Assert; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/AbstractEditorModule.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/AbstractEditorModule.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/AbstractEditorModule.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/AbstractEditorModule.java index 7657ef7737..606278197e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/AbstractEditorModule.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/AbstractEditorModule.java @@ -8,11 +8,13 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import java.util.ArrayList; import java.util.List; +import org.eclipse.che.ide.api.editor.texteditor.EditorModule; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidget; import org.eclipse.che.ide.util.loging.Log; /** diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/CompositeEditorWidget.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/CompositeEditorWidget.java similarity index 76% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/CompositeEditorWidget.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/CompositeEditorWidget.java index bbd49bd039..58f975b58d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/CompositeEditorWidget.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/CompositeEditorWidget.java @@ -8,15 +8,17 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import java.util.List; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.jseditor.client.codeassist.AdditionalInfoCallback; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionsSource; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidget; +import org.eclipse.che.ide.api.editor.texteditor.HandlesUndoRedo; +import org.eclipse.che.ide.api.editor.codeassist.AdditionalInfoCallback; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal; +import org.eclipse.che.ide.api.editor.codeassist.CompletionsSource; +import org.eclipse.che.ide.api.editor.position.PositionConverter; +import org.eclipse.che.ide.api.editor.texteditor.LineStyler; import com.google.gwt.user.client.ui.Composite; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/ContentInitializedHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/ContentInitializedHandler.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/ContentInitializedHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/ContentInitializedHandler.java index e31e687961..a4a41ef8b1 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/ContentInitializedHandler.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/ContentInitializedHandler.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; /** * Handle event that content has been already injected to the Editor Widget diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/CursorModel.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/CursorModel.java similarity index 88% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/CursorModel.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/CursorModel.java index 1278e3dba8..d816a4185f 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/CursorModel.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/CursorModel.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; -import org.eclipse.che.ide.api.text.Position; +import org.eclipse.che.ide.api.editor.text.Position; public interface CursorModel { diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/texteditor/selection/CursorModelWithHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/CursorModelWithHandler.java similarity index 86% rename from core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/texteditor/selection/CursorModelWithHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/CursorModelWithHandler.java index 6568f176a7..d6ea1d614f 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/texteditor/selection/CursorModelWithHandler.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/CursorModelWithHandler.java @@ -8,10 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.texteditor.selection; +package org.eclipse.che.ide.api.editor.texteditor; - -import org.eclipse.che.ide.api.texteditor.CursorModel; +import org.eclipse.che.ide.api.editor.texteditor.CursorModel; import org.eclipse.che.ide.util.ListenerRegistrar.Remover; /** @@ -23,7 +22,7 @@ public interface CursorModelWithHandler extends CursorModel { Remover addCursorHandler(CursorHandler handler); - public interface CursorHandler { + interface CursorHandler { void onCursorChange(int line, int column, boolean isExplicitChange); } } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorHandle.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorHandle.java similarity index 91% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorHandle.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorHandle.java index 2db5da1857..749d60d51e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorHandle.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorHandle.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; /** * Handle on an editor view instance. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorInitCallback.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorInitCallback.java similarity index 90% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorInitCallback.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorInitCallback.java index e6ac8810c7..d80fe585eb 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorInitCallback.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorInitCallback.java @@ -8,10 +8,10 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; -import org.eclipse.che.ide.jseditor.client.document.DocumentStorage.EmbeddedDocumentCallback; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; +import org.eclipse.che.ide.api.editor.document.DocumentStorage.DocumentCallback; import org.eclipse.che.ide.rest.AsyncRequestLoader; import org.eclipse.che.ide.ui.loaders.request.LoaderFactory; @@ -19,7 +19,7 @@ import org.eclipse.che.ide.ui.loaders.request.LoaderFactory; * Composite callback that waits for both the editor module initialization and the document content. * @param the type of the editor widget */ -abstract class EditorInitCallback implements EmbeddedDocumentCallback, EditorModule.EditorModuleReadyCallback { +abstract class EditorInitCallback implements DocumentCallback, EditorModule.EditorModuleReadyCallback { /** Loader used to wait for editor impl initialization. */ private final AsyncRequestLoader loader; @@ -41,7 +41,7 @@ abstract class EditorInitCallback implements EmbeddedDoc */ public EditorInitCallback(final boolean moduleAlreadyReady, final LoaderFactory loaderFactory, - final JsEditorConstants constants) { + final EditorLocalizationConstants constants) { this.editorModuleReady = moduleAlreadyReady; this.loader = loaderFactory.newLoader(); this.waitEditorMessageString = constants.waitEditorInitMessage(); diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorModule.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorModule.java similarity index 86% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorModule.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorModule.java index 37bc86ae6b..89136fa25e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorModule.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorModule.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; /** * Front for an editor module, that allows to be warned when it's initialized. @@ -18,7 +18,7 @@ public interface EditorModule { /** * Tells if the editor module is initialized. - * @return true iff the moduleis ready + * @return true if the module is ready */ boolean isReady(); @@ -34,8 +34,8 @@ public interface EditorModule { */ void waitReady(EditorModuleReadyCallback callback); - /** Callback to call whe nthe module is ready of failed. */ - public interface EditorModuleReadyCallback { + /** Callback to call when the module is ready of failed. */ + interface EditorModuleReadyCallback { /** Used when the initialization is done. */ void onEditorModuleReady(); /** Used when the initialization failed. */ diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorResources.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorResources.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorResources.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorResources.java index 4fa4918808..a144f33d34 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorResources.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorResources.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorWidget.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorWidget.java similarity index 81% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorWidget.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorWidget.java index a20fe1d398..1d84430dec 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorWidget.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorWidget.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import com.google.gwt.event.dom.client.HasBlurHandlers; @@ -17,18 +17,17 @@ import com.google.gwt.event.dom.client.HasFocusHandlers; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.RequiresResize; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; -import org.eclipse.che.ide.jseditor.client.codeassist.AdditionalInfoCallback; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionsSource; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.events.HasCursorActivityHandlers; -import org.eclipse.che.ide.jseditor.client.events.HasGutterClickHandlers; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; -import org.eclipse.che.ide.hotkeys.HotKeyItem; +import org.eclipse.che.ide.api.editor.events.DocumentChangeEvent; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.hotkeys.HotKeyItem; +import org.eclipse.che.ide.api.editor.codeassist.AdditionalInfoCallback; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal; +import org.eclipse.che.ide.api.editor.codeassist.CompletionsSource; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.events.HasCursorActivityHandlers; +import org.eclipse.che.ide.api.editor.events.HasGutterClickHandlers; +import org.eclipse.che.ide.api.editor.keymap.Keymap; +import org.eclipse.che.ide.api.editor.position.PositionConverter; import javax.validation.constraints.NotNull; import java.util.List; @@ -43,7 +42,7 @@ public interface EditorWidget extends IsWidget, HasFocusHandlers, HasGutterClickHandlers, /* extended capabilities */ - HasKeybindings, + HasKeyBindings, HasTextMarkers, LineStyler.HasLineStyler, UndoableEditor { @@ -57,7 +56,7 @@ public interface EditorWidget extends IsWidget, /** * Sets the content of the editor.
- * The operation must send a {@link org.eclipse.che.ide.jseditor.client.events.DocumentChangeEvent} on the document private event bus. + * The operation must send a {@link DocumentChangeEvent} on the document private event bus. * * @param newValue * the new contents @@ -113,7 +112,7 @@ public interface EditorWidget extends IsWidget, void setTabSize(int tabSize); /** - * The instance of {@link org.eclipse.che.ide.jseditor.client.document.Document}. + * The instance of {@link org.eclipse.che.ide.api.editor.document.Document}. * * @return the embedded document */ @@ -127,13 +126,6 @@ public interface EditorWidget extends IsWidget, */ Region getSelectedRange(); - /** - * Returns the editor type for this editor. - * - * @return the editor type - */ - EditorType getEditorType(); - /** * Returns the current keymap in the editor. * diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorWidgetFactory.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorWidgetFactory.java similarity index 88% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorWidgetFactory.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorWidgetFactory.java index 4a9135b086..33a67a6c3e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EditorWidgetFactory.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/EditorWidgetFactory.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorWidget.WidgetInitializedCallback; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidget.WidgetInitializedCallback; import java.util.List; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/HandlesTextOperations.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HandlesTextOperations.java similarity index 96% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/HandlesTextOperations.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HandlesTextOperations.java index 1a188c0496..9a96e7d546 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/HandlesTextOperations.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HandlesTextOperations.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; /** * Interface for text editor view that handles text operations. diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/HandlesUndoRedo.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HandlesUndoRedo.java similarity index 97% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/HandlesUndoRedo.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HandlesUndoRedo.java index 7ba573d0e4..d4c9b2d115 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/HandlesUndoRedo.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HandlesUndoRedo.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; /** * Interface for an editor that allow undo/redo operations. diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasKeybindings.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasKeyBindings.java similarity index 72% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasKeybindings.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasKeyBindings.java index 4e177845eb..b12434af4b 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasKeybindings.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasKeyBindings.java @@ -8,30 +8,30 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; -import org.eclipse.che.ide.jseditor.client.keymap.Keybinding; +import org.eclipse.che.ide.api.editor.keymap.KeyBinding; /** * Interface for components that handles key bindings. */ -public interface HasKeybindings { +public interface HasKeyBindings { /** * Adds a key bindings. * - * @param keybinding + * @param keyBinding * the new binding */ - void addKeybinding(Keybinding keybinding); + void addKeyBinding(KeyBinding keyBinding); /** * Adds a key bindings. * - * @param keybinding + * @param keyBinding * the new binding * @param actionDescription * action description */ - void addKeybinding(Keybinding keybinding, String actionDescription); + void addKeyBinding(KeyBinding keyBinding, String actionDescription); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasNotificationPanel.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasNotificationPanel.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasNotificationPanel.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasNotificationPanel.java index 0660895906..9c5c3ac52d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasNotificationPanel.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasNotificationPanel.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import com.google.gwt.dom.client.Element; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/HasReadOnlyProperty.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasReadOnlyProperty.java similarity index 94% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/HasReadOnlyProperty.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasReadOnlyProperty.java index 9a6f5ca9ff..b38a2cac67 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/HasReadOnlyProperty.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasReadOnlyProperty.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; public interface HasReadOnlyProperty { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasTextMarkers.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasTextMarkers.java similarity index 86% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasTextMarkers.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasTextMarkers.java index c449739501..a6f94b7416 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/HasTextMarkers.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/HasTextMarkers.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; -import org.eclipse.che.ide.jseditor.client.text.TextRange; +import org.eclipse.che.ide.api.editor.text.TextRange; /** * Interface for component that handle marked ranges of text. @@ -26,9 +26,8 @@ public interface HasTextMarkers { */ MarkerRegistration addMarker(TextRange range, String className); - /** Registration object to remove a text range marker. */ - public interface MarkerRegistration { + interface MarkerRegistration { /** Clear the mark. */ void clearMark(); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/LineStyler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/LineStyler.java similarity index 74% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/LineStyler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/LineStyler.java index 36f48e787a..0bb0d71460 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/LineStyler.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/LineStyler.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; /** * Interface for editors that allow line styling. @@ -17,28 +17,37 @@ public interface LineStyler { /** * Adds the styles to the line. - * @param lineNumber the line number - * @param styles the styles to add + * + * @param lineNumber + * the line number + * @param styles + * the styles to add */ void addLineStyles(int lineNumber, String... styles); /** * Removes the styles on the line. - * @param lineNumber the line number - * @param styles the styles to remove + * + * @param lineNumber + * the line number + * @param styles + * the styles to remove */ void removeLineStyles(int lineNumber, String... styles); /** * Removes all styles on the line. - * @param lineNumber the line number + * + * @param lineNumber + * the line number */ void clearLineStyles(int lineNumber); /** Components that hold a line styler. */ - public interface HasLineStyler { + interface HasLineStyler { /** * Returns the LineStyler instance + * * @return the line styler instance */ LineStyler getLineStyler(); diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TemporaryKeyBindingsManager.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TemporaryKeyBindingsManager.java new file mode 100644 index 0000000000..f13f664e2f --- /dev/null +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TemporaryKeyBindingsManager.java @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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.texteditor; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.che.ide.api.editor.keymap.KeyBinding; +import org.eclipse.che.ide.api.editor.texteditor.HasKeyBindings; + +/** Hold {@link KeyBinding} until the editor is ready to accept them. */ +public class TemporaryKeyBindingsManager implements HasKeyBindings { + + private final List bindings = new ArrayList<>(); + + @Override + public void addKeyBinding(final KeyBinding keyBinding) { + this.bindings.add(keyBinding); + } + + @Override + public void addKeyBinding(KeyBinding keyBinding, String actionDescription) { + this.bindings.add(keyBinding); + } + + public List getbindings() { + return this.bindings; + } +} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TextEditor.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditor.java similarity index 56% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TextEditor.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditor.java index 8b1f45564d..bd0b08d2ea 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TextEditor.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditor.java @@ -8,19 +8,53 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.text.TextRange; -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.document.Document; +import org.eclipse.che.ide.api.editor.editorconfig.EditorUpdateAction; +import org.eclipse.che.ide.api.editor.editorconfig.TextEditorConfiguration; +import org.eclipse.che.ide.api.editor.keymap.KeyBinding; +import org.eclipse.che.ide.api.editor.position.PositionConverter; +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 javax.validation.constraints.NotNull; /** * Public view on the editor component. */ public interface TextEditor extends EditorPartPresenter { + /** + * Initializes this editor with the configuration and document provider. + * + * @param configuration + * the configuration of this editor. + */ + void initialize(@NotNull TextEditorConfiguration configuration); + + /** + * Returns the text editor configuration that was used for initialization. + * + * @return the text editor configuration + */ + TextEditorConfiguration getConfiguration(); + + /** + * @return the text editor view implementation + */ + TextEditorPartView getView(); + + /** + * Add an editor-specific key binding. + * + * @param keyBinding + * the key binding + */ + void addKeybinding(KeyBinding keyBinding); + /** * Closes this text editor after optionally saving changes. * @@ -56,7 +90,7 @@ public interface TextEditor extends EditorPartPresenter { String getContentType(); /** - * Returns the selection range as a {@link org.eclipse.che.ide.jseditor.client.text.TextRange} (i.e. two line, char objects: start en end). + * Returns the selection range as a {@link TextRange} (i.e. two line, char objects: start en end). * @return the selection range */ TextRange getSelectedTextRange(); @@ -73,6 +107,19 @@ public interface TextEditor extends EditorPartPresenter { */ TextPosition getCursorPosition(); + /** + * Returns the cursor model for the editor. + * @return the cursor model + */ + CursorModelWithHandler getCursorModel(); + + /** + * Returns a position converter relative to this editor (pixel coordinates <-> line char positions). + * + * @return a position converter + */ + PositionConverter getPositionConverter(); + /** * Returns the cursor position as an offset from the start. * @return the cursor position @@ -93,4 +140,13 @@ public interface TextEditor extends EditorPartPresenter { /** Give the focus to the editor. */ void setFocus(); + + /** Calls all editor update actions for this editor. */ + void refreshEditor(); + + /** + * Adds an editor update action for this editor. + * @param action the action to add + */ + void addEditorUpdateAction(EditorUpdateAction action); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedEditorCursorModel.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorCursorModel.java similarity index 75% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedEditorCursorModel.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorCursorModel.java index 05740d4ea5..9fe8065af8 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedEditorCursorModel.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorCursorModel.java @@ -8,30 +8,29 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; -import org.eclipse.che.ide.api.text.Position; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.events.CursorActivityEvent; -import org.eclipse.che.ide.jseditor.client.events.CursorActivityHandler; -import org.eclipse.che.ide.jseditor.client.text.TextPosition; -import org.eclipse.che.ide.texteditor.selection.CursorModelWithHandler; +import org.eclipse.che.ide.api.editor.text.Position; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.events.CursorActivityEvent; +import org.eclipse.che.ide.api.editor.events.CursorActivityHandler; +import org.eclipse.che.ide.api.editor.text.TextPosition; import org.eclipse.che.ide.util.ListenerManager; import org.eclipse.che.ide.util.ListenerManager.Dispatcher; import org.eclipse.che.ide.util.ListenerRegistrar.Remover; /** - * {@link CursorModelWithHandler} implementation for the embedded editors. + * {@link CursorModelWithHandler} implementation for the text editors. * * @author "Mickaël Leduque" */ -class EmbeddedEditorCursorModel implements CursorModelWithHandler, CursorActivityHandler { +class TextEditorCursorModel implements CursorModelWithHandler, CursorActivityHandler { private final Document document; private final ListenerManager cursorHandlerManager = ListenerManager.create(); - public EmbeddedEditorCursorModel(final Document document) { + public TextEditorCursorModel(final Document document) { this.document = document; this.document.addCursorHandler(this); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TextEditorInit.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorInit.java similarity index 80% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TextEditorInit.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorInit.java index 04dca68dd9..17b361cabc 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TextEditorInit.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorInit.java @@ -8,42 +8,43 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import elemental.events.KeyboardEvent.KeyCode; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.ide.api.text.TypedRegion; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel; -import org.eclipse.che.ide.jseditor.client.annotation.HasAnnotationRendering; -import org.eclipse.che.ide.jseditor.client.annotation.QueryAnnotationsEvent; -import org.eclipse.che.ide.jseditor.client.changeintercept.ChangeInterceptorProvider; -import org.eclipse.che.ide.jseditor.client.changeintercept.TextChange; -import org.eclipse.che.ide.jseditor.client.changeintercept.TextChangeInterceptor; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistCallback; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistant; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistantFactory; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionReadyCallback; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionsSource; -import org.eclipse.che.ide.jseditor.client.document.DocumentHandle; -import org.eclipse.che.ide.jseditor.client.editorconfig.TextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.events.CompletionRequestEvent; -import org.eclipse.che.ide.jseditor.client.events.CompletionRequestHandler; -import org.eclipse.che.ide.jseditor.client.events.DocumentChangeEvent; -import org.eclipse.che.ide.jseditor.client.events.TextChangeEvent; -import org.eclipse.che.ide.jseditor.client.events.TextChangeHandler; -import org.eclipse.che.ide.jseditor.client.events.doc.DocReadyWrapper; -import org.eclipse.che.ide.jseditor.client.events.doc.DocReadyWrapper.DocReadyInit; -import org.eclipse.che.ide.jseditor.client.keymap.KeyBindingAction; -import org.eclipse.che.ide.jseditor.client.keymap.Keybinding; -import org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistAssistant; -import org.eclipse.che.ide.jseditor.client.reconciler.Reconciler; -import org.eclipse.che.ide.jseditor.client.text.TextPosition; +import org.eclipse.che.ide.api.editor.events.DocumentReadyEvent; +import org.eclipse.che.ide.api.editor.text.TypedRegion; +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.changeintercept.ChangeInterceptorProvider; +import org.eclipse.che.ide.api.editor.changeintercept.TextChange; +import org.eclipse.che.ide.api.editor.changeintercept.TextChangeInterceptor; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistCallback; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; +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.CompletionProposal; +import org.eclipse.che.ide.api.editor.codeassist.CompletionReadyCallback; +import org.eclipse.che.ide.api.editor.codeassist.CompletionsSource; +import org.eclipse.che.ide.api.editor.document.DocumentHandle; +import org.eclipse.che.ide.api.editor.editorconfig.TextEditorConfiguration; +import org.eclipse.che.ide.api.editor.events.CompletionRequestEvent; +import org.eclipse.che.ide.api.editor.events.CompletionRequestHandler; +import org.eclipse.che.ide.api.editor.events.DocumentChangeEvent; +import org.eclipse.che.ide.api.editor.events.TextChangeEvent; +import org.eclipse.che.ide.api.editor.events.TextChangeHandler; +import org.eclipse.che.ide.api.editor.events.doc.DocReadyWrapper; +import org.eclipse.che.ide.api.editor.events.doc.DocReadyWrapper.DocReadyInit; +import org.eclipse.che.ide.api.editor.keymap.KeyBindingAction; +import org.eclipse.che.ide.api.editor.keymap.KeyBinding; +import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner; +import org.eclipse.che.ide.api.editor.position.PositionConverter; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistAssistant; +import org.eclipse.che.ide.api.editor.reconciler.Reconciler; +import org.eclipse.che.ide.api.editor.text.TextPosition; import org.eclipse.che.ide.util.browser.UserAgent; import java.util.List; @@ -62,12 +63,11 @@ public class TextEditorInit { private static final String CONTENT_ASSIST = "Content assist"; private static final String QUICK_FIX = "Quick fix"; - private final TextEditorConfiguration configuration; - private final EventBus generalEventBus; - private final CodeAssistantFactory codeAssistantFactory; - private final EmbeddedTextEditorPresenter textEditor; - private final QuickAssistAssistant quickAssist; - + private final TextEditorConfiguration configuration; + private final EventBus generalEventBus; + private final CodeAssistantFactory codeAssistantFactory; + private final TextEditorPresenter textEditor; + private final QuickAssistAssistant quickAssist; /** * The quick assist assistant. @@ -76,8 +76,7 @@ public class TextEditorInit { final EventBus generalEventBus, final CodeAssistantFactory codeAssistantFactory, final QuickAssistAssistant quickAssist, - final EmbeddedTextEditorPresenter textEditor) { - + final TextEditorPresenter textEditor) { this.configuration = configuration; this.generalEventBus = generalEventBus; this.codeAssistantFactory = codeAssistantFactory; @@ -87,7 +86,7 @@ public class TextEditorInit { /** * Initialize the text editor. - * Sets itself as {@link org.eclipse.che.ide.jseditor.client.events.DocumentReadyEvent} handler. + * Sets itself as {@link DocumentReadyEvent} handler. */ public void init() { @@ -207,8 +206,8 @@ public class TextEditorInit { showCompletion(codeAssistant); } }; - final HasKeybindings hasKeybindings = this.textEditor.getHasKeybindings(); - hasKeybindings.addKeybinding(new Keybinding(true, false, false, false, KeyCode.SPACE, action), CONTENT_ASSIST); + final HasKeyBindings hasKeyBindings = this.textEditor.getHasKeybindings(); + hasKeyBindings.addKeyBinding(new KeyBinding(true, false, false, false, KeyCode.SPACE, action), CONTENT_ASSIST); // handle CompletionRequest events that come from text operations instead of simple key binding documentHandle.getDocEventBus().addHandler(CompletionRequestEvent.TYPE, new CompletionRequestHandler() { @@ -224,12 +223,12 @@ public class TextEditorInit { showCompletion(); } }; - final HasKeybindings hasKeybindings = this.textEditor.getHasKeybindings(); + final HasKeyBindings hasKeyBindings = this.textEditor.getHasKeybindings(); if(UserAgent.isMac()){ - hasKeybindings.addKeybinding(new Keybinding(false,false,false, true, KeyCode.SPACE, action), CONTENT_ASSIST); - hasKeybindings.addKeybinding(new Keybinding(false,false,true, true, KeyCode.SPACE, action), CONTENT_ASSIST); + hasKeyBindings.addKeyBinding(new KeyBinding(false, false, false, true, KeyCode.SPACE, action), CONTENT_ASSIST); + hasKeyBindings.addKeyBinding(new KeyBinding(false, false, true, true, KeyCode.SPACE, action), CONTENT_ASSIST); } else { - hasKeybindings.addKeybinding(new Keybinding(true, false, false, false, KeyCode.SPACE, action), CONTENT_ASSIST); + hasKeyBindings.addKeyBinding(new KeyBinding(true, false, false, false, KeyCode.SPACE, action), CONTENT_ASSIST); } // handle CompletionRequest events that come from text operations instead of simple key binding documentHandle.getDocEventBus().addHandler(CompletionRequestEvent.TYPE, new CompletionRequestHandler() { @@ -291,8 +290,8 @@ public class TextEditorInit { } } }; - final HasKeybindings hasKeybindings = this.textEditor.getHasKeybindings(); - hasKeybindings.addKeybinding(new Keybinding(false, false, true, false, KeyCode.ENTER, action), QUICK_FIX); + final HasKeyBindings hasKeyBindings = this.textEditor.getHasKeybindings(); + hasKeyBindings.addKeyBinding(new KeyBinding(false, false, true, false, KeyCode.ENTER, action), QUICK_FIX); } } diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/TextEditorOperations.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorOperations.java similarity index 98% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/TextEditorOperations.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorOperations.java index 759c13b6f1..abdd538613 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/TextEditorOperations.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorOperations.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; /** * Defines the target for text operations. The editor informs diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartView.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPartView.java similarity index 60% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartView.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPartView.java index 4410edfa86..ba82616d94 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartView.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPartView.java @@ -8,80 +8,97 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.RequiresResize; import com.google.gwt.user.client.ui.Widget; import org.eclipse.che.ide.api.editor.EditorWithErrors; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionsSource; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import org.eclipse.che.ide.jseditor.client.text.TextPosition; +import org.eclipse.che.ide.api.editor.codeassist.CompletionsSource; +import org.eclipse.che.ide.api.editor.keymap.Keymap; +import org.eclipse.che.ide.api.editor.text.TextPosition; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidget; +import org.eclipse.che.ide.api.editor.texteditor.HasNotificationPanel; /** - * View interface for the embedded editors components. + * View interface for the text editors components. * * @author "Mickaël Leduque" */ -public interface EmbeddedTextEditorPartView extends RequiresResize, - IsWidget, - HasNotificationPanel { +public interface TextEditorPartView extends RequiresResize, IsWidget, HasNotificationPanel { /** * Invoke the code complete dialog. * - * @param editorWidget the editor widget - * @param completionsSource the completion source + * @param editorWidget + * the editor widget + * @param completionsSource + * the completion source */ void showCompletionProposals(EditorWidget editorWidget, CompletionsSource completionsSource); /** * Invoke the code complete dialog with default completion. - * @param editorWidget the editor widget + * + * @param editorWidget + * the editor widget */ void showCompletionProposals(EditorWidget editorWidget); /** * Sets the view delegate. - * @param delegate the delegate + * + * @param delegate + * the delegate */ void setDelegate(Delegate delegate); /** * Sets the editor widget. - * @param editorWidget the widget + * + * @param editorWidget + * the widget */ void setEditorWidget(EditorWidget editorWidget); /** * Display a placeholder in place of the editor widget. - * @param placeHolder the widget to display + * + * @param placeHolder + * the widget to display */ void showPlaceHolder(Widget placeHolder); /** * Sets the initial state of the info panel. - * @param mode the file mode - * @param editorType the editor implementation - * @param keymap the current keymap - * @param lineCount the number of lines - * @param tabSize the tab size in this editor + * + * @param mode + * the file mode + * @param keymap + * the current keymap + * @param lineCount + * the number of lines + * @param tabSize + * the tab size in this editor */ - void initInfoPanel(String mode, EditorType editorType, Keymap keymap, int lineCount, int tabSize); + void initInfoPanel(String mode, Keymap keymap, int lineCount, int tabSize); /** * Update the location displayed in the info panel. - * @param position the new position + * + * @param position + * the new position */ void updateInfoPanelPosition(TextPosition position); /** * Update the values in the info panel for when the editor is not focused (i.e. show line count and not char part). - * @param linecount the number of lines in the file + * + * @param lineCount + * the number of lines in the file */ - void updateInfoPanelUnfocused(int linecount); + void updateInfoPanelUnfocused(int lineCount); /** Delegate interface for this view. */ interface Delegate extends EditorWithErrors, RequiresResize { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenter.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenter.java similarity index 76% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenter.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenter.java index c871dd1076..68a9189071 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenter.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenter.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import com.google.gwt.core.client.Scheduler; import com.google.gwt.event.dom.client.ChangeEvent; @@ -19,72 +19,66 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; import com.google.web.bindery.event.shared.EventBus; +import org.eclipse.che.ide.api.debug.BreakpointManager; +import org.eclipse.che.ide.api.debug.BreakpointRenderer; +import org.eclipse.che.ide.api.debug.BreakpointRendererFactory; +import org.eclipse.che.ide.api.debug.HasBreakpointRenderer; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.api.editor.AbstractEditorPresenter; import org.eclipse.che.ide.api.editor.EditorAgent.OpenEditorCallback; import org.eclipse.che.ide.api.editor.EditorInput; import org.eclipse.che.ide.api.editor.EditorWithAutoSave; import org.eclipse.che.ide.api.editor.EditorWithErrors; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; +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; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.document.DocumentStorage; +import org.eclipse.che.ide.api.editor.document.DocumentStorage.DocumentCallback; +import org.eclipse.che.ide.api.editor.editorconfig.EditorUpdateAction; +import org.eclipse.che.ide.api.editor.editorconfig.TextEditorConfiguration; +import org.eclipse.che.ide.api.editor.events.CompletionRequestEvent; +import org.eclipse.che.ide.api.editor.events.DocumentReadyEvent; +import org.eclipse.che.ide.api.editor.events.GutterClickEvent; +import org.eclipse.che.ide.api.editor.events.GutterClickHandler; +import org.eclipse.che.ide.api.editor.filetype.FileTypeIdentifier; +import org.eclipse.che.ide.api.editor.formatter.ContentFormatter; +import org.eclipse.che.ide.api.editor.gutter.Gutters; +import org.eclipse.che.ide.api.editor.gutter.HasGutter; +import org.eclipse.che.ide.api.editor.keymap.KeyBinding; +import org.eclipse.che.ide.api.editor.keymap.KeyBindingAction; +import org.eclipse.che.ide.api.editor.position.PositionConverter; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistAssistant; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistProcessor; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistantFactory; +import org.eclipse.che.ide.api.editor.reconciler.Reconciler; +import org.eclipse.che.ide.api.editor.reconciler.ReconcilerWithAutoSave; +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.editor.texteditor.EditorWidget.WidgetInitializedCallback; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPartView.Delegate; import org.eclipse.che.ide.api.event.FileContentUpdateEvent; import org.eclipse.che.ide.api.event.FileContentUpdateHandler; import org.eclipse.che.ide.api.event.FileEvent; import org.eclipse.che.ide.api.event.FileEventHandler; +import org.eclipse.che.ide.api.hotkeys.HasHotKeyItems; +import org.eclipse.che.ide.api.hotkeys.HotKeyItem; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.parts.WorkspaceAgent; import org.eclipse.che.ide.api.project.tree.VirtualFile; import org.eclipse.che.ide.api.selection.Selection; -import org.eclipse.che.ide.api.texteditor.HandlesTextOperations; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.api.texteditor.HasReadOnlyProperty; -import org.eclipse.che.ide.api.texteditor.TextEditorOperations; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; -import org.eclipse.che.ide.debug.BreakpointManager; -import org.eclipse.che.ide.debug.BreakpointRenderer; -import org.eclipse.che.ide.debug.HasBreakpointRenderer; -import org.eclipse.che.ide.hotkeys.HasHotKeyItems; -import org.eclipse.che.ide.hotkeys.HotKeyItem; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistantFactory; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionsSource; -import org.eclipse.che.ide.jseditor.client.debug.BreakpointRendererFactory; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.document.DocumentStorage; -import org.eclipse.che.ide.jseditor.client.document.DocumentStorage.EmbeddedDocumentCallback; -import org.eclipse.che.ide.jseditor.client.editorconfig.EditorUpdateAction; -import org.eclipse.che.ide.jseditor.client.editorconfig.TextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.events.CompletionRequestEvent; -import org.eclipse.che.ide.jseditor.client.events.DocumentReadyEvent; -import org.eclipse.che.ide.jseditor.client.events.GutterClickEvent; -import org.eclipse.che.ide.jseditor.client.events.GutterClickHandler; -import org.eclipse.che.ide.jseditor.client.filetype.FileTypeIdentifier; -import org.eclipse.che.ide.jseditor.client.formatter.ContentFormatter; -import org.eclipse.che.ide.jseditor.client.gutter.Gutters; -import org.eclipse.che.ide.jseditor.client.gutter.HasGutter; -import org.eclipse.che.ide.jseditor.client.keymap.KeyBindingAction; -import org.eclipse.che.ide.jseditor.client.keymap.Keybinding; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistAssistant; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistProcessor; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistantFactory; -import org.eclipse.che.ide.jseditor.client.reconciler.Reconciler; -import org.eclipse.che.ide.jseditor.client.reconciler.ReconcilerWithAutoSave; -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.jseditor.client.texteditor.EditorWidget.WidgetInitializedCallback; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPartView.Delegate; -import org.eclipse.che.ide.texteditor.selection.CursorModelWithHandler; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; import org.eclipse.che.ide.ui.loaders.request.LoaderFactory; import org.vectomatic.dom.svg.ui.SVGResource; -import javax.inject.Inject; import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; @@ -94,87 +88,90 @@ import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMod import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; /** - * Presenter part for the embedded variety of editor implementations. + * Presenter part for the editor implementations. */ -public class EmbeddedTextEditorPresenter extends AbstractEditorPresenter implements EmbeddedTextEditor, - FileEventHandler, - UndoableEditor, - HasBreakpointRenderer, - HasReadOnlyProperty, - HandlesTextOperations, - EditorWithAutoSave, - EditorWithErrors, - HasHotKeyItems, - Delegate { - +public class TextEditorPresenter extends AbstractEditorPresenter implements TextEditor, + FileEventHandler, + UndoableEditor, + HasBreakpointRenderer, + HasReadOnlyProperty, + HandlesTextOperations, + EditorWithAutoSave, + EditorWithErrors, + HasHotKeyItems, + Delegate { /** File type used when we have no idea of the actual content type. */ - public final static String DEFAULT_CONTENT_TYPE = "text/plain"; + public static final String DEFAULT_CONTENT_TYPE = "text/plain"; private static final String TOGGLE_LINE_BREAKPOINT = "Toggle line breakpoint"; - private final WorkspaceAgent workspaceAgent; - private final EditorWidgetFactory editorWidgetFactory; - private final EditorModule editorModule; - private final JsEditorConstants constant; + private final CodeAssistantFactory codeAssistantFactory; + private final BreakpointManager breakpointManager; + private final BreakpointRendererFactory breakpointRendererFactory; + private final DialogFactory dialogFactory; + private final DocumentStorage documentStorage; + private final EditorLocalizationConstants constant; + private final EditorWidgetFactory editorWidgetFactory; + private final EditorModule editorModule; + private final TextEditorPartView editorView; + private final EventBus generalEventBus; + private final FileTypeIdentifier fileTypeIdentifier; + private final QuickAssistantFactory quickAssistantFactory; + private final WorkspaceAgent workspaceAgent; + private final NotificationManager notificationManager; - private final DocumentStorage documentStorage; - private final EventBus generalEventBus; - private final FileTypeIdentifier fileTypeIdentifier; - private final DialogFactory dialogFactory; - private final CodeAssistantFactory codeAssistantFactory; - private final QuickAssistantFactory quickAssistantFactory; - private final BreakpointManager breakpointManager; - private final EmbeddedTextEditorPartView editorView; /** The editor handle for this editor. */ - private final EditorHandle handle = new EditorHandle() { - }; + private final EditorHandle handle; + + private HasKeyBindings keyBindingsManager; private List updateActions; private TextEditorConfiguration configuration; private EditorWidget editorWidget; private Document document; private CursorModelWithHandler cursorModel; private QuickAssistAssistant quickAssistant; - private HasKeybindings keyBindingsManager = new TemporaryKeybindingsManager(); - private LoaderFactory loaderFactory; - private NotificationManager notificationManager; + private LoaderFactory loaderFactory; /** The editor's error state. */ - private EditorState errorState; - private boolean delayedFocus = false; - private boolean isFocused = false; - private BreakpointRendererFactory breakpointRendererFactory; - private BreakpointRenderer breakpointRenderer; - private List fileTypes; - - private TextPosition cursorPosition; + private EditorState errorState; + private boolean delayedFocus; + private boolean isFocused; + private BreakpointRenderer breakpointRenderer; + private List fileTypes; + private TextPosition cursorPosition; @AssistedInject - public EmbeddedTextEditorPresenter(final CodeAssistantFactory codeAssistantFactory, - final BreakpointManager breakpointManager, - final BreakpointRendererFactory breakpointRendererFactory, - final DialogFactory dialogFactory, - final DocumentStorage documentStorage, - final JsEditorConstants constant, - @Assisted final EditorWidgetFactory editorWidgetFactory, - final EditorModule editorModule, - final EmbeddedTextEditorPartView editorView, - final EventBus eventBus, - final FileTypeIdentifier fileTypeIdentifier, - final QuickAssistantFactory quickAssistantFactory, - final WorkspaceAgent workspaceAgent) { - + public TextEditorPresenter(final CodeAssistantFactory codeAssistantFactory, + final BreakpointManager breakpointManager, + final BreakpointRendererFactory breakpointRendererFactory, + final DialogFactory dialogFactory, + final DocumentStorage documentStorage, + final EditorLocalizationConstants constant, + @Assisted final EditorWidgetFactory editorWidgetFactory, + final EditorModule editorModule, + final TextEditorPartView editorView, + final EventBus eventBus, + final FileTypeIdentifier fileTypeIdentifier, + final QuickAssistantFactory quickAssistantFactory, + final WorkspaceAgent workspaceAgent, + final NotificationManager notificationManager) { + this.codeAssistantFactory = codeAssistantFactory; this.breakpointManager = breakpointManager; this.breakpointRendererFactory = breakpointRendererFactory; - this.codeAssistantFactory = codeAssistantFactory; - this.constant = constant; this.dialogFactory = dialogFactory; this.documentStorage = documentStorage; - this.editorView = editorView; - this.editorModule = editorModule; + this.constant = constant; this.editorWidgetFactory = editorWidgetFactory; - this.fileTypeIdentifier = fileTypeIdentifier; + this.editorModule = editorModule; + this.editorView = editorView; this.generalEventBus = eventBus; + this.fileTypeIdentifier = fileTypeIdentifier; this.quickAssistantFactory = quickAssistantFactory; this.workspaceAgent = workspaceAgent; + this.notificationManager = notificationManager; + + keyBindingsManager = new TemporaryKeyBindingsManager(); + handle = new EditorHandle() { + }; this.editorView.setDelegate(this); eventBus.addHandler(FileEvent.TYPE, this); @@ -260,13 +257,13 @@ public class EmbeddedTextEditorPresenter extends Abstrac } } }); - this.editorWidget.addKeybinding(new Keybinding(true, false, false, false, KeyCodes.KEY_F8, new KeyBindingAction() { + this.editorWidget.addKeyBinding(new KeyBinding(true, false, false, false, KeyCodes.KEY_F8, new KeyBindingAction() { @Override public void action() { int currentLine = editorWidget.getDocument().getCursorPosition().getLine(); breakpointManager.changeBreakpointState(currentLine); } - }), TOGGLE_LINE_BREAKPOINT); + }), TOGGLE_LINE_BREAKPOINT); } private void setupFileContentUpdateHandler() { @@ -288,7 +285,7 @@ public class EmbeddedTextEditorPresenter extends Abstrac * -restore current cursor position */ final TextPosition currentCursor = getCursorPosition(); - this.documentStorage.getDocument(document.getFile(), new EmbeddedDocumentCallback() { + this.documentStorage.getDocument(document.getFile(), new DocumentCallback() { @Override public void onDocumentReceived(final String content) { @@ -401,7 +398,7 @@ public class EmbeddedTextEditorPresenter extends Abstrac } @Override - public EmbeddedTextEditorPartView getView() { + public TextEditorPartView getView() { return this.editorView; } @@ -430,10 +427,8 @@ public class EmbeddedTextEditorPresenter extends Abstrac } @Override - public void initialize(@NotNull final TextEditorConfiguration configuration, - @NotNull final NotificationManager notificationManager) { + public void initialize(@NotNull final TextEditorConfiguration configuration) { this.configuration = configuration; - this.notificationManager = notificationManager; } @Override @@ -443,7 +438,7 @@ public class EmbeddedTextEditorPresenter extends Abstrac @Override public ImageResource getTitleImage() { - return input.getImageResource(); + return null; } @Override @@ -502,7 +497,6 @@ public class EmbeddedTextEditorPresenter extends Abstrac @Override public void doSaveAs() { - // TODO not implemented } @Override @@ -597,9 +591,9 @@ public class EmbeddedTextEditorPresenter extends Abstrac } @Override - public void addKeybinding(final Keybinding keybinding) { + public void addKeybinding(final KeyBinding keyBinding) { // the actual HasKeyBindings object can change, so use indirection - getHasKeybindings().addKeybinding(keybinding); + getHasKeybindings().addKeyBinding(keyBinding); } private List detectFileType(final VirtualFile file) { @@ -626,7 +620,7 @@ public class EmbeddedTextEditorPresenter extends Abstrac } } - public HasKeybindings getHasKeybindings() { + public HasKeyBindings getHasKeybindings() { return this.keyBindingsManager; } @@ -657,19 +651,18 @@ public class EmbeddedTextEditorPresenter extends Abstrac } private void switchHasKeybinding() { - final HasKeybindings current = getHasKeybindings(); - if (!(current instanceof TemporaryKeybindingsManager)) { + final HasKeyBindings current = getHasKeybindings(); + if (!(current instanceof TemporaryKeyBindingsManager)) { return; } // change the key binding instance and add all bindings to the new one this.keyBindingsManager = this.editorWidget; - final List bindings = ((TemporaryKeybindingsManager)current).getbindings(); - for (final Keybinding binding : bindings) { - this.keyBindingsManager.addKeybinding(binding); + final List bindings = ((TemporaryKeyBindingsManager)current).getbindings(); + for (final KeyBinding binding : bindings) { + this.keyBindingsManager.addKeyBinding(binding); } } - /** {@inheritDoc} */ @Override public List getHotKeys() { return editorWidget.getHotKeys(); @@ -752,7 +745,6 @@ public class EmbeddedTextEditorPresenter extends Abstrac return this.isFocused; } - /** {@inheritDoc} */ @Override public void setFocus() { editorWidget.setFocus(); @@ -806,13 +798,12 @@ public class EmbeddedTextEditorPresenter extends Abstrac document = editorWidget.getDocument(); document.setFile(input.getFile()); - cursorModel = new EmbeddedEditorCursorModel(document); + cursorModel = new TextEditorCursorModel(document); editorWidget.setTabSize(configuration.getTabWidth()); // initialize info panel editorView.initInfoPanel(editorWidget.getMode(), - editorWidget.getEditorType(), editorWidget.getKeymap(), document.getLineCount(), configuration.getTabWidth()); @@ -843,10 +834,7 @@ public class EmbeddedTextEditorPresenter extends Abstrac isInitialized = true; } - }); - } } - } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/NestablePresenter.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenterFactory.java similarity index 51% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/NestablePresenter.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenterFactory.java index 3975932da8..5c42560b01 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/NestablePresenter.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenterFactory.java @@ -8,21 +8,22 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.editoradapter; - -import javax.validation.constraints.NotNull; - -import org.eclipse.che.ide.api.mvp.Presenter; -import com.google.gwt.user.client.rpc.AsyncCallback; +package org.eclipse.che.ide.api.editor.texteditor; /** - * Kind of presenter that can be nested inside an {@link EditorAdapter}. + * Factory for {@link TextEditorPresenter} objects. + * + * @param + * the type of the editor */ -public interface NestablePresenter extends Presenter, HasEditor { +public interface TextEditorPresenterFactory { /** - * Action to do when closing the component. - * @param callback the callback + * Create an instance of {@link TextEditorPresenter}. + * + * @param editorWidgetFactory + * the {@link EditorWidget} factory tu use + * @return a new {@link TextEditorPresenter} */ - void onClose(@NotNull final AsyncCallback callback); + TextEditorPresenter createTextEditor(EditorWidgetFactory editorWidgetFactory); } diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/UndoableEditor.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/UndoableEditor.java similarity index 93% rename from core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/UndoableEditor.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/UndoableEditor.java index 86e3331b63..c6b8183684 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/UndoableEditor.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/editor/texteditor/UndoableEditor.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.api.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; /** * @author Roman Nikitenko diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/filetypes/FileType.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/filetypes/FileType.java index 73559f0d81..3db992aff2 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/filetypes/FileType.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/filetypes/FileType.java @@ -10,117 +10,37 @@ *******************************************************************************/ package org.eclipse.che.ide.api.filetypes; -import com.google.gwt.resources.client.ImageResource; - -import org.eclipse.che.ide.collections.ListHelper; import org.vectomatic.dom.svg.ui.SVGResource; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.Objects; /** * FileType is meta information about file. * It's contains *

    - *
  • contentDescription - string description associated with file content *
  • image - image resource associated with file - *
  • mimeTypes - array of mime types associated with file *
  • extension - extension associated with file *
  • namePattern - name pattern *
- *

Mime types is array in case when one file type can describe several mime types.(For example JavaScript file can have: - * "application/javascript", "application/x-javascript", "text/javascript" mime types) - *

* * @author Evgen Vidolob */ public class FileType { - private String id; - - private ImageResource image; - - private SVGResource imageSVG; - - private List mimeTypes; + private SVGResource image; private String extension; private String namePattern; - private String contentDescription; - - @SuppressWarnings("unchecked") - public FileType(ImageResource image, String mimeType, String extension) { - this(null, image, null, Arrays.asList(mimeType), extension, null); + public FileType(SVGResource image, String extension) { + this(image, extension, null); } - public FileType(SVGResource imageSVG, String mimeType, String extension) { - this(null, null, imageSVG, Arrays.asList(mimeType), extension, null); - } - - public FileType(String contentDescription, ImageResource image, String mimeType, String extension) { - this(contentDescription, image, null, Arrays.asList(mimeType), extension, null); - } - - public FileType(String contentDescription, SVGResource imageSVG, String mimeType, String extension) { - this(contentDescription, null, imageSVG, Arrays.asList(mimeType), extension, null); - } - - public FileType(ImageResource image, List mimeTypes, String extension) { - this(null, image, null, mimeTypes, extension, null); - } - - public FileType(SVGResource imageSVG, List mimeTypes, String extension) { - this(null, null, imageSVG, mimeTypes, extension, null); - } - - public FileType(String contentDescription, ImageResource image, List mimeTypes, String extension) { - this(contentDescription, image, null, mimeTypes, extension, null); - } - - public FileType(String contentDescription, SVGResource imageSVG, List mimeTypes, String extension) { - this(contentDescription, null, imageSVG, mimeTypes, extension, null); - } - - public FileType(ImageResource image, String namePattern) { - this(null, image, null, null, null, namePattern); - } - - public FileType(SVGResource imageSVG, String namePattern) { - this(null, null, imageSVG, null, null, namePattern); - } - - public FileType(String contentDescription, ImageResource image, String namePattern) { - this(contentDescription, image, null, null, null, namePattern); - } - - public FileType(String contentDescription, SVGResource imageSVG, String namePattern) { - this(contentDescription, null, imageSVG, null, null, namePattern); - } - - private FileType(String contentDescription, ImageResource image, SVGResource imageSVG, List mimeTypes, String extension, - String namePattern) { - super(); - this.contentDescription = contentDescription; + public FileType(SVGResource image, String extension, String namePattern) { this.image = image; - this.imageSVG = imageSVG; - this.mimeTypes = mimeTypes == null ? Collections.emptyList() : mimeTypes; this.extension = extension; this.namePattern = namePattern; - id = contentDescription + (mimeTypes == null ? "noMimeType" : ListHelper.join(mimeTypes, ",") + namePattern); - } - - - /** @return the contentDescription */ - public String getContentDescription() { - return contentDescription; - } - - /** @return the mimeTypes */ - public List getMimeTypes() { - return mimeTypes; } /** @return the extension */ @@ -133,14 +53,9 @@ public class FileType { return namePattern; } - /** @return the image resource */ - public ImageResource getImage() { - return image; - } - /** @return the SVG resource */ - public SVGResource getSVGImage() { - return imageSVG; + public SVGResource getImage() { + return image; } @Override @@ -150,10 +65,7 @@ public class FileType { FileType fileType = (FileType)o; - if (contentDescription != null ? !contentDescription.equals(fileType.contentDescription) : fileType.contentDescription != null) - return false; if (extension != null ? !extension.equals(fileType.extension) : fileType.extension != null) return false; - if (mimeTypes != null ? !mimeTypes.equals(fileType.mimeTypes) : fileType.mimeTypes != null) return false; if (namePattern != null ? !namePattern.equals(fileType.namePattern) : fileType.namePattern != null) return false; return true; @@ -161,14 +73,6 @@ public class FileType { @Override public int hashCode() { - int result = mimeTypes != null ? mimeTypes.hashCode() : 0; - result = 31 * result + (extension != null ? extension.hashCode() : 0); - result = 31 * result + (namePattern != null ? namePattern.hashCode() : 0); - result = 31 * result + (contentDescription != null ? contentDescription.hashCode() : 0); - return result; - } - - public String getId() { - return id; + return Objects.hash(extension, namePattern); } } diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/filetypes/FileTypeRegistry.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/filetypes/FileTypeRegistry.java index 8b8dd10702..2d42b074be 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/filetypes/FileTypeRegistry.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/filetypes/FileTypeRegistry.java @@ -53,15 +53,6 @@ public interface FileTypeRegistry { */ FileType getFileTypeByExtension(String extension); - /** - * Returns the file type for the specified MIME-type. - * - * @param mimeType - * MIME-type for which file type need to find - * @return file type or default file type if no file type found - */ - FileType getFileTypeByMimeType(String mimeType); - /** * Returns the file type which pattern matches the specified file name. * diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/HasHotKeyItems.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/hotkeys/HasHotKeyItems.java similarity index 95% rename from core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/HasHotKeyItems.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/hotkeys/HasHotKeyItems.java index 7deeecd35e..2ddae3ea07 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/HasHotKeyItems.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/hotkeys/HasHotKeyItems.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.hotkeys; +package org.eclipse.che.ide.api.hotkeys; import java.util.List; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/HotKeyItem.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/hotkeys/HotKeyItem.java similarity index 96% rename from core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/HotKeyItem.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/hotkeys/HotKeyItem.java index a418bb4c26..c272d89530 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/HotKeyItem.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/hotkeys/HotKeyItem.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.hotkeys; +package org.eclipse.che.ide.api.hotkeys; /** * Representation hotKey which performs some action diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/preferences/AbstractPreferencePagePresenter.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/preferences/AbstractPreferencePagePresenter.java index 6a37ca3e87..c385be8967 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/preferences/AbstractPreferencePagePresenter.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/preferences/AbstractPreferencePagePresenter.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.che.ide.api.preferences; -import org.vectomatic.dom.svg.ui.SVGResource; - /** * Abstract base implementation for all preference page implementations. * It's simpler to get started using Preferences. @@ -29,60 +27,36 @@ public abstract class AbstractPreferencePagePresenter implements PreferencePageP private String category; - private SVGResource icon; - /** * Create preference page. * * @param title * @param category - * @param icon */ - public AbstractPreferencePagePresenter(String title, String category, SVGResource icon) { + public AbstractPreferencePagePresenter(String title, String category) { this.title = title; this.category = category; - this.icon = icon; } /** * Create preference page with a default category for grouping elements. * * @param title - * @param icon - */ - public AbstractPreferencePagePresenter(String title, SVGResource icon) { - this(title, DEFAULT_CATEGORY, icon); - } - - - /** - * Create preference page. - * - * @param title */ public AbstractPreferencePagePresenter(String title) { - this(title, DEFAULT_CATEGORY, null); + this(title, DEFAULT_CATEGORY); } - /** {@inheritDoc} */ @Override public void setUpdateDelegate(DirtyStateListener delegate) { this.delegate = delegate; } - /** {@inheritDoc} */ @Override public String getTitle() { return title; } - /** {@inheritDoc} */ - @Override - public SVGResource getIcon() { - return icon; - } - - /** {@inheritDoc} */ @Override public String getCategory() { return category; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/preferences/PreferencePagePresenter.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/preferences/PreferencePagePresenter.java index b1cf5fa6bc..4484ef5523 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/preferences/PreferencePagePresenter.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/preferences/PreferencePagePresenter.java @@ -11,7 +11,6 @@ package org.eclipse.che.ide.api.preferences; import org.eclipse.che.ide.api.mvp.Presenter; -import org.vectomatic.dom.svg.ui.SVGResource; /** * Interface of preference page. @@ -48,13 +47,6 @@ public interface PreferencePagePresenter extends Presenter { */ String getTitle(); - /** - * Returns this preference page's icon. This icon will be shown into list of preferences. - * - * @return - */ - SVGResource getIcon(); - /** * Returns whether this page is changed or not. * This information is typically used by the preferences presenter to decide diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/IsConfigurable.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/IsConfigurable.java deleted file mode 100644 index e2185ea69b..0000000000 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/texteditor/IsConfigurable.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * 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.texteditor; - -public interface IsConfigurable { - /** - * Configures the source viewer using the given configuration. Prior to 3.0 this method can only be called once. - * - * @param configuration - * the source viewer configuration to be used - */ - void configure(T configuration); -} diff --git a/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml index 1dc99835cf..5da1851a41 100644 --- a/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml @@ -19,6 +19,7 @@ + diff --git a/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/api/autocomplete/AutocompleteComponent.css b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/api/autocomplete/AutocompleteComponent.css index 02b2fe1607..83338b19a4 100644 --- a/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/api/autocomplete/AutocompleteComponent.css +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/api/autocomplete/AutocompleteComponent.css @@ -10,7 +10,6 @@ *******************************************************************************/ /* CSS for AutocompleteComponent.java */ - .container { box-sizing: border-box; border: 1px solid completionPopupBorderColor; diff --git a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/texteditor/Editor.css b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/api/editor/texteditor/Editor.css similarity index 100% rename from core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/texteditor/Editor.css rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/api/editor/texteditor/Editor.css diff --git a/core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/changeintercept/CloseCStyleCommentChangeInterceptorTest.java b/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/changeintercept/CloseCStyleCommentChangeInterceptorTest.java rename to core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java index 19eb82694e..b844f111b6 100644 --- a/core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/changeintercept/CloseCStyleCommentChangeInterceptorTest.java +++ b/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java @@ -8,13 +8,15 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.changeintercept; +package org.eclipse.che.ide.api.editor.changeintercept.changeintercept; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.doReturn; -import org.eclipse.che.ide.jseditor.client.document.ReadOnlyDocument; +import org.eclipse.che.ide.api.editor.changeintercept.CloseCStyleCommentChangeInterceptor; +import org.eclipse.che.ide.api.editor.changeintercept.TextChange; +import org.eclipse.che.ide.api.editor.document.ReadOnlyDocument; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -23,8 +25,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.junit.Ignore; -import org.eclipse.che.ide.jseditor.client.text.TextPosition; - +import org.eclipse.che.ide.api.editor.text.TextPosition; /** * Test of the c-style bloc comment close interceptor. diff --git a/core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenterTest.java b/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenterTest.java similarity index 71% rename from core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenterTest.java rename to core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenterTest.java index f40d667062..b9bf2f44be 100644 --- a/core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenterTest.java +++ b/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/texteditor/TextEditorPresenterTest.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; +package org.eclipse.che.ide.api.editor.texteditor; import com.google.gwt.core.client.Scheduler; import com.google.gwtmockito.GwtMockitoTestRunner; @@ -17,17 +17,15 @@ import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorInitException; import org.eclipse.che.ide.api.editor.EditorInput; -import org.eclipse.che.ide.api.notification.NotificationManager; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.document.DocumentStorage; +import org.eclipse.che.ide.api.editor.editorconfig.TextEditorConfiguration; +import org.eclipse.che.ide.api.editor.formatter.ContentFormatter; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistantFactory; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidget.WidgetInitializedCallback; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.api.texteditor.TextEditorOperations; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.document.DocumentStorage; -import org.eclipse.che.ide.jseditor.client.editorconfig.TextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.formatter.ContentFormatter; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistantFactory; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorWidget.WidgetInitializedCallback; import org.eclipse.che.ide.ui.loaders.request.LoaderFactory; import org.eclipse.che.ide.ui.loaders.request.MessageLoader; import org.junit.Test; @@ -55,18 +53,18 @@ import static org.mockito.Mockito.verify; * @author Andrienko Alexander */ @RunWith(GwtMockitoTestRunner.class) -public class EmbeddedTextEditorPresenterTest { +public class TextEditorPresenterTest { @Mock private DocumentStorage documentStorage; @Mock - private JsEditorConstants constant; + private EditorLocalizationConstants constant; @Mock private EditorWidgetFactory editorWidgetFactory; @Mock private EditorModule editorModule; @Mock - private EmbeddedTextEditorPartView editorView; + private TextEditorPartView editorView; @Mock private EventBus eventBus; @Mock @@ -80,11 +78,9 @@ public class EmbeddedTextEditorPresenterTest { @Mock private TextEditorConfiguration configuration; @Mock - private NotificationManager notificationManager; - @Mock private LoaderFactory loaderFactory; @Mock - private MessageLoader loader; + private MessageLoader loader; @Mock private ContentFormatter contentFormatter; @@ -92,12 +88,12 @@ public class EmbeddedTextEditorPresenterTest { private Map codeAssistProcessors; @InjectMocks - private EmbeddedTextEditorPresenter embeddedTextEditorPresenter; + private TextEditorPresenter textEditorPresenter; @Test public void activateEditorIfEditorWidgetNotNull() throws EditorInitException { initializeAndInitEditor(); - embeddedTextEditorPresenter.activate(); + textEditorPresenter.activate(); verify(editorWidget).refresh(); verify(editorWidget).setFocus(); @@ -107,11 +103,11 @@ public class EmbeddedTextEditorPresenterTest { public void activateEditorIfEditorWidgetNull() throws Exception { reset(editorView, eventBus); - embeddedTextEditorPresenter.activate(); + textEditorPresenter.activate(); - Field delayedFocus = EmbeddedTextEditorPresenter.class.getDeclaredField("delayedFocus"); + Field delayedFocus = TextEditorPresenter.class.getDeclaredField("delayedFocus"); delayedFocus.setAccessible(true); - boolean fieldValue = (boolean)delayedFocus.get(embeddedTextEditorPresenter); + boolean fieldValue = (boolean)delayedFocus.get(textEditorPresenter); assertTrue(fieldValue); } @@ -121,15 +117,15 @@ public class EmbeddedTextEditorPresenterTest { doReturn(contentFormatter).when(configuration).getContentFormatter(); initializeAndInitEditor(); - embeddedTextEditorPresenter.doOperation(TextEditorOperations.FORMAT); + textEditorPresenter.doOperation(TextEditorOperations.FORMAT); verify(contentFormatter).format(document); } @Test public void shouldFormatOperationWhenDocumentAndFormatterAreNull() throws EditorInitException { - embeddedTextEditorPresenter.initialize(configuration, notificationManager); - embeddedTextEditorPresenter.doOperation(TextEditorOperations.FORMAT); + textEditorPresenter.initialize(configuration); + textEditorPresenter.doOperation(TextEditorOperations.FORMAT); verify(contentFormatter, never()).format(document); } @@ -138,8 +134,8 @@ public class EmbeddedTextEditorPresenterTest { public void shouldFormatOperationWhenFormatterIsNotNullButDocumentIsNull() throws EditorInitException { doReturn(contentFormatter).when(configuration).getContentFormatter(); - embeddedTextEditorPresenter.initialize(configuration, notificationManager); - embeddedTextEditorPresenter.doOperation(TextEditorOperations.FORMAT); + textEditorPresenter.initialize(configuration); + textEditorPresenter.doOperation(TextEditorOperations.FORMAT); verify(contentFormatter, never()).format(document); } @@ -149,7 +145,7 @@ public class EmbeddedTextEditorPresenterTest { doReturn(null).when(configuration).getContentFormatter(); initializeAndInitEditor(); - embeddedTextEditorPresenter.doOperation(TextEditorOperations.FORMAT); + textEditorPresenter.doOperation(TextEditorOperations.FORMAT); verify(contentFormatter, never()).format(document); } @@ -160,7 +156,7 @@ public class EmbeddedTextEditorPresenterTest { doReturn(false).when(codeAssistProcessors).isEmpty(); initializeAndInitEditor(); - assertTrue(embeddedTextEditorPresenter.canDoOperation(TextEditorOperations.CODEASSIST_PROPOSALS)); + assertTrue(textEditorPresenter.canDoOperation(TextEditorOperations.CODEASSIST_PROPOSALS)); } @Test @@ -169,7 +165,7 @@ public class EmbeddedTextEditorPresenterTest { doReturn(true).when(codeAssistProcessors).isEmpty(); initializeAndInitEditor(); - assertFalse(embeddedTextEditorPresenter.canDoOperation(TextEditorOperations.CODEASSIST_PROPOSALS)); + assertFalse(textEditorPresenter.canDoOperation(TextEditorOperations.CODEASSIST_PROPOSALS)); } @Test @@ -177,7 +173,7 @@ public class EmbeddedTextEditorPresenterTest { doReturn(null).when(configuration).getContentAssistantProcessors(); initializeAndInitEditor(); - assertFalse(embeddedTextEditorPresenter.canDoOperation(TextEditorOperations.CODEASSIST_PROPOSALS)); + assertFalse(textEditorPresenter.canDoOperation(TextEditorOperations.CODEASSIST_PROPOSALS)); } @Test @@ -185,7 +181,7 @@ public class EmbeddedTextEditorPresenterTest { doReturn(contentFormatter).when(configuration).getContentFormatter(); initializeAndInitEditor(); - assertTrue(embeddedTextEditorPresenter.canDoOperation(TextEditorOperations.FORMAT)); + assertTrue(textEditorPresenter.canDoOperation(TextEditorOperations.FORMAT)); } @Test @@ -193,11 +189,11 @@ public class EmbeddedTextEditorPresenterTest { doReturn(null).when(configuration).getContentFormatter(); initializeAndInitEditor(); - assertFalse(embeddedTextEditorPresenter.canDoOperation(TextEditorOperations.FORMAT)); + assertFalse(textEditorPresenter.canDoOperation(TextEditorOperations.FORMAT)); } /** - * This method initialize EmbeddedTextEditorPresenter for testing + * This method initialize TextEditorPresenter for testing * @throws EditorInitException */ public void initializeAndInitEditor() throws EditorInitException { @@ -212,9 +208,9 @@ public class EmbeddedTextEditorPresenterTest { Matchers.anyObject()); doReturn(document).when(editorWidget).getDocument(); - embeddedTextEditorPresenter.injectAsyncLoader(loaderFactory); - embeddedTextEditorPresenter.initialize(configuration, notificationManager); - embeddedTextEditorPresenter.init(editorInput, editorCallback); + textEditorPresenter.injectAsyncLoader(loaderFactory); + textEditorPresenter.initialize(configuration); + textEditorPresenter.init(editorInput, editorCallback); verify(documentStorage).getDocument(any(VirtualFile.class), callBackCaptor.capture()); diff --git a/core/ide/che-core-ide-app/pom.xml b/core/ide/che-core-ide-app/pom.xml index 5f2115bb0b..78e1beca4e 100644 --- a/core/ide/che-core-ide-app/pom.xml +++ b/core/ide/che-core-ide-app/pom.xml @@ -47,10 +47,6 @@ com.google.inject.extensions guice-assistedinject - - javax.inject - javax.inject - javax.validation validation-api diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/CompleteAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/CompleteAction.java index 410ce84abc..629e87c864 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/CompleteAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/CompleteAction.java @@ -18,8 +18,8 @@ import org.eclipse.che.ide.api.action.Action; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.texteditor.HandlesTextOperations; -import org.eclipse.che.ide.api.texteditor.TextEditorOperations; +import org.eclipse.che.ide.api.editor.texteditor.HandlesTextOperations; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorOperations; /** * Calls editor complete(Ctrl+Space) diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/DeleteItemAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/DeleteItemAction.java index d3f7836692..dd1deba096 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/DeleteItemAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/DeleteItemAction.java @@ -44,9 +44,9 @@ import org.eclipse.che.ide.project.node.remove.DeleteNodeHandler; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.websocket.WebSocketException; import org.eclipse.che.ide.websocket.rest.RequestCallback; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/ExportConfigAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/ExportConfigAction.java index 56472c244f..dbf7130bc7 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/ExportConfigAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/ExportConfigAction.java @@ -11,6 +11,7 @@ package org.eclipse.che.ide.actions; import com.google.inject.Inject; +import com.google.inject.Singleton; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; @@ -18,7 +19,6 @@ import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; -import javax.inject.Singleton; import javax.validation.constraints.NotNull; import java.util.Arrays; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/FindReplaceAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/FindReplaceAction.java deleted file mode 100644 index 3d460b585c..0000000000 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/FindReplaceAction.java +++ /dev/null @@ -1,91 +0,0 @@ -/******************************************************************************* - * 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.actions; -// TODO: rework after new Project API -// -//import org.eclipse.che.api.analytics.client.logger.AnalyticsEventLogger; -//import org.eclipse.che.api.vfs.gwt.client.VfsServiceClient; -//import org.eclipse.che.api.vfs.shared.dto.ReplacementSet; -//import org.eclipse.che.api.vfs.shared.dto.Variable; -//import org.eclipse.che.ide.api.action.Action; -//import org.eclipse.che.ide.api.action.ActionEvent; -//import org.eclipse.che.ide.api.app.AppContext; -//import org.eclipse.che.ide.dto.DtoFactory; -//import org.eclipse.che.ide.rest.AsyncRequestCallback; -//import org.eclipse.che.ide.util.loging.Log; -// -//import javax.inject.Inject; -//import java.util.Arrays; -//import java.util.Map; -// -///** -// * @author Sergii Leschenko -// */ -//public class FindReplaceAction extends Action { -// private final VfsServiceClient vfsServiceClient; -// private final DtoFactory dtoFactory; -// private final AppContext appContext; -// -// -// @Inject -// public FindReplaceAction(VfsServiceClient vfsServiceClient, -// DtoFactory dtoFactory, -// AppContext appContext, -// AnalyticsEventLogger eventLogger) { -// this.vfsServiceClient = vfsServiceClient; -// this.dtoFactory = dtoFactory; -// this.appContext = appContext; -// -// } -// -// @Override -// public void actionPerformed(ActionEvent event) { -// -// -// if (appContext.getCurrentProject() == null || appContext.getCurrentProject().getRootProject() == null) { -// Log.error(getClass(), "Can not run find/replace without opened project\n"); -// return; -// } -// -// if (event.getParameters() == null) { -// Log.error(getClass(), "Can not run find/replace without parameters"); -// return; -// } -// -// final Map parameters = event.getParameters(); -// -// String file = parameters.get("in"); -// String find = parameters.get("find"); -// String replace = parameters.get("replace"); -// String mode = parameters.get("replaceMode"); -// -// final ReplacementSet replacementSet = dtoFactory.createDto(ReplacementSet.class).withFiles(Arrays.asList(file)) -// .withEntries(Arrays.asList(dtoFactory.createDto(Variable.class) -// .withFind(find) -// .withReplace(replace) -// .withReplacemode(mode))); -// -// vfsServiceClient.replace(appContext.getWorkspaceId(), -// appContext.getCurrentProject().getRootProject().getPath(), -// Arrays.asList(replacementSet), -// new AsyncRequestCallback() { -// @Override -// protected void onSuccess(Void result) { -// //TODO Send event described in IDEX-1743 -// } -// -// @Override -// protected void onFailure(Throwable exception) { -// -// } -// }); -// } -//} diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/FormatterAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/FormatterAction.java index 62f2aab0ee..b1be570e56 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/FormatterAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/FormatterAction.java @@ -19,8 +19,8 @@ import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.texteditor.HandlesTextOperations; -import org.eclipse.che.ide.api.texteditor.TextEditorOperations; +import org.eclipse.che.ide.api.editor.texteditor.HandlesTextOperations; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorOperations; import javax.validation.constraints.NotNull; import java.util.Arrays; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/OpenFileAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/OpenFileAction.java index 6424c8e7df..a56a591210 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/OpenFileAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/OpenFileAction.java @@ -11,6 +11,8 @@ package org.eclipse.che.ide.actions; import com.google.gwt.core.client.Callback; +import com.google.inject.Inject; +import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import com.google.web.bindery.event.shared.HandlerRegistration; @@ -37,9 +39,6 @@ import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.FileReferenceNode; import org.eclipse.che.ide.util.loging.Log; -import javax.inject.Inject; -import javax.inject.Singleton; - import static org.eclipse.che.api.promises.client.callback.CallbackPromiseHelper.createFromCallback; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/PasteAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/PasteAction.java index 67278a9f2c..6553b1179e 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/PasteAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/PasteAction.java @@ -29,11 +29,11 @@ import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.ResourceBasedNode; import org.eclipse.che.ide.resource.Path; import org.eclipse.che.ide.rest.AsyncRequestCallback; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.InputCallback; -import org.eclipse.che.ide.ui.dialogs.choice.ChoiceDialog; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.ChoiceDialog; import java.util.List; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/RedoAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/RedoAction.java index 9b6a7b068c..6f1594032c 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/RedoAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/RedoAction.java @@ -18,8 +18,8 @@ import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; +import org.eclipse.che.ide.api.editor.texteditor.HandlesUndoRedo; +import org.eclipse.che.ide.api.editor.texteditor.UndoableEditor; import javax.validation.constraints.NotNull; import java.util.Arrays; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/RenameItemAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/RenameItemAction.java index 16bba3f737..192402b96a 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/RenameItemAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/RenameItemAction.java @@ -27,11 +27,11 @@ import org.eclipse.che.ide.project.node.FolderReferenceNode; import org.eclipse.che.ide.project.node.ModuleNode; import org.eclipse.che.ide.project.node.ProjectNode; import org.eclipse.che.ide.project.node.ResourceBasedNode; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.InputCallback; -import org.eclipse.che.ide.ui.dialogs.input.InputDialog; -import org.eclipse.che.ide.ui.dialogs.input.InputValidator; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.InputDialog; +import org.eclipse.che.ide.api.dialogs.InputValidator; import org.eclipse.che.ide.util.NameUtils; import javax.validation.constraints.NotNull; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/UndoAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/UndoAction.java index dbf494eb52..1c8435b96e 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/UndoAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/UndoAction.java @@ -18,8 +18,8 @@ import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; +import org.eclipse.che.ide.api.editor.texteditor.HandlesUndoRedo; +import org.eclipse.che.ide.api.editor.texteditor.UndoableEditor; import javax.validation.constraints.NotNull; import java.util.Arrays; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreator.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreator.java index 760875b74c..c717b18589 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreator.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreator.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.che.ide.actions; +import com.google.inject.Inject; +import com.google.inject.Singleton; + import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; @@ -18,9 +21,6 @@ import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.notification.StatusNotification; -import javax.inject.Inject; -import javax.inject.Singleton; - import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.PROGRESS; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/client/StartUpActionsProcessor.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/client/StartUpActionsProcessor.java index c383345549..2184a90684 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/client/StartUpActionsProcessor.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/client/StartUpActionsProcessor.java @@ -11,14 +11,14 @@ package org.eclipse.che.ide.client; import com.google.gwt.core.client.Callback; +import com.google.inject.Inject; +import com.google.inject.Singleton; import org.eclipse.che.ide.api.action.ActionManager; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.StartUpAction; import org.eclipse.che.ide.api.component.WsAgentComponent; -import javax.inject.Inject; -import javax.inject.Singleton; import java.util.List; /** diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java index c3a61fbb95..9e5eba9d06 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java @@ -11,6 +11,7 @@ package org.eclipse.che.ide.context; import com.google.inject.Inject; +import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.factory.shared.dto.Factory; @@ -34,7 +35,6 @@ import org.eclipse.che.ide.api.project.tree.VirtualFile; import org.eclipse.che.ide.api.selection.Selection; import org.eclipse.che.ide.project.node.ProjectNode; -import javax.inject.Singleton; import java.util.ArrayList; import java.util.List; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java index d2f7a4aed7..f00f03c77f 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java @@ -172,23 +172,23 @@ import org.eclipse.che.ide.theme.ThemeAgentImpl; import org.eclipse.che.ide.ui.button.ConsoleButton; import org.eclipse.che.ide.ui.button.ConsoleButtonFactory; import org.eclipse.che.ide.ui.button.ConsoleButtonImpl; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.choice.ChoiceDialog; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ChoiceDialog; import org.eclipse.che.ide.ui.dialogs.choice.ChoiceDialogFooter; import org.eclipse.che.ide.ui.dialogs.choice.ChoiceDialogPresenter; import org.eclipse.che.ide.ui.dialogs.choice.ChoiceDialogView; import org.eclipse.che.ide.ui.dialogs.choice.ChoiceDialogViewImpl; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialogFooter; import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialogPresenter; import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialogView; import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialogViewImpl; -import org.eclipse.che.ide.ui.dialogs.input.InputDialog; +import org.eclipse.che.ide.api.dialogs.InputDialog; import org.eclipse.che.ide.ui.dialogs.input.InputDialogFooter; import org.eclipse.che.ide.ui.dialogs.input.InputDialogPresenter; import org.eclipse.che.ide.ui.dialogs.input.InputDialogView; import org.eclipse.che.ide.ui.dialogs.input.InputDialogViewImpl; -import org.eclipse.che.ide.ui.dialogs.message.MessageDialog; +import org.eclipse.che.ide.api.dialogs.MessageDialog; import org.eclipse.che.ide.ui.dialogs.message.MessageDialogFooter; import org.eclipse.che.ide.ui.dialogs.message.MessageDialogPresenter; import org.eclipse.che.ide.ui.dialogs.message.MessageDialogView; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/StandardComponentInitializer.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/StandardComponentInitializer.java index ee675353f5..3ea7df85b8 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/StandardComponentInitializer.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/StandardComponentInitializer.java @@ -62,6 +62,7 @@ import org.eclipse.che.ide.api.action.ActionManager; import org.eclipse.che.ide.api.action.DefaultActionGroup; import org.eclipse.che.ide.api.action.IdeActions; import org.eclipse.che.ide.api.editor.EditorRegistry; +import org.eclipse.che.ide.api.editor.texteditor.EditorResources; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.api.icon.Icon; @@ -80,6 +81,7 @@ import org.eclipse.che.ide.part.editor.actions.PinEditorTabAction; import org.eclipse.che.ide.part.editor.actions.ReopenClosedFileAction; import org.eclipse.che.ide.part.editor.recent.OpenRecentFilesAction; import org.eclipse.che.ide.ui.loaders.request.MessageLoaderResources; +import org.eclipse.che.ide.ui.popup.PopupResources; import org.eclipse.che.ide.ui.toolbar.MainToolbar; import org.eclipse.che.ide.ui.toolbar.ToolbarPresenter; import org.eclipse.che.ide.util.browser.UserAgent; @@ -131,9 +133,6 @@ public class StandardComponentInitializer { @Inject private FindActionAction findActionAction; -// @Inject -// private FindReplaceAction findReplaceAction; - @Inject private NavigateToFileAction navigateToFileAction; @@ -270,6 +269,12 @@ public class StandardComponentInitializer { @Inject private MessageLoaderResources messageLoaderResources; + @Inject + private EditorResources editorResources; + + @Inject + private PopupResources popupResources; + @Inject private ShowReferenceAction showReferenceAction; @@ -333,7 +338,6 @@ public class StandardComponentInitializer { @Inject private WsConnectionListener wsConnectionListener; - /** Instantiates {@link StandardComponentInitializer} an creates standard content. */ @Inject public StandardComponentInitializer(IconRegistry iconRegistry, @@ -342,8 +346,9 @@ public class StandardComponentInitializer { } public void initialize() { - //initialize loader resources messageLoaderResources.Css().ensureInjected(); + editorResources.editorCss().ensureInjected(); + popupResources.popupStyle().ensureInjected(); fileTypeRegistry.registerFileType(xmlFile); @@ -411,7 +416,7 @@ public class StandardComponentInitializer { newGroup.addSeparator(); actionManager.registerAction("newXmlFile", newXmlFileAction); - newXmlFileAction.getTemplatePresentation().setSVGResource(xmlFile.getSVGImage()); + newXmlFileAction.getTemplatePresentation().setSVGResource(xmlFile.getImage()); newGroup.addAction(newXmlFileAction); actionManager.registerAction("uploadFile", uploadFileAction); @@ -548,7 +553,6 @@ public class StandardComponentInitializer { actionManager.registerAction("collapseAll", collapseAllAction); -// actionManager.registerAction("findReplace", findReplaceAction); actionManager.registerAction("openFile", openFileAction); actionManager.registerAction("expandNode", expandNodeAction); actionManager.registerAction("switchLeftTab", switchLeftTabAction); @@ -618,7 +622,6 @@ public class StandardComponentInitializer { } else { keyBinding.getGlobal().addKey(new KeyBuilder().alt().charCode('w').build(), "closeCurrentFile"); } - } /** Action that does nothing. It's just for disabling (catching) browser's hot key. */ diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointManagerImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerImpl.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointManagerImpl.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerImpl.java index 0c6c182992..d43482233d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointManagerImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerImpl.java @@ -8,9 +8,10 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.debug; +package org.eclipse.che.ide.debug; import com.google.gwt.storage.client.Storage; +import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.promises.client.Operation; @@ -29,22 +30,18 @@ import org.eclipse.che.ide.api.project.node.Node; import org.eclipse.che.ide.api.project.tree.VirtualFile; import org.eclipse.che.ide.api.project.tree.VirtualFileImpl; import org.eclipse.che.ide.api.project.tree.VirtualFileInfo; -import org.eclipse.che.ide.debug.Breakpoint; -import org.eclipse.che.ide.debug.Breakpoint.Type; -import org.eclipse.che.ide.debug.BreakpointManager; -import org.eclipse.che.ide.debug.BreakpointManagerObservable; -import org.eclipse.che.ide.debug.BreakpointManagerObserver; -import org.eclipse.che.ide.debug.BreakpointRenderer; -import org.eclipse.che.ide.debug.BreakpointRenderer.LineChangeAction; -import org.eclipse.che.ide.debug.Debugger; -import org.eclipse.che.ide.debug.DebuggerDescriptor; -import org.eclipse.che.ide.debug.DebuggerManager; -import org.eclipse.che.ide.debug.DebuggerManagerObserver; -import org.eclipse.che.ide.debug.HasBreakpointRenderer; +import org.eclipse.che.ide.api.debug.Breakpoint; +import org.eclipse.che.ide.api.debug.Breakpoint.Type; +import org.eclipse.che.ide.api.debug.BreakpointManager; +import org.eclipse.che.ide.api.debug.BreakpointManagerObservable; +import org.eclipse.che.ide.api.debug.BreakpointManagerObserver; +import org.eclipse.che.ide.api.debug.BreakpointRenderer; +import org.eclipse.che.ide.api.debug.BreakpointRenderer.LineChangeAction; +import org.eclipse.che.ide.api.debug.HasBreakpointRenderer; import org.eclipse.che.ide.debug.dto.BreakpointDto; import org.eclipse.che.ide.dto.DtoFactory; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.project.event.ProjectExplorerLoadedEvent; import org.eclipse.che.ide.project.event.ResourceNodeDeletedEvent; import org.eclipse.che.ide.project.node.FileReferenceNode; @@ -53,7 +50,6 @@ import org.eclipse.che.ide.project.node.ItemReferenceBasedNode; import org.eclipse.che.ide.project.node.ResourceBasedNode; import org.eclipse.che.ide.resource.Path; -import javax.inject.Inject; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -66,7 +62,7 @@ import java.util.Set; import java.util.logging.Logger; /** - * Implementation of {@link BreakpointManager} for jseditor. + * Implementation of {@link BreakpointManager} for editor. * * @author Anatoliy Bazko * @author Valeriy Svydenko @@ -233,8 +229,8 @@ public class BreakpointManagerImpl implements BreakpointManager, */ private boolean isCodeExecutable(final VirtualFile activeFile, int lineNumber) { EditorPartPresenter editor = getEditorForFile(activeFile.getPath()); - if (editor instanceof EmbeddedTextEditorPresenter) { - Document document = ((EmbeddedTextEditorPresenter)editor).getDocument(); + if (editor instanceof TextEditorPresenter) { + Document document = ((TextEditorPresenter)editor).getDocument(); return !document.getLineContent(lineNumber).trim().isEmpty(); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointRendererImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointRendererImpl.java similarity index 89% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointRendererImpl.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointRendererImpl.java index efb36eb50c..22b95866b2 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointRendererImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointRendererImpl.java @@ -8,22 +8,22 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.debug; +package org.eclipse.che.ide.debug; import elemental.dom.Element; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; -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.gutter.Gutter.LineNumberingChangeCallback; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorResources; -import org.eclipse.che.ide.jseditor.client.texteditor.LineStyler; +import org.eclipse.che.ide.api.debug.BreakpointRenderer; +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.gutter.Gutter.LineNumberingChangeCallback; +import org.eclipse.che.ide.api.editor.texteditor.EditorResources; +import org.eclipse.che.ide.api.editor.texteditor.LineStyler; import org.eclipse.che.ide.util.dom.Elements; -import static org.eclipse.che.ide.jseditor.client.gutter.Gutters.BREAKPOINTS_GUTTER; +import static org.eclipse.che.ide.api.editor.gutter.Gutters.BREAKPOINTS_GUTTER; /** * Renderer for breakpoint marks in gutter (on the left margin of the text). diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointResources.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointResources.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointResources.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointResources.java index 9dc34374f2..e135255b1d 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/BreakpointResources.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointResources.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.debug; +package org.eclipse.che.ide.debug; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/Breakpoints.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/Breakpoints.java similarity index 85% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/Breakpoints.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/Breakpoints.java index 140e65327a..57cf90441a 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/debug/Breakpoints.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/Breakpoints.java @@ -8,13 +8,13 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.debug; +package org.eclipse.che.ide.debug; public final class Breakpoints { private Breakpoints() { } - /** Logical identifer for the breakpoints gutter. */ + /** Logical identifier for the breakpoints gutter. */ public static final String BREAKPOINTS_GUTTER = "breakpoints"; } diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/DebuggerObserver.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/DebuggerObserver.java index 916a092615..67985598e5 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/DebuggerObserver.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/DebuggerObserver.java @@ -11,6 +11,7 @@ package org.eclipse.che.ide.debug; import org.eclipse.che.api.promises.client.Promise; +import org.eclipse.che.ide.api.debug.Breakpoint; import java.util.List; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/dto/BreakpointDto.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/dto/BreakpointDto.java index ce12d24757..4acd528df8 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/dto/BreakpointDto.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/dto/BreakpointDto.java @@ -12,6 +12,7 @@ package org.eclipse.che.ide.debug.dto; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.dto.shared.DTO; +import org.eclipse.che.ide.api.debug.Breakpoint; /** * {@link DTO} object to preserve breakpoints between user's sessions. @@ -25,9 +26,9 @@ public interface BreakpointDto { int getLineNumber(); - void setType(org.eclipse.che.ide.debug.Breakpoint.Type type); + void setType(Breakpoint.Type type); - org.eclipse.che.ide.debug.Breakpoint.Type getType(); + Breakpoint.Type getType(); void setMessage(String message); diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java index 9cc8272e16..a6446a9d14 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java @@ -30,6 +30,7 @@ import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.editor.EditorPartPresenter.EditorPartCloseHandler; import org.eclipse.che.ide.api.editor.EditorProvider; import org.eclipse.che.ide.api.editor.EditorRegistry; +import org.eclipse.che.ide.api.editor.OpenEditorCallbackImpl; import org.eclipse.che.ide.api.event.ActivePartChangedEvent; import org.eclipse.che.ide.api.event.ActivePartChangedHandler; import org.eclipse.che.ide.api.event.FileContentUpdateEvent; @@ -49,7 +50,7 @@ import org.eclipse.che.ide.api.parts.PropertyListener; import org.eclipse.che.ide.api.parts.WorkspaceAgent; import org.eclipse.che.ide.api.project.node.HasStorablePath; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.api.texteditor.HasReadOnlyProperty; +import org.eclipse.che.ide.api.editor.texteditor.HasReadOnlyProperty; import org.eclipse.che.ide.project.event.ResourceNodeDeletedEvent; import org.eclipse.che.ide.project.event.ResourceNodeRenamedEvent; import org.eclipse.che.ide.project.node.FileReferenceNode; @@ -307,7 +308,7 @@ public class EditorAgentImpl implements EditorAgent { /** {@inheritDoc} */ @Override public void openEditor(@NotNull final VirtualFile file) { - doOpen(file, null); + doOpen(file, new OpenEditorCallbackImpl()); } /** {@inheritDoc} */ diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorGinModule.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorGinModule.java new file mode 100644 index 0000000000..ee6b47b460 --- /dev/null +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorGinModule.java @@ -0,0 +1,91 @@ +/******************************************************************************* + * 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.editor; + +import com.google.gwt.inject.client.AbstractGinModule; +import com.google.gwt.inject.client.assistedinject.GinFactoryModuleBuilder; +import com.google.inject.Singleton; +import com.google.inject.name.Names; + +import org.eclipse.che.ide.api.editor.EditorProvider; +import org.eclipse.che.ide.api.extension.ExtensionGinModule; +import org.eclipse.che.ide.api.debug.BreakpointManager; +import org.eclipse.che.ide.api.debug.BreakpointRenderer; +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; +import org.eclipse.che.ide.debug.BreakpointManagerImpl; +import org.eclipse.che.ide.api.debug.BreakpointRendererFactory; +import org.eclipse.che.ide.debug.BreakpointRendererImpl; +import org.eclipse.che.ide.api.editor.defaulteditor.DefaultTextEditorProvider; +import org.eclipse.che.ide.api.editor.document.DocumentStorage; +import org.eclipse.che.ide.api.editor.filetype.FileTypeIdentifier; +import org.eclipse.che.ide.api.editor.filetype.MultipleMethodFileIdentifier; +import org.eclipse.che.ide.editor.texteditor.infopanel.InfoPanel; +import org.eclipse.che.ide.api.editor.partition.DocumentPositionMap; +import org.eclipse.che.ide.api.editor.partition.DocumentPositionMapImpl; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistAssistant; +import org.eclipse.che.ide.editor.quickfix.QuickAssistAssistantImpl; +import org.eclipse.che.ide.editor.quickfix.QuickAssistWidgetFactory; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistantFactory; +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.reconciler.ReconcilerWithAutoSave; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPartView; +import org.eclipse.che.ide.editor.texteditor.TextEditorPartViewImpl; + +@ExtensionGinModule +public class EditorGinModule extends AbstractGinModule { + + @Override + protected void configure() { + // the text editor view + bind(TextEditorPartView.class).to(TextEditorPartViewImpl.class); + + // Bind the file type identifier + bind(FileTypeIdentifier.class).to(MultipleMethodFileIdentifier.class); + + // bind the document storage + bind(DocumentStorage.class); + + // bind the default editor + bind(EditorProvider.class).annotatedWith(Names.named("defaultEditor")).to(DefaultTextEditorProvider.class); + + // bind the info panel + bind(InfoPanel.class); + + // bind the document position model + bind(DocumentPositionMap.class).to(DocumentPositionMapImpl.class); + + // bind the reconciler + install(new GinFactoryModuleBuilder() + .implement(Reconciler.class, ReconcilerWithAutoSave.class) + .build(ReconcilerFactory.class)); + + // bind the code assistant and quick assistant + install(new GinFactoryModuleBuilder() + .implement(CodeAssistant.class, CodeAssistantImpl.class) + .build(CodeAssistantFactory.class)); + install(new GinFactoryModuleBuilder() + .implement(QuickAssistAssistant.class, QuickAssistAssistantImpl.class) + .build(QuickAssistantFactory.class)); + + // breakpoint renderer and manager + install(new GinFactoryModuleBuilder() + .implement(BreakpointRenderer.class, BreakpointRendererImpl.class) + .build(BreakpointRendererFactory.class)); + bind(BreakpointManager.class).to(BreakpointManagerImpl.class).in(Singleton.class); + + // bind the quick assist widget factory + install(new GinFactoryModuleBuilder() + .build(QuickAssistWidgetFactory.class)); + } +} diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorInputImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorInputImpl.java index 24f24bfd0f..67769d02ca 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorInputImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorInputImpl.java @@ -13,8 +13,6 @@ package org.eclipse.che.ide.editor; import org.eclipse.che.ide.api.editor.EditorInput; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import com.google.gwt.resources.client.ImageResource; - import org.vectomatic.dom.svg.ui.SVGResource; /** @author Vitaly Parfonov */ @@ -27,11 +25,6 @@ final class EditorInputImpl implements EditorInput { this.file = file; } - @Override - public String getContentDescription() { - return fileType.getContentDescription(); - } - @Override public String getToolTipText() { return null; @@ -42,14 +35,9 @@ final class EditorInputImpl implements EditorInput { return file.getDisplayName(); } - @Override - public ImageResource getImageResource() { - return fileType.getImage(); - } - @Override public SVGResource getSVGResource() { - return fileType.getSVGImage(); + return fileType.getImage(); } @Override diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorRegistryImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorRegistryImpl.java index 405d8b8ad6..27a89c6698 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorRegistryImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorRegistryImpl.java @@ -10,12 +10,13 @@ *******************************************************************************/ package org.eclipse.che.ide.editor; +import com.google.inject.Inject; +import com.google.inject.name.Named; + import org.eclipse.che.ide.api.editor.EditorProvider; import org.eclipse.che.ide.api.editor.EditorRegistry; import org.eclipse.che.ide.api.extension.SDK; import org.eclipse.che.ide.api.filetypes.FileType; -import com.google.inject.Inject; -import com.google.inject.name.Named; import javax.validation.constraints.NotNull; import java.util.ArrayList; @@ -33,7 +34,7 @@ import java.util.Map; @SDK(title = "ide.api.editorRegistry") public class EditorRegistryImpl implements EditorRegistry { - private Map> registry; + private Map> registry; private EditorProvider defaultProvider; @Inject @@ -48,10 +49,10 @@ public class EditorRegistryImpl implements EditorRegistry { /** {@inheritDoc} */ @Override public void register(@NotNull FileType fileType, @NotNull EditorProvider provider) { - if (!registry.containsKey(fileType.getId())) { - registry.put(fileType.getId(), new ArrayList()); + if (!registry.containsKey(fileType)) { + registry.put(fileType, new ArrayList()); } - registry.get(fileType.getId()).add(provider); + registry.get(fileType).add(provider); } @Override @@ -63,9 +64,8 @@ public class EditorRegistryImpl implements EditorRegistry { /** {@inheritDoc} */ @Override public EditorProvider getEditor(@NotNull FileType fileType) { - //todo add logic to receive default editor form user preferences - if (registry.containsKey(fileType.getId()) && !registry.get(fileType.getId()).isEmpty()) { - return registry.get(fileType.getId()).get(0); + if (registry.containsKey(fileType) && !registry.get(fileType).isEmpty()) { + return registry.get(fileType).get(0); } return defaultProvider; } @@ -73,8 +73,8 @@ public class EditorRegistryImpl implements EditorRegistry { @Override public List getAllEditorsForFileType(@NotNull FileType fileType) { List result = new ArrayList<>(); - if (registry.containsKey(fileType.getId())) { - result.addAll(registry.get(fileType.getId())); + if (registry.containsKey(fileType)) { + result.addAll(registry.get(fileType)); } return result; } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/AdditionalInformationWidget.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/codeassist/AdditionalInformationWidget.java similarity index 83% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/AdditionalInformationWidget.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/codeassist/AdditionalInformationWidget.java index 94d4128824..5582183aaa 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/codeassist/AdditionalInformationWidget.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/codeassist/AdditionalInformationWidget.java @@ -8,12 +8,12 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.codeassist; +package org.eclipse.che.ide.editor.codeassist; import elemental.dom.Element; -import org.eclipse.che.ide.jseditor.client.popup.PopupResources; -import org.eclipse.che.ide.jseditor.client.popup.PopupWidget; +import org.eclipse.che.ide.ui.popup.PopupResources; +import org.eclipse.che.ide.ui.popup.PopupWidget; public class AdditionalInformationWidget extends PopupWidget { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPrefLocalizationConstant.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPrefLocalizationConstant.java similarity index 87% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPrefLocalizationConstant.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPrefLocalizationConstant.java index c46f330dd9..07dd99ab3b 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPrefLocalizationConstant.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPrefLocalizationConstant.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference; +package org.eclipse.che.ide.editor.preferences; import com.google.gwt.i18n.client.Messages; @@ -30,7 +30,4 @@ public interface EditorPrefLocalizationConstant extends Messages { @DefaultMessage("Key Bindings:") String keybindingsLabel(); - - @DefaultMessage("Editor settings") - String editorSettingsSectionLabel(); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferencePresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferencePresenter.java similarity index 83% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferencePresenter.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferencePresenter.java index 3eb5552b75..13375fdda8 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferencePresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferencePresenter.java @@ -8,15 +8,15 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference; +package org.eclipse.che.ide.editor.preferences; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.ide.api.preferences.AbstractPreferencePagePresenter; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorPropertiesPresenter; -import org.eclipse.che.ide.jseditor.client.preference.keymaps.KeyMapsPreferencePresenter; +import org.eclipse.che.ide.editor.preferences.editorproperties.EditorPropertiesPresenter; +import org.eclipse.che.ide.editor.preferences.keymaps.KeyMapsPreferencePresenter; /** Preference page presenter for the editors. */ @Singleton @@ -31,13 +31,10 @@ public class EditorPreferencePresenter extends AbstractPreferencePagePresenter i @Inject public EditorPreferencePresenter(final EditorPreferenceView view, final EditorPrefLocalizationConstant constant, - final EditorPreferenceResource resource, final KeyMapsPreferencePresenter keymapsSection, final EditorPropertiesPresenter editorPropertiesSection) { - super(constant.editorTypeTitle(), - constant.editorTypeCategory(), - resource.editorPrefIconTemporary());// TODO use svg icon when the PreferencesPagePresenter allow it + super(constant.editorTypeTitle(), constant.editorTypeCategory()); this.view = view; this.keymapsSection = keymapsSection; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceSection.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceSection.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceSection.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceSection.java index 48b3f30c34..f523302c66 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceSection.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceSection.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference; +package org.eclipse.che.ide.editor.preferences; import org.eclipse.che.ide.api.mvp.Presenter; @@ -32,7 +32,7 @@ public interface EditorPreferenceSection extends Presenter { void refresh(); /** Interface for the parent presenter that owns the section. */ - public interface ParentPresenter { + interface ParentPresenter { /** Asks to trigger a dirty state action. */ void signalDirtyState(); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceView.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceView.java similarity index 93% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceView.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceView.java index e3bc4e9c84..79f3cbbc25 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceView.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceView.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference; +package org.eclipse.che.ide.editor.preferences; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.IsWidget; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceViewImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceViewImpl.java similarity index 83% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceViewImpl.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceViewImpl.java index 1dc5bc5e5b..a03f97dc73 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceViewImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceViewImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference; +package org.eclipse.che.ide.editor.preferences; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; @@ -17,14 +17,13 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.SimplePanel; - -import javax.inject.Inject; +import com.google.inject.Inject; /** Implementation of the {@link EditorPreferenceView}. */ public class EditorPreferenceViewImpl extends Composite implements EditorPreferenceView { /** The UI binder instance. */ - private static final EditorTypePreferenceViewImplUiBinder UIBINDER = GWT.create(EditorTypePreferenceViewImplUiBinder.class); + private static final EditorPreferenceViewImplUiBinder UIBINDER = GWT.create(EditorPreferenceViewImplUiBinder.class); @UiField SimplePanel keymapsSection; @@ -47,6 +46,6 @@ public class EditorPreferenceViewImpl extends Composite implements EditorPrefere } /** UI binder interface for the {@link EditorPreferenceViewImpl} component. */ - interface EditorTypePreferenceViewImplUiBinder extends UiBinder { + interface EditorPreferenceViewImplUiBinder extends UiBinder { } } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceViewImpl.ui.xml b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceViewImpl.ui.xml similarity index 100% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceViewImpl.ui.xml rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferenceViewImpl.ui.xml diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/inject/EditorPreferencesGinModule.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferencesGinModule.java similarity index 56% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/inject/EditorPreferencesGinModule.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferencesGinModule.java index 42855612a6..d12b334d86 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/inject/EditorPreferencesGinModule.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/EditorPreferencesGinModule.java @@ -8,8 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.inject; - +package org.eclipse.che.ide.editor.preferences; import com.google.gwt.inject.client.AbstractGinModule; import com.google.gwt.inject.client.assistedinject.GinFactoryModuleBuilder; @@ -17,21 +16,21 @@ import com.google.gwt.inject.client.multibindings.GinMultibinder; import org.eclipse.che.ide.api.extension.ExtensionGinModule; import org.eclipse.che.ide.api.preferences.PreferencePagePresenter; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferencePresenter; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferenceSection; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferenceView; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferenceViewImpl; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections.EditorPreferenceSectionFactory; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections.EditorPropertiesSection; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.propertiessection.EditorPropertiesSectionPresenter; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections.LanguageToolsPropertiesSection; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections.RulersPropertiesSection; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections.TabsPropertiesSection; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections.TypingPropertiesSection; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections.WhiteSpacesPropertiesSection; -import org.eclipse.che.ide.jseditor.client.preference.keymaps.KeyMapsPreferencePresenter; -import org.eclipse.che.ide.jseditor.client.preference.keymaps.KeymapsPreferenceView; -import org.eclipse.che.ide.jseditor.client.preference.keymaps.KeymapsPreferenceViewImpl; +import org.eclipse.che.ide.editor.preferences.EditorPreferencePresenter; +import org.eclipse.che.ide.editor.preferences.EditorPreferenceSection; +import org.eclipse.che.ide.editor.preferences.EditorPreferenceView; +import org.eclipse.che.ide.editor.preferences.EditorPreferenceViewImpl; +import org.eclipse.che.ide.editor.preferences.editorproperties.propertiessection.EditorPropertiesSectionPresenter; +import org.eclipse.che.ide.editor.preferences.editorproperties.sections.EditorPreferenceSectionFactory; +import org.eclipse.che.ide.editor.preferences.editorproperties.sections.EditorPropertiesSection; +import org.eclipse.che.ide.editor.preferences.editorproperties.sections.LanguageToolsPropertiesSection; +import org.eclipse.che.ide.editor.preferences.editorproperties.sections.RulersPropertiesSection; +import org.eclipse.che.ide.editor.preferences.editorproperties.sections.TabsPropertiesSection; +import org.eclipse.che.ide.editor.preferences.editorproperties.sections.TypingPropertiesSection; +import org.eclipse.che.ide.editor.preferences.editorproperties.sections.WhiteSpacesPropertiesSection; +import org.eclipse.che.ide.editor.preferences.keymaps.KeyMapsPreferencePresenter; +import org.eclipse.che.ide.editor.preferences.keymaps.KeymapsPreferenceView; +import org.eclipse.che.ide.editor.preferences.keymaps.KeymapsPreferenceViewImpl; /** Gin module for the editor preferences. */ @ExtensionGinModule @@ -50,7 +49,8 @@ public class EditorPreferencesGinModule extends AbstractGinModule { install(new GinFactoryModuleBuilder().implement(EditorPreferenceSection.class, EditorPropertiesSectionPresenter.class) .build(EditorPreferenceSectionFactory.class)); - final GinMultibinder editorPropertiesSectionBinder = GinMultibinder.newSetBinder(binder(), EditorPropertiesSection.class); + GinMultibinder editorPropertiesSectionBinder = GinMultibinder.newSetBinder(binder(), + EditorPropertiesSection.class); editorPropertiesSectionBinder.addBinding().to(TabsPropertiesSection.class); editorPropertiesSectionBinder.addBinding().to(LanguageToolsPropertiesSection.class); editorPropertiesSectionBinder.addBinding().to(TypingPropertiesSection.class); diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorProperties.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorProperties.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorProperties.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorProperties.java index 6ca21ea0d2..9d9fc01f37 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorProperties.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorProperties.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties; +package org.eclipse.che.ide.editor.preferences.editorproperties; import javax.validation.constraints.NotNull; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesManager.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesManager.java similarity index 77% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesManager.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesManager.java index 9d48bac3ba..02d36481fb 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesManager.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesManager.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties; +package org.eclipse.che.ide.editor.preferences.editorproperties; import com.google.gwt.json.client.JSONBoolean; import com.google.gwt.json.client.JSONNumber; @@ -19,30 +19,30 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.commons.annotation.Nullable; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; import org.eclipse.che.ide.api.preferences.PreferencesManager; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; import javax.validation.constraints.NotNull; import java.util.HashMap; import java.util.Map; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_COMPLETE_COMMENTS; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_ANGLE_BRACKETS; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_BRACES; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_PARENTHESES; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_QUOTATIONS; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_SQUARE_BRACKETS; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.EXPAND_TAB; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_ANNOTATION_RULER; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_CONTENT_ASSIST_AUTOMATICALLY; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_FOLDING_RULER; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_LINE_NUMBER_RULER; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_OCCURRENCES; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_OVERVIEW_RULER; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_WHITESPACES; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_ZOOM_RULER; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SMART_INDENTATION; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.TAB_SIZE; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_COMPLETE_COMMENTS; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_ANGLE_BRACKETS; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_BRACES; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_PARENTHESES; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_QUOTATIONS; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_SQUARE_BRACKETS; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.EXPAND_TAB; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_ANNOTATION_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_CONTENT_ASSIST_AUTOMATICALLY; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_FOLDING_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_LINE_NUMBER_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_OCCURRENCES; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_OVERVIEW_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_WHITESPACES; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_ZOOM_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SMART_INDENTATION; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.TAB_SIZE; /** * The class contains methods to simplify the work with editor properties. @@ -61,7 +61,7 @@ public class EditorPropertiesManager { private PreferencesManager preferencesManager; @Inject - public EditorPropertiesManager(JsEditorConstants locale, + public EditorPropertiesManager(EditorLocalizationConstants locale, PreferencesManager preferencesManager) { this.preferencesManager = preferencesManager; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesPresenter.java similarity index 89% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesPresenter.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesPresenter.java index f1c37133e3..d83c6ada7c 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesPresenter.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties; +package org.eclipse.che.ide.editor.preferences.editorproperties; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; @@ -17,9 +17,9 @@ import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; import org.eclipse.che.ide.api.event.EditorSettingsChangedEvent; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferenceSection; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections.EditorPreferenceSectionFactory; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections.EditorPropertiesSection; +import org.eclipse.che.ide.editor.preferences.EditorPreferenceSection; +import org.eclipse.che.ide.editor.preferences.editorproperties.sections.EditorPreferenceSectionFactory; +import org.eclipse.che.ide.editor.preferences.editorproperties.sections.EditorPropertiesSection; import java.util.HashSet; import java.util.Set; @@ -87,7 +87,7 @@ public class EditorPropertiesPresenter implements EditorPreferenceSection, WsAge } @Override - public void setParent(final ParentPresenter parent) { + public void setParent(final EditorPreferenceSection.ParentPresenter parent) { this.parentPresenter = parent; } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesView.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesView.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesView.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesView.java index 34419c7e89..4c7d66cd72 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesView.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesView.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties; +package org.eclipse.che.ide.editor.preferences.editorproperties; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.IsWidget; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesViewImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesViewImpl.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesViewImpl.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesViewImpl.java index 3a3d8c4eda..f1cbaf1ff2 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesViewImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesViewImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties; +package org.eclipse.che.ide.editor.preferences.editorproperties; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesViewImpl.ui.xml b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesViewImpl.ui.xml similarity index 88% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesViewImpl.ui.xml rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesViewImpl.ui.xml index b3c9fdab9d..93fe25d73f 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/EditorPropertiesViewImpl.ui.xml +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesViewImpl.ui.xml @@ -12,7 +12,6 @@ --> - @eval editorPreferenceCategoryBackgroundColor org.eclipse.che.ide.api.theme.Style.theme.editorPreferenceCategoryBackgroundColor(); diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionPresenter.java similarity index 85% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionPresenter.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionPresenter.java index 4bee54969b..da792d4703 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionPresenter.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.propertiessection; +package org.eclipse.che.ide.editor.preferences.editorproperties.propertiessection; import com.google.gwt.json.client.JSONValue; import com.google.gwt.user.client.ui.AcceptsOneWidget; @@ -17,8 +17,8 @@ import com.google.inject.assistedinject.AssistedInject; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.ide.api.event.EditorSettingsChangedEvent; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferenceSection; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorPropertiesManager; +import org.eclipse.che.ide.editor.preferences.EditorPreferenceSection; +import org.eclipse.che.ide.editor.preferences.editorproperties.EditorPropertiesManager; import java.util.List; import java.util.Map; @@ -30,11 +30,11 @@ import java.util.Map; */ public class EditorPropertiesSectionPresenter implements EditorPreferenceSection, EditorPropertiesSectionView.ActionDelegate { /** The preference page presenter. */ - private ParentPresenter parentPresenter; - private final EventBus eventBus; - private final EditorPropertiesSectionView view; - private final EditorPropertiesManager editorPropertiesManager; - private final List properties; + private EditorPreferenceSection.ParentPresenter parentPresenter; + private final EventBus eventBus; + private final EditorPropertiesSectionView view; + private final EditorPropertiesManager editorPropertiesManager; + private final List properties; @AssistedInject public EditorPropertiesSectionPresenter(@Assisted String title, diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionView.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionView.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionView.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionView.java index c0fa244e0a..c61c343cc9 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionView.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionView.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.propertiessection; +package org.eclipse.che.ide.editor.preferences.editorproperties.propertiessection; import com.google.gwt.json.client.JSONValue; import com.google.inject.ImplementedBy; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.java similarity index 90% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.java index 218e9de501..117affbba2 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.propertiessection; +package org.eclipse.che.ide.editor.preferences.editorproperties.propertiessection; import com.google.gwt.core.client.GWT; import com.google.gwt.json.client.JSONValue; @@ -21,9 +21,9 @@ import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import org.eclipse.che.commons.annotation.Nullable; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorPropertiesManager; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.property.EditorPropertyWidget; -import org.eclipse.che.ide.jseditor.client.preference.editorproperties.property.EditorPropertyWidgetFactory; +import org.eclipse.che.ide.editor.preferences.editorproperties.EditorPropertiesManager; +import org.eclipse.che.ide.editor.preferences.editorproperties.property.EditorPropertyWidget; +import org.eclipse.che.ide.editor.preferences.editorproperties.property.EditorPropertyWidgetFactory; import javax.validation.constraints.NotNull; import java.util.HashMap; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.ui.xml b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.ui.xml similarity index 91% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.ui.xml rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.ui.xml index 7db98530b0..9edbc69850 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.ui.xml +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/propertiessection/EditorPropertiesSectionViewImpl.ui.xml @@ -12,7 +12,6 @@ --> - @eval editorPreferenceCategoryBackgroundColor org.eclipse.che.ide.api.theme.Style.theme.editorPreferenceCategoryBackgroundColor(); diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorBooleanPropertyWidget.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorBooleanPropertyWidget.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorBooleanPropertyWidget.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorBooleanPropertyWidget.java index d69556dd59..1e65e1f57e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorBooleanPropertyWidget.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorBooleanPropertyWidget.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.property; +package org.eclipse.che.ide.editor.preferences.editorproperties.property; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorNumberPropertyWidget.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorNumberPropertyWidget.java similarity index 96% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorNumberPropertyWidget.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorNumberPropertyWidget.java index 2170e19260..a1a47e2a22 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorNumberPropertyWidget.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorNumberPropertyWidget.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.property; +package org.eclipse.che.ide.editor.preferences.editorproperties.property; import com.google.gwt.event.dom.client.KeyUpEvent; import com.google.gwt.event.dom.client.KeyUpHandler; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyBaseWidget.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyBaseWidget.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyBaseWidget.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyBaseWidget.java index 0d59958801..a6a0830ea6 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyBaseWidget.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyBaseWidget.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.property; +package org.eclipse.che.ide.editor.preferences.editorproperties.property; import com.google.gwt.core.client.GWT; import com.google.gwt.json.client.JSONValue; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyBaseWidget.ui.xml b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyBaseWidget.ui.xml similarity index 100% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyBaseWidget.ui.xml rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyBaseWidget.ui.xml diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyWidget.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyWidget.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyWidget.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyWidget.java index bf9d6d89d8..f52aaf98e9 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyWidget.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyWidget.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.property; +package org.eclipse.che.ide.editor.preferences.editorproperties.property; import com.google.gwt.json.client.JSONValue; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyWidgetFactory.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyWidgetFactory.java similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyWidgetFactory.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyWidgetFactory.java index 0d03b212db..f498539188 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorPropertyWidgetFactory.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorPropertyWidgetFactory.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.property; +package org.eclipse.che.ide.editor.preferences.editorproperties.property; import com.google.gwt.json.client.JSONValue; import com.google.inject.Singleton; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorStringPropertyWidget.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorStringPropertyWidget.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorStringPropertyWidget.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorStringPropertyWidget.java index 384b3e913b..0de8fa3374 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/property/EditorStringPropertyWidget.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/property/EditorStringPropertyWidget.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.property; +package org.eclipse.che.ide.editor.preferences.editorproperties.property; import com.google.gwt.event.dom.client.KeyUpEvent; import com.google.gwt.event.dom.client.KeyUpHandler; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/EditorPreferenceSectionFactory.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/EditorPreferenceSectionFactory.java similarity index 87% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/EditorPreferenceSectionFactory.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/EditorPreferenceSectionFactory.java index 361d737392..16f9ce6a45 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/EditorPreferenceSectionFactory.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/EditorPreferenceSectionFactory.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections; +package org.eclipse.che.ide.editor.preferences.editorproperties.sections; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferenceSection; +import org.eclipse.che.ide.editor.preferences.EditorPreferenceSection; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/EditorPropertiesSection.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/EditorPropertiesSection.java similarity index 91% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/EditorPropertiesSection.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/EditorPropertiesSection.java index ee86e19127..2c30092e20 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/EditorPropertiesSection.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/EditorPropertiesSection.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections; +package org.eclipse.che.ide.editor.preferences.editorproperties.sections; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/LanguageToolsPropertiesSection.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/LanguageToolsPropertiesSection.java similarity index 68% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/LanguageToolsPropertiesSection.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/LanguageToolsPropertiesSection.java index 7f52ce7211..1f8376821c 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/LanguageToolsPropertiesSection.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/LanguageToolsPropertiesSection.java @@ -8,18 +8,18 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections; +package org.eclipse.che.ide.editor.preferences.editorproperties.sections; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; import java.util.Arrays; import java.util.List; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_CONTENT_ASSIST_AUTOMATICALLY; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_OCCURRENCES; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_CONTENT_ASSIST_AUTOMATICALLY; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_OCCURRENCES; /** * The class provides info about 'Language tolls' editor's section. @@ -28,11 +28,11 @@ import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.Ed */ @Singleton public class LanguageToolsPropertiesSection implements EditorPropertiesSection { - private final List properties; - private final JsEditorConstants locale; + private final List properties; + private final EditorLocalizationConstants locale; @Inject - public LanguageToolsPropertiesSection(JsEditorConstants locale) { + public LanguageToolsPropertiesSection(EditorLocalizationConstants locale) { this.locale = locale; properties = Arrays.asList(SHOW_OCCURRENCES.toString(), SHOW_CONTENT_ASSIST_AUTOMATICALLY.toString()); diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/RulersPropertiesSection.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/RulersPropertiesSection.java similarity index 61% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/RulersPropertiesSection.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/RulersPropertiesSection.java index e95fc6dfe6..b16caae820 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/RulersPropertiesSection.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/RulersPropertiesSection.java @@ -8,21 +8,21 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections; +package org.eclipse.che.ide.editor.preferences.editorproperties.sections; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; import java.util.Arrays; import java.util.List; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_ANNOTATION_RULER; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_FOLDING_RULER; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_LINE_NUMBER_RULER; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_OVERVIEW_RULER; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_ZOOM_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_ANNOTATION_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_FOLDING_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_LINE_NUMBER_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_OVERVIEW_RULER; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_ZOOM_RULER; /** * The class provides info about 'Rulers' editor's section. @@ -31,11 +31,11 @@ import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.Ed */ @Singleton public class RulersPropertiesSection implements EditorPropertiesSection { - private final List properties; - private final JsEditorConstants locale; + private final List properties; + private final EditorLocalizationConstants locale; @Inject - public RulersPropertiesSection(JsEditorConstants locale) { + public RulersPropertiesSection(EditorLocalizationConstants locale) { this.locale = locale; properties = Arrays.asList(SHOW_ANNOTATION_RULER.toString(), SHOW_LINE_NUMBER_RULER.toString(), diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/TabsPropertiesSection.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/TabsPropertiesSection.java similarity index 69% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/TabsPropertiesSection.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/TabsPropertiesSection.java index 07a530550a..99037d7a9a 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/TabsPropertiesSection.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/TabsPropertiesSection.java @@ -8,18 +8,18 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections; +package org.eclipse.che.ide.editor.preferences.editorproperties.sections; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; import java.util.Arrays; import java.util.List; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.EXPAND_TAB; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.TAB_SIZE; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.EXPAND_TAB; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.TAB_SIZE; /** * The class provides info about 'Tabs' editor's section. @@ -28,11 +28,11 @@ import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.Ed */ @Singleton public class TabsPropertiesSection implements EditorPropertiesSection { - private final List properties; - private final JsEditorConstants locale; + private final List properties; + private final EditorLocalizationConstants locale; @Inject - public TabsPropertiesSection(JsEditorConstants locale) { + public TabsPropertiesSection(EditorLocalizationConstants locale) { this.locale = locale; properties = Arrays.asList(TAB_SIZE.toString(), EXPAND_TAB.toString()); diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/TypingPropertiesSection.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/TypingPropertiesSection.java similarity index 58% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/TypingPropertiesSection.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/TypingPropertiesSection.java index aebb941a91..584d5e59d6 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/TypingPropertiesSection.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/TypingPropertiesSection.java @@ -8,23 +8,23 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections; +package org.eclipse.che.ide.editor.preferences.editorproperties.sections; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; import java.util.Arrays; import java.util.List; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_COMPLETE_COMMENTS; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_ANGLE_BRACKETS; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_BRACES; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_PARENTHESES; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_QUOTATIONS; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.AUTO_PAIR_SQUARE_BRACKETS; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SMART_INDENTATION; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_COMPLETE_COMMENTS; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_ANGLE_BRACKETS; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_BRACES; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_PARENTHESES; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_QUOTATIONS; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.AUTO_PAIR_SQUARE_BRACKETS; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SMART_INDENTATION; /** * The class provides info about 'Typing' editor's section. @@ -33,11 +33,11 @@ import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.Ed */ @Singleton public class TypingPropertiesSection implements EditorPropertiesSection { - private final List properties; - private final JsEditorConstants locale; + private final List properties; + private final EditorLocalizationConstants locale; @Inject - public TypingPropertiesSection(JsEditorConstants locale) { + public TypingPropertiesSection(EditorLocalizationConstants locale) { this.locale = locale; properties = Arrays.asList(AUTO_PAIR_PARENTHESES.toString(), AUTO_PAIR_BRACES.toString(), diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/WhiteSpacesPropertiesSection.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/WhiteSpacesPropertiesSection.java similarity index 65% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/WhiteSpacesPropertiesSection.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/WhiteSpacesPropertiesSection.java index 07d106ade7..6421e3cbd8 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/editorproperties/sections/WhiteSpacesPropertiesSection.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/sections/WhiteSpacesPropertiesSection.java @@ -8,17 +8,17 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.editorproperties.sections; +package org.eclipse.che.ide.editor.preferences.editorproperties.sections; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; -import java.util.Arrays; import java.util.List; -import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.EditorProperties.SHOW_WHITESPACES; +import static java.util.Collections.singletonList; +import static org.eclipse.che.ide.editor.preferences.editorproperties.EditorProperties.SHOW_WHITESPACES; /** * The class provides info about 'White spaces' editor's section. @@ -27,13 +27,13 @@ import static org.eclipse.che.ide.jseditor.client.preference.editorproperties.Ed */ @Singleton public class WhiteSpacesPropertiesSection implements EditorPropertiesSection { - private final List properties; - private final JsEditorConstants locale; + private final List properties; + private final EditorLocalizationConstants locale; @Inject - public WhiteSpacesPropertiesSection(JsEditorConstants locale) { + public WhiteSpacesPropertiesSection(EditorLocalizationConstants locale) { this.locale = locale; - properties = Arrays.asList(SHOW_WHITESPACES.toString()); + properties = singletonList(SHOW_WHITESPACES.toString()); } @Override diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeyMapsPreferencePresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeyMapsPreferencePresenter.java new file mode 100644 index 0000000000..87684153f2 --- /dev/null +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeyMapsPreferencePresenter.java @@ -0,0 +1,106 @@ +/******************************************************************************* + * 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.editor.preferences.keymaps; + +import com.google.gwt.json.client.JSONString; +import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.inject.Inject; +import com.google.web.bindery.event.shared.EventBus; + +import org.eclipse.che.ide.api.preferences.PreferencesManager; +import org.eclipse.che.ide.api.editor.keymap.Keymap; +import org.eclipse.che.ide.api.editor.keymap.KeymapChangeEvent; +import org.eclipse.che.ide.editor.preferences.EditorPreferenceSection; + +/** Presenter for the keymap preference selection section. */ +public class KeyMapsPreferencePresenter implements EditorPreferenceSection, KeymapsPreferenceView.ActionDelegate { + + /** The editor preference main property name. */ + public static final String KEYMAP_PREF_KEY = "keymap"; + + private final KeymapsPreferenceView view; + private final EventBus eventBus; + private final PreferencesManager preferencesManager; + + /** Has any of the keymap preferences been changed ? */ + private boolean dirty = false; + + /** The preference page presenter. */ + private ParentPresenter parentPresenter; + + private Keymap selectedKeymap; + + @Inject + public KeyMapsPreferencePresenter(final KeymapsPreferenceView view, + final EventBus eventBus, + final PreferencesManager preferencesManager) { + this.view = view; + this.eventBus = eventBus; + this.preferencesManager = preferencesManager; + + this.view.setDelegate(this); + } + + @Override + public void storeChanges() { + JSONString jsonString = new JSONString(selectedKeymap.getKey()); + preferencesManager.setValue(KEYMAP_PREF_KEY, jsonString.stringValue()); + + eventBus.fireEvent(new KeymapChangeEvent(selectedKeymap.getKey())); + + dirty = false; + } + + @Override + public void refresh() { + readPreference(); + } + + protected void readPreference() { + final String keymapKey = preferencesManager.getValue(KEYMAP_PREF_KEY); + Keymap keymap = null; + if (keymapKey != null) { + keymap = Keymap.fromKey(keymapKey); + } else { + for (Keymap km : Keymap.getInstances()) { + if (km.getKey().contains("default")) { + keymap = km; + break; + } + } + } + view.setKeyBindings(Keymap.getInstances(), keymap); + } + + @Override + public boolean isDirty() { + return dirty; + } + + @Override + public void go(final AcceptsOneWidget container) { + readPreference(); + container.setWidget(view); + } + + @Override + public void setParent(final ParentPresenter parent) { + this.parentPresenter = parent; + } + + @Override + public void onKeyBindingSelected(Keymap keymap) { + selectedKeymap = keymap; + + dirty = true; + parentPresenter.signalDirtyState(); + } +} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceView.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceView.java similarity index 51% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceView.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceView.java index 28106c4926..8ed8198627 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceView.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceView.java @@ -8,38 +8,27 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.preference.keymaps; +package org.eclipse.che.ide.editor.preferences.keymaps; import org.eclipse.che.ide.api.mvp.View; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import org.eclipse.che.ide.jseditor.client.keymap.KeymapValuesHolder; +import org.eclipse.che.ide.api.editor.keymap.Keymap; + +import java.util.List; /** View interface for the preference page for the editor keymap selection. */ public interface KeymapsPreferenceView extends View { - /** - * Sets the holder for selected keymap values. - * - * @param valuesHolder holder for keymaps - */ - void setKeymapValuesHolder(KeymapValuesHolder valuesHolders); - - /** - * Refreshes the view. - */ - void refresh(); + void setKeyBindings(List availableKeyBindings, Keymap currentKeyBinding); /** Action delegate for the keymap preference view. */ - public interface ActionDelegate { + interface ActionDelegate { /** - * Action triggered when an keymap is selected for an editor type. + * Action triggered when an keymap is selected. * - * @param editorType the editor type - * @param keymap the new keymap + * @param keymap + * the new keymap */ - void editorKeymapChanged(EditorType editorType, Keymap keymap); + void onKeyBindingSelected(Keymap keymap); } - } diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceViewImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceViewImpl.java new file mode 100644 index 0000000000..3aac944ae3 --- /dev/null +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceViewImpl.java @@ -0,0 +1,77 @@ +/******************************************************************************* + * 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.editor.preferences.keymaps; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ChangeEvent; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.inject.Inject; + +import org.eclipse.che.ide.api.editor.keymap.Keymap; +import org.eclipse.che.ide.editor.preferences.EditorPrefLocalizationConstant; +import org.eclipse.che.ide.ui.listbox.CustomListBox; + +import java.util.List; + +/** + * Implementation of the {@link KeymapsPreferenceView}. + */ +public class KeymapsPreferenceViewImpl extends Composite implements KeymapsPreferenceView { + + /** UI binder interface for the {@link KeymapsPreferenceViewImpl} component. */ + interface KeymapsPreferenceViewImplUiBinder extends UiBinder { + } + + /** The UI binder instance. */ + private static final KeymapsPreferenceViewImplUiBinder UIBINDER = GWT.create(KeymapsPreferenceViewImplUiBinder.class); + + private ActionDelegate delegate; + + @UiField(provided = true) + EditorPrefLocalizationConstant constants; + + @UiField + CustomListBox keyBindingSelection; + + @Inject + public KeymapsPreferenceViewImpl(final EditorPrefLocalizationConstant constants) { + this.constants = constants; + + initWidget(UIBINDER.createAndBindUi(this)); + } + + @Override + public void setDelegate(final ActionDelegate delegate) { + this.delegate = delegate; + } + + @Override + public void setKeyBindings(List availableKeyBindings, Keymap currentKeyBinding) { + keyBindingSelection.clear(); + + for (Keymap keymap : availableKeyBindings) { + keyBindingSelection.addItem(keymap.getDisplay(), keymap.getKey()); + if (currentKeyBinding != null && keymap.getKey().equals(currentKeyBinding.getKey())) { + keyBindingSelection.setSelectedIndex(availableKeyBindings.indexOf(keymap)); + } + } + } + + @UiHandler("keyBindingSelection") + void handleSelectionChanged(ChangeEvent event) { + final String value = keyBindingSelection.getValue(keyBindingSelection.getSelectedIndex()); + delegate.onKeyBindingSelected(Keymap.fromKey(value)); + } +} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceViewImpl.ui.xml b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceViewImpl.ui.xml similarity index 80% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceViewImpl.ui.xml rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceViewImpl.ui.xml index f1ef2ec80a..4b9e3adb34 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceViewImpl.ui.xml +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/keymaps/KeymapsPreferenceViewImpl.ui.xml @@ -12,10 +12,9 @@ --> + xmlns:che='urn:import:org.eclipse.che.ide.ui.listbox'> - + @eval editorPreferenceCategoryBackgroundColor org.eclipse.che.ide.api.theme.Style.theme.editorPreferenceCategoryBackgroundColor(); @@ -45,7 +44,7 @@ - + diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistAssistantImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/quickfix/QuickAssistAssistantImpl.java similarity index 84% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistAssistantImpl.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/quickfix/QuickAssistAssistantImpl.java index 080114c781..07c36c7391 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistAssistantImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/quickfix/QuickAssistAssistantImpl.java @@ -8,19 +8,22 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.quickfix; +package org.eclipse.che.ide.editor.quickfix; import elemental.dom.Element; import elemental.html.ClientRect; +import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistCallback; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistCallback; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistAssistant; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistInvocationContext; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistProcessor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; -import javax.inject.Inject; import java.util.List; /** Implementation for {@link QuickAssistAssistant}. */ diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistWidget.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/quickfix/QuickAssistWidget.java similarity index 89% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistWidget.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/quickfix/QuickAssistWidget.java index 7d9c4c453e..8bb3bf0263 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistWidget.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/quickfix/QuickAssistWidget.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.quickfix; +package org.eclipse.che.ide.editor.quickfix; import elemental.dom.Element; import elemental.dom.Node; @@ -20,14 +20,14 @@ import elemental.html.SpanElement; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; -import org.eclipse.che.ide.jseditor.client.codeassist.Completion; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; -import org.eclipse.che.ide.jseditor.client.popup.PopupResources; -import org.eclipse.che.ide.jseditor.client.popup.PopupWidget; -import org.eclipse.che.ide.jseditor.client.text.LinearRange; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.codeassist.Completion; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal; +import org.eclipse.che.ide.api.editor.text.LinearRange; +import org.eclipse.che.ide.api.editor.texteditor.HandlesUndoRedo; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.UndoableEditor; +import org.eclipse.che.ide.ui.popup.PopupResources; +import org.eclipse.che.ide.ui.popup.PopupWidget; import org.eclipse.che.ide.util.dom.Elements; import org.eclipse.che.ide.util.loging.Log; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistWidgetFactory.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/quickfix/QuickAssistWidgetFactory.java similarity index 83% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistWidgetFactory.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/quickfix/QuickAssistWidgetFactory.java index 5421e84483..ef0b0f8db4 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/quickfix/QuickAssistWidgetFactory.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/quickfix/QuickAssistWidgetFactory.java @@ -8,16 +8,16 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.quickfix; +package org.eclipse.che.ide.editor.quickfix; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; /** Factory for {@link QuickAssistWidget} instances. */ public interface QuickAssistWidgetFactory { /** * Create a {@link QuickAssistWidget}. - * @param textEditor the editor + * @param editor the editor * @return the new widget */ QuickAssistWidget createWidget(TextEditor editor); diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartViewImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/TextEditorPartViewImpl.java similarity index 78% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartViewImpl.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/TextEditorPartViewImpl.java index b1e8ad7a61..25d3975537 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartViewImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/TextEditorPartViewImpl.java @@ -8,8 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.texteditor; - +package org.eclipse.che.ide.editor.texteditor; import elemental.dom.Element; @@ -24,26 +23,26 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; -import org.eclipse.che.ide.jseditor.client.codeassist.AdditionalInfoCallback; -import org.eclipse.che.ide.jseditor.client.codeassist.AdditionalInformationWidget; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionsSource; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.events.CursorActivityEvent; -import org.eclipse.che.ide.jseditor.client.events.CursorActivityHandler; -import org.eclipse.che.ide.jseditor.client.infopanel.InfoPanel; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import org.eclipse.che.ide.jseditor.client.popup.PopupResources; -import org.eclipse.che.ide.jseditor.client.text.TextPosition; - -import javax.inject.Inject; +import org.eclipse.che.ide.api.editor.codeassist.AdditionalInfoCallback; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidget; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPartView; +import org.eclipse.che.ide.editor.codeassist.AdditionalInformationWidget; +import org.eclipse.che.ide.api.editor.codeassist.CompletionsSource; +import org.eclipse.che.ide.api.editor.events.CursorActivityEvent; +import org.eclipse.che.ide.api.editor.events.CursorActivityHandler; +import org.eclipse.che.ide.api.editor.keymap.Keymap; +import org.eclipse.che.ide.editor.texteditor.infopanel.InfoPanel; +import org.eclipse.che.ide.ui.popup.PopupResources; +import org.eclipse.che.ide.api.editor.text.TextPosition; /** * Implementation of the View part of the editors. * * @author "Mickaël Leduque" */ -public class EmbeddedTextEditorPartViewImpl extends Composite implements EmbeddedTextEditorPartView { +public class TextEditorPartViewImpl extends Composite implements TextEditorPartView { /** The UI binder for the component. */ private final static EditorViewUiBinder uibinder = GWT.create(EditorViewUiBinder.class); @@ -63,12 +62,11 @@ public class EmbeddedTextEditorPartViewImpl extends Composite implements Embedde private PopupResources popupResources; @Inject - public EmbeddedTextEditorPartViewImpl(final InfoPanel infoPanel) { + public TextEditorPartViewImpl(final InfoPanel infoPanel) { this.infoPanel = infoPanel; final HTMLPanel panel = uibinder.createAndBindUi(this); initWidget(panel); - } @Override @@ -146,9 +144,9 @@ public class EmbeddedTextEditorPartViewImpl extends Composite implements Embedde } @Override - public void initInfoPanel(final String mode, final EditorType editorType, final Keymap keymap, + public void initInfoPanel(final String mode, final Keymap keymap, final int lineCount, final int tabSize) { - this.infoPanel.createDefaultState(mode, editorType, keymap, lineCount, tabSize); + this.infoPanel.createDefaultState(mode, lineCount, tabSize); } @Override @@ -157,8 +155,7 @@ public class EmbeddedTextEditorPartViewImpl extends Composite implements Embedde } @Override - public void updateInfoPanelUnfocused(final int linecount) { -// this.infoPanel.displayLineCount(linecount); + public void updateInfoPanelUnfocused(final int lineCount) { } @Override @@ -177,6 +174,6 @@ public class EmbeddedTextEditorPartViewImpl extends Composite implements Embedde * * @author "Mickaël Leduque" */ - interface EditorViewUiBinder extends UiBinder { + interface EditorViewUiBinder extends UiBinder { } } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartViewImpl.ui.xml b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/TextEditorPartViewImpl.ui.xml similarity index 94% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartViewImpl.ui.xml rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/TextEditorPartViewImpl.ui.xml index 76ba3eca63..a54c62aeb6 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPartViewImpl.ui.xml +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/TextEditorPartViewImpl.ui.xml @@ -15,7 +15,7 @@ + xmlns:my="urn:import:org.eclipse.che.ide.editor.texteditor.infopanel"> .editorZone-layout { display: flex; @@ -53,4 +53,4 @@ - \ No newline at end of file + diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/infopanel/InfoPanel.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/infopanel/InfoPanel.java similarity index 85% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/infopanel/InfoPanel.java rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/infopanel/InfoPanel.java index 22bb5bdc47..0408d6ea22 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/infopanel/InfoPanel.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/infopanel/InfoPanel.java @@ -8,20 +8,17 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.infopanel; +package org.eclipse.che.ide.editor.texteditor.infopanel; -import javax.inject.Inject; - -import com.google.gwt.user.client.ui.FlowPanel; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import org.eclipse.che.ide.jseditor.client.text.TextPosition; import com.google.gwt.core.shared.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTMLPanel; -import com.google.web.bindery.event.shared.EventBus; +import com.google.inject.Inject; + +import org.eclipse.che.ide.api.editor.text.TextPosition; import java.util.HashMap; import java.util.Map; @@ -71,7 +68,7 @@ public class InfoPanel extends Composite { HTMLPanel encoding; @Inject - public InfoPanel(final EventBus eventBus) { + public InfoPanel() { initWidget(UIBINDER.createAndBindUi(this)); } @@ -82,10 +79,7 @@ public class InfoPanel extends Composite { * @param numberOfLines the file number of lines * @param tabSize the space-equivalent width of a tabulation character */ - public void createDefaultState(final String fileContentDescription, - final EditorType editorType, - final Keymap keymap, - final int numberOfLines, final int tabSize) { + public void createDefaultState(final String fileContentDescription, final int numberOfLines, final int tabSize) { setFileType(fileContentDescription); } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/infopanel/InfoPanel.ui.xml b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/infopanel/InfoPanel.ui.xml similarity index 100% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/infopanel/InfoPanel.ui.xml rename to core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/texteditor/infopanel/InfoPanel.ui.xml diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/filetypes/FileTypeModule.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/filetypes/FileTypeModule.java index 07faf90e87..d8f2fa30b3 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/filetypes/FileTypeModule.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/filetypes/FileTypeModule.java @@ -15,7 +15,6 @@ import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.name.Named; -import org.eclipse.che.ide.MimeType; import org.eclipse.che.ide.Resources; import org.eclipse.che.ide.api.extension.ExtensionGinModule; import org.eclipse.che.ide.api.filetypes.FileType; @@ -27,90 +26,89 @@ import org.eclipse.che.ide.api.filetypes.FileType; public class FileTypeModule extends AbstractGinModule { @Override protected void configure() { - } @Provides @Singleton @Named("XMLFileType") protected FileType provideXMLFile(Resources resources) { - return new FileType("XML file", resources.xmlFile(), MimeType.TEXT_XML, "xml"); + return new FileType(resources.xmlFile(), "xml"); } @Provides @Singleton @Named("TXTFileType") protected FileType provideTXTFile(Resources resources) { - return new FileType("TXT File", resources.defaultFile(), MimeType.TEXT_PLAIN, "txt"); + return new FileType(resources.defaultFile(), "txt"); } @Provides @Singleton @Named("JsonFileType") protected FileType provideJsonFile(Resources resources) { - return new FileType("Json file", resources.jsonFile(), MimeType.APPLICATION_JSON, "json"); + return new FileType(resources.jsonFile(), "json"); } @Provides @Singleton @Named("MDFileType") protected FileType provideMDFile(Resources resources) { - return new FileType("MD File", resources.mdFile(), MimeType.TEXT_MARKDOWN, "md"); + return new FileType(resources.mdFile(), "md"); } @Provides @Singleton @Named("PNGFileType") protected FileType providePNGFile(Resources resources) { - return new FileType("PNG Image", resources.defaultImage(), MimeType.IMAGE_PNG, "png"); + return new FileType(resources.defaultImage(), "png"); } @Provides @Singleton @Named("BMPFileType") protected FileType provideBMPFile(Resources resources) { - return new FileType("Bitmap Image", resources.defaultImage(), MimeType.IMAGE_BMP, "bmp"); + return new FileType(resources.defaultImage(), "bmp"); } @Provides @Singleton @Named("GIFFileType") protected FileType provideGIFFile(Resources resources) { - return new FileType("GIF Image", resources.defaultImage(), MimeType.IMAGE_GIF, "gif"); + return new FileType(resources.defaultImage(), "gif"); } @Provides @Singleton @Named("ICOFileType") protected FileType provideICOFile(Resources resources) { - return new FileType("ICO Image", resources.defaultImage(), MimeType.IMAGE_X_ICON, "ico"); + return new FileType(resources.defaultImage(), "ico"); } @Provides @Singleton @Named("SVGFileType") protected FileType provideSVGFile(Resources resources) { - return new FileType("SVG Image", resources.defaultImage(), MimeType.IMAGE_SVG_XML, "svg"); + return new FileType(resources.defaultImage(), "svg"); } @Provides @Singleton @Named("JPEFileType") protected FileType provideJPEFile(Resources resources) { - return new FileType("JPEG Image", resources.defaultImage(), MimeType.IMAGE_JPEG, "jpe"); + return new FileType(resources.defaultImage(), "jpe"); } @Provides @Singleton @Named("JPEGFileType") protected FileType provideJPEGFile(Resources resources) { - return new FileType("JPEG Image", resources.defaultImage(), MimeType.IMAGE_JPEG, "jpeg"); + return new FileType(resources.defaultImage(), "jpeg"); } @Provides @Singleton @Named("JPGFileType") protected FileType provideJPGFile(Resources resources) { - return new FileType("JPEG Image", resources.defaultImage(), MimeType.IMAGE_JPEG, "jpg"); + return new FileType(resources.defaultImage(), "jpg"); } } diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/filetypes/FileTypeRegistryImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/filetypes/FileTypeRegistryImpl.java index d0d5f2cdf4..ade79d8f52 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/filetypes/FileTypeRegistryImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/filetypes/FileTypeRegistryImpl.java @@ -71,19 +71,6 @@ public class FileTypeRegistryImpl implements FileTypeRegistry { return unknownFileType; } - @Override - public FileType getFileTypeByMimeType(String mimeType) { - if (!Strings.isNullOrEmpty(mimeType)) { - for (FileType type : fileTypes) { - if (type.getMimeTypes() != null && type.getMimeTypes().contains(mimeType)) { - return type; - } - } - } - - return unknownFileType; - } - @Override public FileType getFileTypeByNamePattern(String name) { if (!Strings.isNullOrEmpty(name)) { diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogPresenter.java index e4f40bac31..9fda112fee 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogPresenter.java @@ -23,8 +23,8 @@ import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.keybinding.KeyBindingAgent; import org.eclipse.che.ide.collections.js.JsoArray; -import org.eclipse.che.ide.hotkeys.HasHotKeyItems; -import org.eclipse.che.ide.hotkeys.HotKeyItem; +import org.eclipse.che.ide.api.hotkeys.HasHotKeyItems; +import org.eclipse.che.ide.api.hotkeys.HotKeyItem; import org.eclipse.che.ide.util.StringUtils; import org.eclipse.che.ide.util.input.CharCodeWithModifiers; import org.eclipse.che.ide.util.input.KeyMapUtil; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogView.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogView.java index d533012f79..ae7f180fc4 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogView.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogView.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.hotkeys.dialog; import org.eclipse.che.ide.api.mvp.View; -import org.eclipse.che.ide.hotkeys.HotKeyItem; +import org.eclipse.che.ide.api.hotkeys.HotKeyItem; import java.util.List; import java.util.Map; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogViewImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogViewImpl.java index 2167933569..c059af8fd2 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogViewImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/hotkeys/dialog/HotKeysDialogViewImpl.java @@ -27,7 +27,7 @@ import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import org.eclipse.che.ide.CoreLocalizationConstant; -import org.eclipse.che.ide.hotkeys.HotKeyItem; +import org.eclipse.che.ide.api.hotkeys.HotKeyItem; import org.eclipse.che.ide.hotkeys.HotKeyResources; import org.eclipse.che.ide.ui.list.CategoriesList; import org.eclipse.che.ide.ui.list.Category; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewer.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewer.java index 13dd19d2ec..e72268742f 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewer.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewer.java @@ -30,9 +30,9 @@ import org.eclipse.che.ide.api.editor.EditorInput; import org.eclipse.che.ide.api.event.FileEvent; import org.eclipse.che.ide.api.event.FileEventHandler; import org.eclipse.che.ide.api.parts.WorkspaceAgent; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.vectomatic.dom.svg.ui.SVGResource; import javax.validation.constraints.NotNull; @@ -95,7 +95,7 @@ public class ImageViewer extends AbstractEditorPresenter implements FileEventHan /** {@inheritDoc} */ @Override public ImageResource getTitleImage() { - return input.getImageResource(); + return null; } /** {@inheritDoc} */ diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewerProvider.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewerProvider.java index 9d0c007860..29041f7755 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewerProvider.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/imageviewer/ImageViewerProvider.java @@ -39,7 +39,6 @@ public class ImageViewerProvider implements EditorProvider { return "Codenvy Image Viewer"; } - /** {@inheritDoc} */ @Override public EditorPartPresenter getEditor() { return editorProvider.get(); diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/AbstractNewResourceAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/AbstractNewResourceAction.java index 587cc2f7b5..daaf700b8b 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/AbstractNewResourceAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/AbstractNewResourceAction.java @@ -24,22 +24,21 @@ import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; import org.eclipse.che.ide.api.action.Action; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.app.AppContext; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.InputDialog; +import org.eclipse.che.ide.api.dialogs.InputValidator; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.project.node.HasStorablePath; import org.eclipse.che.ide.api.project.node.Node; -import org.eclipse.che.ide.api.selection.Selection; import org.eclipse.che.ide.json.JsonHelper; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.FileReferenceNode; import org.eclipse.che.ide.project.node.ResourceBasedNode; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.InputCallback; -import org.eclipse.che.ide.ui.dialogs.input.InputDialog; -import org.eclipse.che.ide.ui.dialogs.input.InputValidator; import org.eclipse.che.ide.upload.BasicUploadPresenter; import org.eclipse.che.ide.util.NameUtils; import org.eclipse.che.ide.websocket.WebSocketException; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/NewFolderAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/NewFolderAction.java index 09ff556c25..86b25491c3 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/NewFolderAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/NewFolderAction.java @@ -19,8 +19,8 @@ import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.project.node.HasStorablePath; import org.eclipse.che.ide.project.node.ResourceBasedNode; -import org.eclipse.che.ide.ui.dialogs.InputCallback; -import org.eclipse.che.ide.ui.dialogs.input.InputDialog; +import org.eclipse.che.ide.api.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.InputDialog; /** * Action to create new folder. diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/DefaultOAuthAuthenticatorImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/DefaultOAuthAuthenticatorImpl.java index ca82283427..1a95f4dc6d 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/DefaultOAuthAuthenticatorImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/DefaultOAuthAuthenticatorImpl.java @@ -10,19 +10,16 @@ *******************************************************************************/ package org.eclipse.che.ide.oauth; -import com.google.gwt.core.client.Callback; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.callback.AsyncPromiseHelper; -import org.eclipse.che.api.promises.client.callback.CallbackPromiseHelper; -import org.eclipse.che.api.promises.client.js.Promises; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.oauth.OAuth2Authenticator; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.security.oauth.JsOAuthWindow; import org.eclipse.che.security.oauth.OAuthCallback; import org.eclipse.che.security.oauth.OAuthStatus; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/OAuth2AuthenticatorRegistryImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/OAuth2AuthenticatorRegistryImpl.java index 755f41899c..da897658cc 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/OAuth2AuthenticatorRegistryImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/OAuth2AuthenticatorRegistryImpl.java @@ -10,12 +10,13 @@ *******************************************************************************/ package org.eclipse.che.ide.oauth; +import com.google.inject.Inject; +import com.google.inject.Singleton; + import org.eclipse.che.ide.api.oauth.OAuth2AuthenticatorRegistry; import org.eclipse.che.ide.api.oauth.OAuth2Authenticator; import org.eclipse.che.ide.util.loging.Log; -import javax.inject.Inject; -import javax.inject.Singleton; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListener.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListener.java index 6831c43f36..baf03ca884 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListener.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListener.java @@ -32,9 +32,9 @@ import org.eclipse.che.ide.project.node.ProjectNode; import org.eclipse.che.ide.projectimport.wizard.ProjectImporter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.ui.smartTree.event.BeforeExpandNodeEvent; import org.eclipse.che.ide.util.loging.Log; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidget.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidget.java index 1c8cf9a312..d0e50a24ad 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidget.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidget.java @@ -141,7 +141,7 @@ public class EditorTabWidget extends Composite implements EditorTab, ContextMenu if (part instanceof EditorPartPresenter) { VirtualFile changedFile = ((EditorPartPresenter)part).getEditorInput().getFile(); FileType fileType = fileTypeRegistry.getFileTypeByFile(changedFile); - icon = fileType.getSVGImage(); + icon = fileType.getImage(); iconPanel.setWidget(getIcon()); } } diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesPresenter.java index d12aa9fed2..c5c823a921 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesPresenter.java @@ -25,9 +25,9 @@ import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.preferences.PreferencePagePresenter; import org.eclipse.che.ide.api.preferences.PreferencesManager; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/pages/appearance/AppearancePresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/pages/appearance/AppearancePresenter.java index 1cfb158765..eb64c8b971 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/pages/appearance/AppearancePresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/pages/appearance/AppearancePresenter.java @@ -37,7 +37,7 @@ public class AppearancePresenter extends AbstractPreferencePagePresenter impleme CoreLocalizationConstant constant, ThemeAgent themeAgent, PreferencesManager preferencesManager) { - super(constant.appearanceTitle(), constant.appearanceCategory(), null); + super(constant.appearanceTitle(), constant.appearanceCategory()); this.view = view; this.themeAgent = themeAgent; this.preferencesManager = preferencesManager; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/pages/extensions/ExtensionManagerPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/pages/extensions/ExtensionManagerPresenter.java index d35c3f1a89..602b54d691 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/pages/extensions/ExtensionManagerPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/pages/extensions/ExtensionManagerPresenter.java @@ -32,7 +32,7 @@ public class ExtensionManagerPresenter extends AbstractPreferencePagePresenter i @Inject public ExtensionManagerPresenter(CoreLocalizationConstant constant, ExtensionManagerView view, ExtensionRegistry extensionRegistry) { - super(constant.extensionTitle(), constant.extensionCategory(), null); + super(constant.extensionTitle(), constant.extensionCategory()); this.view = view; this.extensionRegistry = extensionRegistry; view.setDelegate(this); diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/icon/FileIconProvider.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/icon/FileIconProvider.java index c2b397013d..f6fc860edc 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/icon/FileIconProvider.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/icon/FileIconProvider.java @@ -44,7 +44,7 @@ public class FileIconProvider implements NodeIconProvider { FileType fileType = fileTypeRegistry.getFileTypeByNamePattern(fileName); if (fileType != unknownFileType) { - return fileType.getSVGImage(); + return fileType.getImage(); } final String extension = getFileExtension(fileName); @@ -56,7 +56,7 @@ public class FileIconProvider implements NodeIconProvider { fileType = fileTypeRegistry.getFileTypeByExtension(extension); if (fileType != unknownFileType) { - return fileType.getSVGImage(); + return fileType.getImage(); } return null; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/remove/DeleteNodeHandler.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/remove/DeleteNodeHandler.java index c3f39e7bf8..0442ee9f78 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/remove/DeleteNodeHandler.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/remove/DeleteNodeHandler.java @@ -32,9 +32,9 @@ import org.eclipse.che.ide.project.node.FileReferenceNode; import org.eclipse.che.ide.project.node.FolderReferenceNode; import org.eclipse.che.ide.project.node.ProjectNode; import org.eclipse.che.ide.project.node.ResourceBasedNode; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; import java.util.Collections; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java index 59c3a1bf23..8f5963dead 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java @@ -34,7 +34,7 @@ import org.eclipse.che.ide.api.project.wizard.ImportProjectNotificationSubscribe import org.eclipse.che.ide.api.project.wizard.ProjectNotificationSubscriber; import org.eclipse.che.ide.api.wizard.Wizard.CompleteCallback; import org.eclipse.che.ide.rest.RestContext; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.util.ExceptionUtils; import org.eclipse.che.security.oauth.OAuthStatus; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/presenter/ImportProjectWizardPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/presenter/ImportProjectWizardPresenter.java index f7246d0916..89678c62a2 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/presenter/ImportProjectWizardPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/presenter/ImportProjectWizardPresenter.java @@ -23,7 +23,7 @@ import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.projectimport.wizard.ImportWizardFactory; import org.eclipse.che.ide.projectimport.wizard.ImportWizard; import org.eclipse.che.ide.projectimport.wizard.mainpage.MainPagePresenter; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java index e86d4f14e4..281cd70052 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java @@ -33,9 +33,9 @@ import org.eclipse.che.ide.resource.Path; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/presenter/ProjectWizardPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/presenter/ProjectWizardPresenter.java index 43b7bfd092..7c4a2aabeb 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/presenter/ProjectWizardPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/presenter/ProjectWizardPresenter.java @@ -30,7 +30,7 @@ import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.projecttype.wizard.ProjectWizard; import org.eclipse.che.ide.projecttype.wizard.ProjectWizardFactory; import org.eclipse.che.ide.projecttype.wizard.categoriespage.CategoriesPagePresenter; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; import java.util.Collections; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java index 01e28e713f..72933b9635 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java @@ -32,7 +32,7 @@ import org.eclipse.che.ide.api.component.Component; import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.statepersistance.dto.AppState; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.ui.loaders.initialization.InitialLoadingInfo; import org.eclipse.che.ide.ui.loaders.initialization.LoaderPresenter; import org.eclipse.che.ide.util.loging.Log; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java index 7a4366eb64..1ac99b8a8d 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java @@ -36,7 +36,7 @@ import org.eclipse.che.ide.context.BrowserQueryFieldRenderer; import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.ui.loaders.initialization.InitialLoadingInfo; import org.eclipse.che.ide.ui.loaders.initialization.LoaderPresenter; import org.eclipse.che.ide.util.loging.Log; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java index 9887bdeb09..7555bdca3a 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java @@ -43,9 +43,9 @@ import org.eclipse.che.ide.api.component.Component; import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.HTTPStatus; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.ui.loaders.initialization.InitialLoadingInfo; import org.eclipse.che.ide.ui.loaders.initialization.LoaderPresenter; import org.eclipse.che.ide.util.ExceptionUtils; diff --git a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/debug/breakpoint.css b/core/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/debug/breakpoint.css similarity index 100% rename from core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/debug/breakpoint.css rename to core/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/debug/breakpoint.css diff --git a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/EditorPrefLocalizationConstant.properties b/core/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/editor/preferences/EditorPrefLocalizationConstant.properties similarity index 100% rename from core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/EditorPrefLocalizationConstant.properties rename to core/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/editor/preferences/EditorPrefLocalizationConstant.properties diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/notification/NotificationManagerImplTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/notification/NotificationManagerImplTest.java index 59d5d12984..3f2e11a8f6 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/notification/NotificationManagerImplTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/notification/NotificationManagerImplTest.java @@ -20,7 +20,7 @@ import org.eclipse.che.ide.api.notification.NotificationListener; import org.eclipse.che.ide.api.notification.ReadState; import org.eclipse.che.ide.api.notification.StatusNotification; import org.eclipse.che.ide.part.PartStackPresenter; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListenerTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListenerTest.java index 7b969689aa..fa46bd41a8 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListenerTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListenerTest.java @@ -28,11 +28,11 @@ import org.eclipse.che.ide.project.node.ProjectNode; import org.eclipse.che.ide.projectimport.wizard.ProjectImporter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; -import org.eclipse.che.ide.ui.dialogs.message.MessageDialog; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.MessageDialog; import org.eclipse.che.ide.ui.smartTree.event.BeforeExpandNodeEvent; import org.junit.Before; import org.junit.Test; @@ -47,12 +47,10 @@ import java.util.Arrays; import java.util.List; import static org.eclipse.che.dto.server.DtoFactory.newDto; -import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidgetTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidgetTest.java index 3aac6ce64e..02eddfaf19 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidgetTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidgetTest.java @@ -152,7 +152,7 @@ public class EditorTabWidgetTest { when(editorPartPresenter.getEditorInput()).thenReturn(editorInput); when(fileTypeRegistry.getFileTypeByFile(file)).thenReturn(fileType); - when(fileType.getSVGImage()).thenReturn(icon); + when(fileType.getImage()).thenReturn(icon); when(editorInput.getFile()).thenReturn(file); tab.update(editorPartPresenter); diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenterTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenterTest.java index f84b6737bd..b0a103a087 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenterTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenterTest.java @@ -23,7 +23,7 @@ import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.event.project.OpenProjectEvent; import org.eclipse.che.ide.api.project.wizard.ProjectNotificationSubscriber; import org.eclipse.che.ide.dto.DtoFactory; -import org.eclipse.che.ide.ui.dialogs.message.MessageDialog; +import org.eclipse.che.ide.api.dialogs.MessageDialog; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java index de5a9dc674..1fc7b4f88f 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java @@ -34,10 +34,10 @@ import org.eclipse.che.ide.projectimport.wizard.ProjectUpdater; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import org.eclipse.che.ide.websocket.rest.RequestCallback; import org.eclipse.che.test.GwtReflectionUtils; import org.junit.Before; diff --git a/core/ide/che-core-ide-jseditor/pom.xml b/core/ide/che-core-ide-jseditor/pom.xml deleted file mode 100644 index a3f3741341..0000000000 --- a/core/ide/che-core-ide-jseditor/pom.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - 4.0.0 - - che-core-ide-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-ide-jseditor - Che Core :: IDE :: JsEditor - - false - UTF-8 - http://requirejs.org/docs/release/${requirejs.upstream.version}/comments/ - 2.1.15 - - - - com.google.inject - guice - - - com.google.inject.extensions - guice-assistedinject - - - javax.inject - javax.inject - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-api-workspace-shared - - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-commons-annotations - - - org.eclipse.che.core - che-core-commons-gwt - - - org.eclipse.che.core - che-core-ide-api - - - org.eclipse.che.core - che-core-ide-ui - - - com.google.gwt - gwt-elemental - provided - - - com.google.gwt - gwt-user - provided - - - com.google.gwt.inject - gin - provided - - - org.eclipse.che.core - che-core-ide-app - provided - - - org.vectomatic - lib-gwt-svg - provided - - - com.google.gwt - gwt-dev - test - - - com.google.gwt.gwtmockito - gwtmockito - test - - - junit - junit - test - - - org.mockito - mockito-core - test - - - - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - target/requirejs-${requirejs.upstream.version} - - - - - src/test/resources - - - - - org.codehaus.mojo - wagon-maven-plugin - 1.0-beta-4 - - - generate-resources - - download-single - - - ${requirejs.upstream.url} - require.js - ${project.build.directory}/requirejs-${requirejs.upstream.version}/org/eclipse/che/ide/jseditor/public/require.js - - - - - - com.mycila - license-maven-plugin - - - **/org/eclipse/che/ide/jseditor/client/reconciler/DirtyRegion.java - **/org/eclipse/che/ide/jseditor/client/reconciler/DirtyRegionQueue.java - **/org/eclipse/che/ide/jseditor/client/annotation/AnnotationModelEvent.java - - - - - - diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/JsEditorExtension.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/JsEditorExtension.java deleted file mode 100644 index 9b0375eaaa..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/JsEditorExtension.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client; - -import com.google.inject.Inject; - -import org.eclipse.che.ide.api.extension.Extension; -import org.eclipse.che.ide.api.filetypes.FileType; -import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; -import org.eclipse.che.ide.api.keybinding.KeyBindingAgent; -import org.eclipse.che.ide.jseditor.client.inject.PlainTextFileType; -import org.eclipse.che.ide.jseditor.client.popup.PopupResources; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferenceResource; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorResources; - -@Extension(title = "Common Editor", version = "3.1.0") -public class JsEditorExtension { - - /** The default editor injection name. */ - public static final String DEFAULT_EDITOR_TYPE_INJECT_NAME = "DefaultEditorType"; - - /** The default editor injection name. */ - public static final String DEFAULT_EDITOR_TYPE_INSTANCE = "DefaultEditorType"; - - /** The editor without autosave */ - public static final String EMBEDDED_EDITOR_BUILDER= "DefaultEditorBuilder"; - - /** The editor without autosave */ - public static final String EMBEDDED_EDITOR_PROVIDER= "DefaultEditorProvider"; - - - @Inject - public JsEditorExtension(final FileTypeRegistry fileTypeRegistry, - final @PlainTextFileType FileType plainText, - final EditorPreferenceResource editorPreferenceResource, - final EditorResources editorResources, - final KeyBindingAgent keyBindingAgent, - final PopupResources popupResources) { - - // register text/plain file type - fileTypeRegistry.registerFileType(plainText); - - // ensure css injection - editorPreferenceResource.cellStyle().ensureInjected(); - editorResources.editorCss().ensureInjected(); - popupResources.popupStyle().ensureInjected(); - -// keyBindingAgent.getGlobal().addKey(new KeyBuilder().action().charCode('1').build(), "preventNative"); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/DefaultEditorProvider.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/DefaultEditorProvider.java deleted file mode 100644 index fe767968b9..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/DefaultEditorProvider.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.defaulteditor; - -import javax.inject.Named; - -import org.eclipse.che.ide.api.editor.EditorProvider; -import org.eclipse.che.ide.jseditor.client.JsEditorExtension; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.editortype.EditorTypeRegistry; -import org.eclipse.che.ide.jseditor.client.prefmodel.DefaultEditorTypePrefReader; -import org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor; -import org.eclipse.che.ide.util.loging.Log; -import com.google.inject.Inject; - - -public class DefaultEditorProvider implements EditorProvider { - - private final DefaultEditorTypePrefReader defaultEditorTypePrefReader; - private final EditorTypeRegistry editorTypeRegistry; - private final EditorType defaultEditorType; - - @Inject - public DefaultEditorProvider(final DefaultEditorTypePrefReader defaultEditorTypePrefReader, - final EditorTypeRegistry editorTypeRegistry, - final @Named(JsEditorExtension.DEFAULT_EDITOR_TYPE_INSTANCE) EditorType defaultEditorType) { - this.defaultEditorTypePrefReader = defaultEditorTypePrefReader; - this.editorTypeRegistry = editorTypeRegistry; - this.defaultEditorType = defaultEditorType; - } - - @Override - public String getId() { - return "codenvyDefaultEditor"; - } - - @Override - public String getDescription() { - return "Codenvy Default Editor"; - } - - @Override - public ConfigurableTextEditor getEditor() { - final EditorType editorType = this.defaultEditorTypePrefReader.readPref(); - Log.debug(DefaultEditorProvider.class, "Editor type used: " + editorType); - EditorBuilder provider = this.editorTypeRegistry.getRegisteredBuilder(editorType); - if (provider == null) { - Log.debug(DefaultEditorProvider.class, "No builder registered for editor type " + editorType - + " - attempt to fallback to " + defaultEditorType); - provider = this.editorTypeRegistry.getRegisteredBuilder(defaultEditorType); - if (provider == null) { - Log.debug(DefaultEditorProvider.class, "No builder registered for default editor type - giving up."); - return null; - } - } - return provider.buildEditor(); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/EditorWithoutAutoSaveProvider.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/EditorWithoutAutoSaveProvider.java deleted file mode 100644 index f22dfc5811..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/defaulteditor/EditorWithoutAutoSaveProvider.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.defaulteditor; - -import com.google.inject.Inject; -import com.google.inject.Singleton; - -import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.editor.EditorProvider; -import org.eclipse.che.ide.jseditor.client.JsEditorExtension; - -import javax.validation.constraints.NotNull; -import javax.inject.Named; - -/** - * @author Evgen Vidolob - */ -@Singleton -public class EditorWithoutAutoSaveProvider implements EditorProvider { - - private EditorBuilder embeddedBuilder; - - - @Inject - public EditorWithoutAutoSaveProvider(@Named(JsEditorExtension.EMBEDDED_EDITOR_BUILDER) EditorBuilder embeddedBuilder) { - this.embeddedBuilder = embeddedBuilder; - } - - @Override - public String getId() { - return "EditorWithoutAutoSaveProvider"; - } - - @Override - public String getDescription() { - return "Editor without auto save"; - } - - @NotNull - @Override - public EditorPartPresenter getEditor() { - return embeddedBuilder.buildEditor(); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapter.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapter.java deleted file mode 100644 index e7dc3d9021..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapter.java +++ /dev/null @@ -1,367 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editoradapter; - -import com.google.gwt.core.shared.GWT; -import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.IsWidget; -import com.google.gwt.user.client.ui.RequiresResize; -import com.google.gwt.user.client.ui.SimplePanel; -import com.google.gwt.user.client.ui.Widget; -import com.google.web.bindery.event.shared.EventBus; - -import org.eclipse.che.ide.api.editor.EditorInput; -import org.eclipse.che.ide.api.event.FileEvent; -import org.eclipse.che.ide.api.event.FileEventHandler; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.parts.PartPresenter; -import org.eclipse.che.ide.api.parts.PropertyListener; -import org.eclipse.che.ide.api.parts.WorkspaceAgent; -import org.eclipse.che.ide.api.selection.Selection; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.editorconfig.TextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.keymap.Keybinding; -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.jseditor.client.texteditor.ConfigurableTextEditor; -import org.vectomatic.dom.svg.ui.SVGImage; -import org.vectomatic.dom.svg.ui.SVGResource; - -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -import static org.eclipse.che.ide.api.editor.EditorAgent.OpenEditorCallback; - -/** - * Default implementation of {@link EditorAdapter}. - */ -public class DefaultEditorAdapter extends Composite implements EditorAdapter, FileEventHandler, RequiresResize, UndoableEditor { - - /** The UI binder instance. */ - private static final DefaultEditorAdapterUiBinder UIBINDER = GWT.create(DefaultEditorAdapterUiBinder.class); - - /** The text editor part of the nested presenter. */ - private ConfigurableTextEditor textEditor; - - /** The nested presenter. */ - private NestablePresenter nestedPresenter; - - /** The property listeners. */ - private List propertylisteners; - - /** The editor input. */ - private EditorInput input; - - /** The workspace agent. */ - private WorkspaceAgent workspaceAgent; - - /** The panel of the component. */ - @UiField - SimplePanel panel = new SimplePanel(); - - public DefaultEditorAdapter(EventBus eventBus, final WorkspaceAgent workspaceAgent) { - initWidget(UIBINDER.createAndBindUi(this)); - - eventBus.addHandler(FileEvent.TYPE, this); - - this.workspaceAgent = workspaceAgent; - } - - @Override - public void close(final boolean save) { - this.textEditor.close(save); - } - - @Override - public boolean isEditable() { - return this.textEditor.isEditable(); - } - - @Override - public void doRevertToSaved() { - this.textEditor.doRevertToSaved(); - } - - @Override - public Document getDocument() { - return this.textEditor.getDocument(); - } - - @Override - public String getContentType() { - return this.textEditor.getContentType(); - } - - @Override - public TextRange getSelectedTextRange() { - return this.textEditor.getSelectedTextRange(); - } - - @Override - public LinearRange getSelectedLinearRange() { - return this.textEditor.getSelectedLinearRange(); - } - - @Override - public TextPosition getCursorPosition() { - return this.textEditor.getCursorPosition(); - } - - @Override - public int getCursorOffset() { - return this.textEditor.getCursorOffset(); - } - - @Override - public void showMessage(final String message) { - this.textEditor.showMessage(message); - } - - @Override - public boolean isFocused() { - return this.textEditor.isFocused(); - } - - /** {@inheritDoc} */ - @Override - public void setFocus() { - textEditor.setFocus(); - } - - @Override - public void init(final EditorInput input, OpenEditorCallback callback) { - this.textEditor.init(input, callback); - this.input = input; - } - - @Override - public EditorInput getEditorInput() { - return this.textEditor.getEditorInput(); - } - - @Override - public void doSave() { - this.textEditor.doSave(); - } - - @Override - public void doSave(final AsyncCallback callback) { - this.textEditor.doSave(callback); - } - - @Override - public void doSaveAs() { - this.textEditor.doSaveAs(); - } - - @Override - public void onFileChanged() { - this.textEditor.onFileChanged(); - } - - @Override - public boolean isDirty() { - return this.textEditor.isDirty(); - } - - @Override - public void addCloseHandler(final EditorPartCloseHandler closeHandler) { - this.textEditor.addCloseHandler(closeHandler); - } - - @Override - public void activate() { - this.textEditor.activate(); - } - - @Override - public void storeState() { - //to do nothing - } - - @Override - public void restoreState() { - //to do nothing - } - - @Override - public String getTitle() { - return this.textEditor.getTitle(); - } - - @Override - public void addRule(@NotNull String perspectiveId) { - throw new UnsupportedOperationException("The method isn't available in this class " + getClass()); - } - - @Override - public List getRules() { - throw new UnsupportedOperationException("The method isn't available in this class " + getClass()); - } - - @Override - public IsWidget getView() { - return this; - } - - @Override - public ImageResource getTitleImage() { - return this.textEditor.getTitleImage(); - } - - @Override - public SVGResource getTitleSVGImage() { - return this.textEditor.getTitleSVGImage(); - } - - @Override - public SVGImage decorateIcon(final SVGImage svgImage) { - return this.textEditor.decorateIcon(svgImage); - } - - @Override - public IsWidget getTitleWidget() { - return this.textEditor.getTitleWidget(); - } - - @Override - public int getUnreadNotificationsCount() { - return 0; - } - - @Override - public String getTitleToolTip() { - return this.textEditor.getTitleToolTip(); - } - - @Override - public int getSize() { - return this.textEditor.getSize(); - } - - @Override - public void onOpen() { - this.textEditor.onOpen(); - } - - @Override - public void onClose(final AsyncCallback callback) { - // the nested presenter is responsible for closing the editor _it owns_ - this.nestedPresenter.onClose(callback); - } - - @Override - public Selection getSelection() { - return this.textEditor.getSelection(); - } - - @Override - public void addPropertyListener(final PropertyListener listener) { - if (this.propertylisteners == null) { - this.propertylisteners = new ArrayList<>(); - this.textEditor.addPropertyListener(new PropertyListener() { - @Override - public void propertyChanged(final PartPresenter source, final int propId) { - for (final PropertyListener listener : propertylisteners) { - listener.propertyChanged(DefaultEditorAdapter.this, propId); - } - } - }); - } - this.propertylisteners.add(listener); - } - - @Override - public void removePropertyListener(final PropertyListener listener) { - if (this.propertylisteners != null) { - this.propertylisteners.remove(listener); - } - } - - @Override - public void go(final AcceptsOneWidget container) { - this.nestedPresenter.go(this.panel); - container.setWidget(this.panel); - } - - @Override - public void initialize(final TextEditorConfiguration configuration, final NotificationManager notificationManager) { - this.textEditor.initialize(configuration, notificationManager); - } - - @Override - public TextEditorConfiguration getConfiguration() { - return this.textEditor.getConfiguration(); - } - - @Override - public ConfigurableTextEditor getTextEditor() { - return this.textEditor; - } - - @Override - public void setPresenter(final NestablePresenter nestedPresenter) { - this.nestedPresenter = nestedPresenter; - } - - public void setTextEditor(final ConfigurableTextEditor configurable) { - this.textEditor = configurable; - } - - @Override - public void onResize() { - final Widget widget = this.panel.getWidget(); - if (widget instanceof RequiresResize) { - ((RequiresResize)widget).onResize(); - } - } - - @Override - public void addKeybinding(final Keybinding keybinding) { - this.textEditor.addKeybinding(keybinding); - } - - @Override - public HandlesUndoRedo getUndoRedo() { - if (this.textEditor instanceof UndoableEditor) { - return ((UndoableEditor)this.textEditor).getUndoRedo(); - } else { - return new DummyHandlesUndoRedo(); - } - } - - @Override - public void onFileOperation(FileEvent event) { - if (event.getOperationType() != FileEvent.FileOperation.CLOSE) { - return; - } - - final String eventFilePath = event.getFile().getPath(); - final String filePath = input.getFile().getPath(); - if (filePath.equals(eventFilePath)) { - workspaceAgent.removePart(this); - } - } - - /** Interface for this component's UIBinder. */ - interface DefaultEditorAdapterUiBinder extends UiBinder { - } - -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapter.ui.xml b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapter.ui.xml deleted file mode 100644 index e8f5b3daa0..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapter.ui.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - .panel { - min-width: -webkit-fill-available; - min-width: -moz-fill-available; - min-width: fill-available; - - min-height: -webkit-fill-available; - min-height: -moz-fill-available; - min-height: fill-available; - } - - - - - - \ No newline at end of file diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DummyHandlesUndoRedo.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DummyHandlesUndoRedo.java deleted file mode 100644 index a2036f7a99..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/DummyHandlesUndoRedo.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editoradapter; - -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; - -/** Dummy implementation of {@link HandlesUndoRedo} that refuses to undo or redo. */ -public class DummyHandlesUndoRedo implements HandlesUndoRedo { - - @Override - public boolean redoable() { - return false; - } - - @Override - public boolean undoable() { - return false; - } - - @Override - public void redo() { - throw new RuntimeException("redo not possible"); - } - - @Override - public void undo() { - throw new RuntimeException("undo not possible"); - } - - @Override - public void beginCompoundChange() { - throw new RuntimeException("beginCompoundChange not possible"); - } - - @Override - public void endCompoundChange() { - throw new RuntimeException("endCompoundChange not possible"); - } - -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/EditorAdapter.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/EditorAdapter.java deleted file mode 100644 index 17c05c52fc..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/EditorAdapter.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editoradapter; - -import org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; - -/** - * Interface for an adapter that allows to look at a presenter that exposes an editor as if it were an editor. - */ -public interface EditorAdapter extends TextEditor, ConfigurableTextEditor, HasEditor { - - /** - * Sets the nested presenter. - * @param nestedPresenter the presenter - */ - void setPresenter(NestablePresenter nestedPresenter); -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/HasEditor.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/HasEditor.java deleted file mode 100644 index 555c8cf15e..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editoradapter/HasEditor.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editoradapter; - -import org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor; - -/** Interface for component that own a {@link org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor}. */ -public interface HasEditor { - - /** - * Returns the editor part of the component. - * @return the editor - */ - ConfigurableTextEditor getTextEditor(); - -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorType.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorType.java deleted file mode 100644 index 223c5a787d..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorType.java +++ /dev/null @@ -1,134 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editortype; - -import org.eclipse.che.ide.util.loging.Log; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Value object for editor types. - * - * @author "Mickaël Leduque" - */ -public final class EditorType { - - /** The key for the default "classic" editor. */ - public static final String DEFAULT_EDITOR_KEY = "codemirror"; - - /** The editor type key. */ - private final String editorTypeKey; - - - /** The already built instances. */ - private static Map instances = new HashMap<>(); - - private EditorType(final String key) { - editorTypeKey = key; - } - - /** - * Retrieve an editor type instance by its key. - * - * @param key - * the editor type key - * @return the {@link EditorType} instance - */ - public static EditorType fromKey(final String key) { - if (key == null || key.isEmpty()) { - return null; - } - final EditorType search = instances.get(key); - if (search != null) { - return search; - } else { - Log.debug(EditorType.class, "Creating new EditorType instance, key=" + key); - final EditorType result = new EditorType(key); - instances.put(key, result); - return result; - } - } - - /** - * Returns the editor type key. - * - * @return the editor type key. - */ - public String getEditorTypeKey() { - return editorTypeKey; - } - - /** - * Returns the default editor type. - * - * @return the default editor type. - */ - public static EditorType getDefaultEditorType() { - return fromKey(DEFAULT_EDITOR_KEY); - } - - /** - * Return all created instances.
- * The list is a copy of the real one, modifying it does nothing. - * - * @return the instances - */ - public static List getInstances() { - return new ArrayList<>(instances.values()); - } - - /** - * Return the instance with the given key. - * - * @return the instance with that key or null if there isn't one - */ - public static EditorType getInstance(final String key) { - return instances.get(key); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((editorTypeKey == null) ? 0 : editorTypeKey.hashCode()); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final EditorType other = (EditorType)obj; - if (editorTypeKey == null) { - if (other.editorTypeKey != null) { - return false; - } - } else if (!editorTypeKey.equals(other.editorTypeKey)) { - return false; - } - return true; - } - - @Override - public String toString() { - return editorTypeKey; - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeMapping.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeMapping.java deleted file mode 100644 index f4afb08ba8..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeMapping.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editortype; - -import org.eclipse.che.ide.api.filetypes.FileType; - -import javax.inject.Singleton; -import java.util.Map.Entry; - -/** - * An interface for content type to editor type mappings. - * - * @author "Mickaël Leduque" - */ -@Singleton -public interface EditorTypeMapping extends Iterable> { - - public static final String CONTENT_TYPE_TEXT_PLAIN = "text/plain"; - - /** - * Sets a mapping for a content type. - * - * @param contentType - * the content type - * @param editorType - * the associated editor type - */ - void setEditorType(final FileType contentType, EditorType editorType); - - /** - * Searches an editor type for a content type. - * - * @param contentType - * the content type - * @return an editor type (never null) - */ - EditorType getEditorType(final FileType contentType); - - - /** - * Loads the mappings from the user preferences. - */ - void loadFromPreferences(); - - /** - * Stores the mappings in the user preferences. - */ - void storeInPreferences(); - -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeMappingImpl.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeMappingImpl.java deleted file mode 100644 index 9e33400ef4..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeMappingImpl.java +++ /dev/null @@ -1,205 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editortype; - -import org.eclipse.che.ide.api.filetypes.FileType; -import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; -import org.eclipse.che.ide.api.preferences.PreferencesManager; -import org.eclipse.che.ide.jseditor.client.inject.PlainTextFileType; -import org.eclipse.che.ide.jseditor.client.util.PrintMap; -import org.eclipse.che.ide.jseditor.client.util.PrintMap.Converter; -import org.eclipse.che.ide.util.loging.Log; -import com.google.gwt.json.client.JSONObject; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONString; -import com.google.gwt.json.client.JSONValue; - -import javax.inject.Inject; -import javax.inject.Named; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -/** - * Implementation for {@link EditorTypeMapping}. - * - * @author "Mickaël Leduque" - */ -public class EditorTypeMappingImpl implements EditorTypeMapping { - - /** The name of the property for the mappings in user preferences. */ - private static final String PREFERENCE_PROPERTY_NAME = "editorTypes"; - - /** The known mappings. */ - private final Map contentTypeMapping = new HashMap<>(); - - private final PreferencesManager preferencesManager; - - private final FileTypeRegistry fileTypeRegistry; - private final FileType unknownFileType; - private final FileType plainTextFileType; - - private boolean loaded = false; - - - @Inject - public EditorTypeMappingImpl(final FileTypeRegistry fileTypeRegistry, - final @Named("defaultFileType") FileType unknownFileType, - final @PlainTextFileType FileType plainTextFileType, - final PreferencesManager preferencesManager) { - this.fileTypeRegistry = fileTypeRegistry; - this.unknownFileType = unknownFileType; - this.plainTextFileType = plainTextFileType; - this.preferencesManager = preferencesManager; - } - - @Override - public void setEditorType(final FileType contentType, final EditorType editorType) { - ensureLoaded(); - this.contentTypeMapping.put(contentType, editorType); - Log.debug(EditorTypeMappingImpl.class, "Mappings added - new mappings:\n" + printMapping()); - } - - @Override - public EditorType getEditorType(final FileType contentType) { - ensureLoaded(); - final EditorType search = this.contentTypeMapping.get(contentType); - if (search != null) { - return search; - } else { - Log.debug(EditorTypeMappingImpl.class, "No editor type mapping for " + contentType.getContentDescription() - + " - trying with text/plain."); - // try to fall back to text/plain - final EditorType searchTextPlain = this.contentTypeMapping.get(plainTextFileType); - if (searchTextPlain != null) { - return searchTextPlain; - } else { - Log.debug(EditorTypeMappingImpl.class, "Falling back to default editor impl."); - // fall back to default editor - return EditorType.getDefaultEditorType(); - } - } - } - - @Override - public void loadFromPreferences() { - final String pref = this.preferencesManager.getValue(PREFERENCE_PROPERTY_NAME); - if (pref != null && !pref.isEmpty()) { - final JSONObject keyMapping = JSONParser.parseStrict(pref).isObject(); - this.contentTypeMapping.clear(); - for (final String key : keyMapping.keySet()) { - // the mime-type is stored in preferences - final String contentType = key; - final JSONValue value = keyMapping.get(key); - if (value == null) { - Log.warn(EditorTypeMappingImpl.class, - "Error in preferences: filetype " + contentType + " has null editor type set."); - continue; - } - final String stringValue = value.isString().stringValue(); - final EditorType editorType = EditorType.getInstance(stringValue); - if (editorType != null) { - // special case for text/plain <-> defaultPlainTextFileType - if (CONTENT_TYPE_TEXT_PLAIN.equals(contentType)) { - this.contentTypeMapping.put(plainTextFileType, editorType); - } else { - final FileType fileType = fileTypeRegistry.getFileTypeByMimeType(contentType); - // any unknown mime type returns the default filetype ; ignore them - if (!unknownFileType.equals(fileType)) { - this.contentTypeMapping.put(fileType, editorType); - } - } - } else { - Log.warn(EditorTypeMappingImpl.class, - "Unknown editor type key found for filetype " + contentType + ": " + stringValue); - } - } - } else { - Log.debug(EditorTypeMappingImpl.class, "No editor type mappings found in preferences."); - } - } - - @Override - public void storeInPreferences() { - final JSONObject keyMapping = new JSONObject(); - for (final Entry entry : this.contentTypeMapping.entrySet()) { - if (entry.getKey() != null && entry.getValue() != null) { - final FileType fileType = entry.getKey(); - // special case for text/plain <-> defaultPlainTextFileType - if (fileType.equals(plainTextFileType)) { - keyMapping.put(CONTENT_TYPE_TEXT_PLAIN, new JSONString(entry.getValue().getEditorTypeKey())); - } else { - final List mimeTypes = fileType.getMimeTypes(); - if (mimeTypes != null && mimeTypes.size() > 0) { - final String firstMimeType = mimeTypes.get(0); - if (firstMimeType != null) { - keyMapping.put(firstMimeType, new JSONString(entry.getValue().getEditorTypeKey())); - } - } - } - } - } - - final String pref = keyMapping.toString(); - Log.debug(EditorTypeMappingImpl.class, "Storing editor type mappings in prefs - " + pref); - this.preferencesManager.setValue(PREFERENCE_PROPERTY_NAME, pref); - } - - @Override - public Iterator> iterator() { - ensureLoaded(); - return this.contentTypeMapping.entrySet().iterator(); - } - - private void ensureLoaded() { - if (!loaded) { - loaded = true; - Log.debug(EditorTypeMappingImpl.class, "Mappings have not yet been read from preferences - doing it."); - loadFromPreferences(); - Log.debug(EditorTypeMappingImpl.class, "Mappings loaded - obtained:\n" + printMapping()); - } - } - - private String printMapping() { - return PrintMap.printMap(this.contentTypeMapping, new Converter() { - @Override - public String convert(final FileType item) { - final StringBuilder sb = new StringBuilder("["); - if (item.getContentDescription() != null) { - sb.append(item.getContentDescription()); - } else { - sb.append("-"); - } - sb.append("|"); - if (item.getMimeTypes() != null) { - String separator = ""; - for (final String s : item.getMimeTypes()) { - sb.append(separator); - sb.append(s); - separator = " "; - } - } else { - sb.append("-"); - } - sb.append("|"); - if (item.getExtension() != null) { - sb.append(item.getExtension()); - } else { - sb.append("-"); - } - sb.append("]"); - return sb.toString(); - } - }); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeRegistry.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeRegistry.java deleted file mode 100644 index a0af9dcd60..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeRegistry.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editortype; - -import org.eclipse.che.ide.jseditor.client.defaulteditor.EditorBuilder; - -import javax.inject.Singleton; -import java.util.List; - -/** - * Manages all registered editor types. - * - * @author "Mickaël Leduque" - */ -@Singleton -public interface EditorTypeRegistry { - - /** - * Registers an editor type. - * - * @param editorType - * the editor type instance - * @param name - * the (user-visible) name of the editor type - * @param editorBuilder - * a provider for the editor type - */ - void registerEditorType(EditorType editorType, String name, EditorBuilder editorBuilder); - - /** - * Returns the editor provider for a registered editor type. - * - * @param editorType - * the editor type - * @return the provider - */ - EditorBuilder getRegisteredBuilder(EditorType editorType); - - /** - * Returns the user-visible name for the registered editor type. - * - * @param editorType - * @return - */ - String getName(EditorType editorType); - - /** - * Returns a list of all registered editor types. - * - * @return the editor types - */ - List getEditorTypes(); - -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeRegistryImpl.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeRegistryImpl.java deleted file mode 100644 index 8050b5aa2b..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/editortype/EditorTypeRegistryImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editortype; - -import org.eclipse.che.ide.jseditor.client.defaulteditor.EditorBuilder; -import org.eclipse.che.ide.jseditor.client.util.PrintMap; -import org.eclipse.che.ide.util.loging.Log; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Implementation for {@link EditorTypeRegistry}. - * - * @author "Mickaël Leduque" - */ -public class EditorTypeRegistryImpl implements EditorTypeRegistry { - - /** The registered editor types. */ - private final Map editorTypes = new HashMap<>(); - - @Override - public void registerEditorType(final EditorType editorType, final String name, final EditorBuilder editorBuilder) { - if (editorType == null) { - throw new RuntimeException("Cannot register null editor type"); - } - if (name == null) { - throw new RuntimeException("Cannot register editor type with null name"); - } - if (editorBuilder == null) { - throw new RuntimeException("Cannot register editor type with null provider"); - } - if (this.editorTypes.containsKey(editorType)) { - throw new RuntimeException("Editor type already registrered with the same key"); - } - this.editorTypes.put(editorType, new RegistryStorage(name, editorBuilder)); - Log.debug(EditorTypeRegistryImpl.class, "Contents: " + PrintMap.printMap(this.editorTypes)); - } - - @Override - public EditorBuilder getRegisteredBuilder(final EditorType editorType) { - final RegistryStorage item = this.editorTypes.get(editorType); - if (item != null) { - return item.getEditorProvider(); - } else { - return null; - } - } - - @Override - public String getName(final EditorType editorType) { - final RegistryStorage item = this.editorTypes.get(editorType); - if (item != null) { - return item.getName(); - } else { - Log.warn(EditorTypeRegistryImpl.class, - "Editor type not found: " + editorType - + " - available ones are " + PrintMap.printMap(this.editorTypes)); - return null; - } - } - - private static class RegistryStorage { - private final String name; - private final EditorBuilder editorBuilder; - - public RegistryStorage(final String name, final EditorBuilder editorBuilder) { - this.name = name; - this.editorBuilder = editorBuilder; - } - - public String getName() { - return name; - } - - public EditorBuilder getEditorProvider() { - return editorBuilder; - } - - @Override - public String toString() { - return "<" + this.name + ", " + this.editorBuilder.getClass().getSimpleName() + ">"; - } - } - - @Override - public List getEditorTypes() { - return new ArrayList<>(this.editorTypes.keySet()); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/inject/JsEditorGinModule.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/inject/JsEditorGinModule.java deleted file mode 100644 index 5fe7acb678..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/inject/JsEditorGinModule.java +++ /dev/null @@ -1,140 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.inject; - -import com.google.gwt.inject.client.AbstractGinModule; -import com.google.gwt.inject.client.assistedinject.GinFactoryModuleBuilder; -import com.google.inject.Provides; -import com.google.inject.name.Names; - -import org.eclipse.che.ide.api.editor.EditorProvider; -import org.eclipse.che.ide.api.extension.ExtensionGinModule; -import org.eclipse.che.ide.api.filetypes.FileType; -import org.eclipse.che.ide.debug.BreakpointManager; -import org.eclipse.che.ide.debug.BreakpointRenderer; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; -import org.eclipse.che.ide.jseditor.client.JsEditorExtension; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistant; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistantFactory; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistantImpl; -import org.eclipse.che.ide.jseditor.client.debug.BreakpointManagerImpl; -import org.eclipse.che.ide.jseditor.client.debug.BreakpointRendererFactory; -import org.eclipse.che.ide.jseditor.client.debug.BreakpointRendererImpl; -import org.eclipse.che.ide.jseditor.client.defaulteditor.DefaultEditorProvider; -import org.eclipse.che.ide.jseditor.client.defaulteditor.EditorWithoutAutoSaveProvider; -import org.eclipse.che.ide.jseditor.client.document.DocumentStorage; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.editortype.EditorTypeRegistry; -import org.eclipse.che.ide.jseditor.client.editortype.EditorTypeRegistryImpl; -import org.eclipse.che.ide.jseditor.client.filetype.FileTypeIdentifier; -import org.eclipse.che.ide.jseditor.client.filetype.MultipleMethodFileIdentifier; -import org.eclipse.che.ide.jseditor.client.infopanel.InfoPanel; -import org.eclipse.che.ide.jseditor.client.partition.DocumentPositionMap; -import org.eclipse.che.ide.jseditor.client.partition.DocumentPositionMapImpl; -import org.eclipse.che.ide.jseditor.client.prefmodel.DefaultEditorTypePrefReader; -import org.eclipse.che.ide.jseditor.client.prefmodel.EditorPreferenceReader; -import org.eclipse.che.ide.jseditor.client.prefmodel.KeymapPrefReader; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistAssistant; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistAssistantImpl; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistWidgetFactory; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistantFactory; -import org.eclipse.che.ide.jseditor.client.reconciler.Reconciler; -import org.eclipse.che.ide.jseditor.client.reconciler.ReconcilerFactory; -import org.eclipse.che.ide.jseditor.client.reconciler.ReconcilerWithAutoSave; -import org.eclipse.che.ide.jseditor.client.requirejs.ModuleHolder; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPartView; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPartViewImpl; -import org.vectomatic.dom.svg.ui.SVGResource; - -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - -@ExtensionGinModule -public class JsEditorGinModule extends AbstractGinModule { - - /** The default text file type: text/plain. */ - private static final String CONTENT_TYPE_TEXT_PLAIN = "text/plain"; - - @Override - protected void configure() { - bind(ModuleHolder.class).in(Singleton.class); - - // the embedded editor view - bind(EmbeddedTextEditorPartView.class).to(EmbeddedTextEditorPartViewImpl.class); - - // Bind the file type identifier - bind(FileTypeIdentifier.class).to(MultipleMethodFileIdentifier.class); - - // editor registration - bind(EditorTypeRegistry.class).to(EditorTypeRegistryImpl.class).in(Singleton.class); - - // bind the components that read/write editor preferences - bind(EditorPreferenceReader.class); - bind(DefaultEditorTypePrefReader.class); - bind(KeymapPrefReader.class); - - // bind the document storage - bind(DocumentStorage.class); - - // bind the default editor - bind(EditorProvider.class).annotatedWith(Names.named("defaultEditor")).to(DefaultEditorProvider.class); - - // bind the info panel - bind(InfoPanel.class); - - // bind the document position model - bind(DocumentPositionMap.class).to(DocumentPositionMapImpl.class); - - // bind the reconciler - install(new GinFactoryModuleBuilder() - .implement(Reconciler.class, ReconcilerWithAutoSave.class) - .build(ReconcilerFactory.class)); - - // bind the code assistant and quick assistant - install(new GinFactoryModuleBuilder() - .implement(CodeAssistant.class, CodeAssistantImpl.class) - .build(CodeAssistantFactory.class)); - install(new GinFactoryModuleBuilder() - .implement(QuickAssistAssistant.class, QuickAssistAssistantImpl.class) - .build(QuickAssistantFactory.class)); - - // breakpoint renderer and manager - install(new GinFactoryModuleBuilder() - .implement(BreakpointRenderer.class, BreakpointRendererImpl.class) - .build(BreakpointRendererFactory.class)); - bind(BreakpointManager.class).to(BreakpointManagerImpl.class).in(Singleton.class); - - // bind the quick assist widget factory - install(new GinFactoryModuleBuilder() - .build(QuickAssistWidgetFactory.class)); - - bind(EditorProvider.class).annotatedWith(Names.named(JsEditorExtension.EMBEDDED_EDITOR_PROVIDER)).to(EditorWithoutAutoSaveProvider.class); - } - - // no real need to make it a singleton, it's a simple instantiation - @Provides - @Named(JsEditorExtension.DEFAULT_EDITOR_TYPE_INSTANCE) - @Inject - protected EditorType defaultEditorType(final @Named(JsEditorExtension.DEFAULT_EDITOR_TYPE_INJECT_NAME) String defaultEditorKey) { - return EditorType.fromKey(defaultEditorKey); - } - - @Provides - @Singleton - @PlainTextFileType - protected FileType textPlainFileType(final JsEditorConstants constants) { - return new FileType(constants.defaultEditorDescription(), - (SVGResource)null, - CONTENT_TYPE_TEXT_PLAIN, - (String)null); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/inject/PlainTextFileType.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/inject/PlainTextFileType.java deleted file mode 100644 index f3be202794..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/inject/PlainTextFileType.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.inject; - -import com.google.inject.BindingAnnotation; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Binding annotation for the plain text file type. - * - * @author "Mickaël Leduque" - */ -@BindingAnnotation -@Target({FIELD, PARAMETER, METHOD}) -@Retention(RUNTIME) -public @interface PlainTextFileType { -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapPrefReader.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapPrefReader.java deleted file mode 100644 index faf2f598a6..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapPrefReader.java +++ /dev/null @@ -1,145 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.keymap; - -import org.eclipse.che.ide.api.preferences.PreferencesManager; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.util.loging.Log; -import com.google.gwt.json.client.JSONObject; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONString; -import com.google.gwt.json.client.JSONValue; - -import java.util.Map.Entry; - -/** - * Utility class to read and store keymap preferences. - * - * @author "Mickaël Leduque" - */ -public class KeymapPrefReader { - - private static final String KEYMAP_PREF_KEY = "keymap"; - - /** - * Reads the keymap preference for the given editor. - * - * @param preferencesManager - * the preferences manager - * @param editorKey - * the editor key - * @return the keymap in preference or null if none is set - */ - public static String readPref(final PreferencesManager preferencesManager, final String editorKey) { - final String keymapPrefAsJson = preferencesManager.getValue(KEYMAP_PREF_KEY); - if (keymapPrefAsJson == null || keymapPrefAsJson.isEmpty()) { - return null; - } - JSONValue propertyObject; - try { - final JSONValue parseResult = JSONParser.parseStrict(keymapPrefAsJson); - propertyObject = parseResult.isObject().get(editorKey); - } catch (final RuntimeException e) { - Log.error(KeymapPrefReader.class, "Error during preference parsing.", e); - return null; - } - if (propertyObject == null) { - return null; - } - String propertyValue; - try { - propertyValue = propertyObject.isString().stringValue(); - } catch (final RuntimeException e) { - Log.error(KeymapPrefReader.class, "Invalid value for keymap preference.", e); - return null; - } - return propertyValue; - } - - /** - * Reads the keymap preferences and fills the {@link KeymapValuesHolder} instance. - * - * @param preferencesManager - * the preferences manager - * @param valuesHolder - * the object that keeps the values - */ - public static void readPref(final PreferencesManager preferencesManager, final KeymapValuesHolder valuesHolder) { - final String keymapPrefAsJson = preferencesManager.getValue(KEYMAP_PREF_KEY); - if (keymapPrefAsJson == null || keymapPrefAsJson.isEmpty()) { - return; - } - JSONObject propertyObject; - try { - final JSONValue parseResult = JSONParser.parseStrict(keymapPrefAsJson); - propertyObject = parseResult.isObject(); - } catch (final RuntimeException e) { - Log.error(KeymapPrefReader.class, "Error during preference parsing.", e); - return; - } - for (final String key : propertyObject.keySet()) { - final JSONValue value = propertyObject.get(key); - if (value == null) { - continue; - } - String valueString = null; - try { - valueString = value.isString().stringValue(); - } catch (final ClassCastException e) { - Log.warn(KeymapPrefReader.class, "Incorrect value type for keymap preference for editor " + key + ": " + value); - continue; - } - if (valueString != null) { - EditorType editorType = null; - Keymap keymap = null; - try { - editorType = EditorType.fromKey(key); - keymap = Keymap.fromKey(valueString); - } catch (final RuntimeException e) { - Log.error(KeymapPrefReader.class, "Invalid value for keymap preference.", e); - continue; - } - if (editorType != null && keymap != null) { - valuesHolder.setKeymap(editorType, keymap); - } - } - } - } - - /** - * Updates the keymap in preferences. - * - * @param preferencesManager - * the preferences manager - * @param valuesHolder - * the object that contains the values to store - */ - public static void storePrefs(final PreferencesManager preferencesManager, final KeymapValuesHolder valuesHolder) { - final String keymapPrefAsJson = preferencesManager.getValue(KEYMAP_PREF_KEY); - - JSONObject prefObject; - if (keymapPrefAsJson == null) { - prefObject = new JSONObject(); - } else { - final JSONValue parseResult = JSONParser.parseStrict(keymapPrefAsJson); - prefObject = parseResult.isObject(); - } - - for (final Entry entry : valuesHolder) { - if (entry.getKey() != null && entry.getValue() != null) { - prefObject.put(entry.getKey().getEditorTypeKey(), new JSONString(entry.getValue().getKey())); - } - } - - final String newJson = prefObject.toString(); - preferencesManager.setValue(KEYMAP_PREF_KEY, newJson); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapValuesHolder.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapValuesHolder.java deleted file mode 100644 index cddf2d5043..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/keymap/KeymapValuesHolder.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.keymap; - -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -/** - * A store for editor to keymap mappings. - * - * @author "Mickaël Leduque" - */ -public class KeymapValuesHolder implements Iterable> { - - /** the actual mapping. */ - private final Map values = new HashMap<>(); - - /** - * Sets-up a keymap association for the editor type. - * - * @param editorType - * the editor type - * @param newValue - * the new keymap - */ - public void setKeymap(final EditorType editorType, final Keymap newValue) { - this.values.put(editorType, newValue); - } - - /** - * Returns the keymap association for the editor type. - * - * @param editorType - * the editor type - * @return the associated keymap or null - */ - public Keymap getKeymap(final EditorType editorType) { - return this.values.get(editorType); - } - - public Map getValues() { - return values; - } - - @Override - public Iterator> iterator() { - return this.values.entrySet().iterator(); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceResource.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceResource.java deleted file mode 100644 index a322238425..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/EditorPreferenceResource.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.preference; - -import com.google.gwt.resources.client.CssResource; -import com.google.gwt.user.cellview.client.CellTable; - -import org.vectomatic.dom.svg.ui.SVGResource; - -public interface EditorPreferenceResource extends CellTable.Resources { - - // use until SVG is supported as pref dialog icon - @Source("editor-icon.svg") - SVGResource editorPrefIconTemporary(); - - @Source({"CellTable-properties.css", "org/eclipse/che/ide/api/ui/style.css"}) - CellTableStyle cellTableStyle(); - - @Source("CellStyle.css") - CellStyle cellStyle(); - - interface CellTableStyle extends CellTable.Style { - } - - interface CellStyle extends CssResource { - String prefCell(); - - String selectWidth(); - - String firstColumn(); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/FileTypeDataProvider.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/FileTypeDataProvider.java deleted file mode 100644 index 70ff472079..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/FileTypeDataProvider.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.preference.dataprovider; - -import org.eclipse.che.ide.api.filetypes.FileType; -import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; -import com.google.gwt.view.client.AbstractDataProvider; -import com.google.gwt.view.client.HasData; - -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * An {@link AbstractDataProvider} implementation for {@link FileType} based on the {@link FileTypeRegistry}. - * - * @author "Mickaël Leduque" - */ -public class FileTypeDataProvider extends AbstractDataProvider implements RefreshableDataProvider { - - /** The file type registry. */ - private final FileTypeRegistry fileTypeRegistry; - - @Inject - public FileTypeDataProvider(final FileTypeRegistry fileTypeRegistry) { - super(new FileTypeKeyProvider()); - this.fileTypeRegistry = fileTypeRegistry; - } - - @Override - protected void onRangeChanged(final HasData display) { - final List list = buildData(); - if (!list.isEmpty()) { - updateRowData(display, 0, list); - } - } - - public void refresh() { - final List list = buildData(); - this.updateRowData(0, list); - this.updateRowCount(list.size(), true); - } - - private List buildData() { - final List filetypes = this.fileTypeRegistry.getRegisteredFileTypes(); - int size = filetypes.size(); - if (size > 0) { - final List list = new ArrayList<>(size); - for (final FileType filetype : filetypes) { - list.add(filetype); - } - return list; - } else { - return Collections.emptyList(); - } - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/FileTypeKeyProvider.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/FileTypeKeyProvider.java deleted file mode 100644 index b7b45c8cc4..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/FileTypeKeyProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.preference.dataprovider; - -import org.eclipse.che.ide.api.filetypes.FileType; -import com.google.gwt.view.client.ProvidesKey; - -/** - * {@link ProvidesKey} for FileType. - * - * @author "Mickaël Leduque" - */ -public class FileTypeKeyProvider implements ProvidesKey { - @Override - public Object getKey(final FileType item) { - return item.getId(); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/RefreshableListDataProvider.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/RefreshableListDataProvider.java deleted file mode 100644 index 67b1e1dd88..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/dataprovider/RefreshableListDataProvider.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.preference.dataprovider; - -import com.google.gwt.view.client.ListDataProvider; -import com.google.gwt.view.client.ProvidesKey; - -import java.util.List; - -public class RefreshableListDataProvider extends ListDataProvider implements RefreshableDataProvider { - - public RefreshableListDataProvider() { - } - - public RefreshableListDataProvider(final List listToWrap) { - super(listToWrap); - } - - public RefreshableListDataProvider(final ProvidesKey keyProvider) { - super(keyProvider); - } - - public RefreshableListDataProvider(final List listToWrap, final ProvidesKey keyProvider) { - super(listToWrap, keyProvider); - } - -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeyMapsPreferencePresenter.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeyMapsPreferencePresenter.java deleted file mode 100644 index 0f181a25f8..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeyMapsPreferencePresenter.java +++ /dev/null @@ -1,132 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.preference.keymaps; - -import java.util.List; -import java.util.Map.Entry; - -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.editortype.EditorTypeRegistry; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import org.eclipse.che.ide.jseditor.client.keymap.KeymapChangeEvent; -import org.eclipse.che.ide.jseditor.client.keymap.KeymapValuesHolder; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferenceSection; -import org.eclipse.che.ide.jseditor.client.prefmodel.KeymapPrefReader; -import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.google.inject.Inject; -import com.google.web.bindery.event.shared.EventBus; - -/** Presenter for the keymap preference selection section. */ -public class KeyMapsPreferencePresenter implements EditorPreferenceSection, KeymapsPreferenceView.ActionDelegate { - - private final KeymapsPreferenceView view; - - private final KeymapPrefReader keymapPrefReader; - private final EventBus eventBus; - - private KeymapValuesHolder keymapValuesHolder; - private KeymapValuesHolder prefKeymaps; - - /** Has any of the keymap preferences been changed ? */ - private boolean dirty = false; - - /** The preference page presenter. */ - private ParentPresenter parentPresenter; - - private EditorTypeRegistry editorTypeRegistry; - - @Inject - public KeyMapsPreferencePresenter(final KeymapsPreferenceView view, - final KeymapPrefReader keymapPrefReader, - final EventBus eventBus, - final EditorTypeRegistry editorTypeRegistry) { - this.view = view; - this.eventBus = eventBus; - this.keymapPrefReader = keymapPrefReader; - this.editorTypeRegistry = editorTypeRegistry; - - this.view.setDelegate(this); - - this.keymapValuesHolder = new KeymapValuesHolder(); - this.view.setKeymapValuesHolder(keymapValuesHolder); - this.prefKeymaps = new KeymapValuesHolder(); - } - - @Override - public void storeChanges() { - keymapPrefReader.storePrefs(this.keymapValuesHolder); - for (final Entry entry : this.keymapValuesHolder) { - this.eventBus.fireEvent(new KeymapChangeEvent(entry.getKey().getEditorTypeKey(), entry.getValue().getKey())); - } - dirty = false; - } - - @Override - public void refresh() { - readPreferenceFromPreferenceManager(); - view.refresh(); - } - - protected void readPreferenceFromPreferenceManager() { - keymapPrefReader.readPref(prefKeymaps); - // init the default keymap - for (EditorType editorType : editorTypeRegistry.getEditorTypes()) { - List editorKeymaps = Keymap.getInstances(editorType); - if (editorKeymaps.size() > 0) { - keymapValuesHolder.setKeymap(editorType, editorKeymaps.get(0)); - } - } - for (final Entry entry : prefKeymaps) { - keymapValuesHolder.setKeymap(entry.getKey(), entry.getValue()); - } - } - - @Override - public boolean isDirty() { - return dirty; - } - - @Override - public void go(final AcceptsOneWidget container) { - container.setWidget(null); - readPreferenceFromPreferenceManager(); - container.setWidget(view); - } - - @Override - public void setParent(final ParentPresenter parent) { - this.parentPresenter = parent; - } - - @Override - public void editorKeymapChanged(final EditorType editorType, final Keymap keymap) { - if (editorType == null || keymap == null) { - return; - } - - dirty = false; - for (final Entry entry : this.keymapValuesHolder) { - final Keymap prefKeymap = prefKeymaps.getKeymap(entry.getKey()); - if (entry.getValue() == null) { - dirty = (prefKeymap != null); - } else { - dirty = !(entry.getValue().equals(prefKeymap)); - } - - if (dirty) { - break; - } - } - - parentPresenter.signalDirtyState(); - } - -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapSelectionCell.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapSelectionCell.java deleted file mode 100644 index 920fcc3d0b..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapSelectionCell.java +++ /dev/null @@ -1,131 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.preference.keymaps; - -import java.util.List; - -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import com.google.gwt.cell.client.AbstractInputCell; -import com.google.gwt.cell.client.SelectionCell; -import com.google.gwt.cell.client.ValueUpdater; -import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.BrowserEvents; -import com.google.gwt.dom.client.Element; -import com.google.gwt.dom.client.NativeEvent; -import com.google.gwt.dom.client.SelectElement; -import com.google.gwt.safehtml.client.SafeHtmlTemplates; -import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.safehtml.shared.SafeHtmlBuilder; - -public class KeymapSelectionCell extends AbstractInputCell { - - interface Template extends SafeHtmlTemplates { - @Template("") - SafeHtml deselected(String key, String display); - - @Template("") - SafeHtml selected(String key, String display); - - @Template(""); - } - - private int getIndex(final List keymapsForRow, final String viewData, final Keymap keymap) { - String value = viewData; - if (value == null) { - if (keymap != null) { - value = keymap.getKey(); - } else { - return -1; - } - } - for (int i = 0; i < keymapsForRow.size(); i++) { - final Keymap item = keymapsForRow.get(i); - if (item != null && item.getKey().equals(value)) { - return i; - } - } - return -1; - } - - private static void initTemplate() { - if (template == null) { - template = GWT.create(Template.class); - } - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapSelectionColumn.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapSelectionColumn.java deleted file mode 100644 index ddc00a2f92..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapSelectionColumn.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.preference.keymaps; - -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import org.eclipse.che.ide.jseditor.client.keymap.KeymapValuesHolder; -import org.eclipse.che.ide.util.loging.Log; -import com.google.gwt.cell.client.FieldUpdater; -import com.google.gwt.user.cellview.client.Column; - -public class KeymapSelectionColumn extends Column { - private final KeymapValuesHolder valuesHolder; - - public KeymapSelectionColumn(final KeymapValuesHolder valuesHolder, - final FieldUpdater fieldUpdater, - final String selectWidthStyle) { - super(new KeymapSelectionCell("gwt-ListBox", selectWidthStyle)); - this.valuesHolder = valuesHolder; - - setFieldUpdater(new FieldUpdater() { - - @Override - public void update(final int index, final EditorType editorType, final Keymap keymap) { - Log.debug(KeymapSelectionColumn.class, "Value update for editor " + editorType + " keymap=" + keymap); - KeymapSelectionColumn.this.valuesHolder.setKeymap(editorType, keymap); - fieldUpdater.update(index, editorType, keymap); - } - }); - } - - @Override - public Keymap getValue(final EditorType editorType) { - if (this.valuesHolder == null) { - return null; - } else { - return this.valuesHolder.getKeymap(editorType); - } - } - - public void setSelection(final EditorType key, final Keymap value) { - final KeymapSelectionCell cell = (KeymapSelectionCell)getCell(); - cell.setViewData(key, value.getKey()); - } - -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceViewImpl.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceViewImpl.java deleted file mode 100644 index d00ddbeb01..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/preference/keymaps/KeymapsPreferenceViewImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.preference.keymaps; - - -import java.util.Map.Entry; - -import javax.inject.Inject; - -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.editortype.EditorTypeRegistry; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import org.eclipse.che.ide.jseditor.client.keymap.KeymapValuesHolder; -import org.eclipse.che.ide.jseditor.client.preference.EditorPrefLocalizationConstant; -import org.eclipse.che.ide.jseditor.client.preference.EditorPreferenceResource; - -import com.google.gwt.cell.client.Cell.Context; -import com.google.gwt.cell.client.FieldUpdater; -import com.google.gwt.core.client.GWT; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.cellview.client.CellTable; -import com.google.gwt.user.cellview.client.HasKeyboardSelectionPolicy.KeyboardSelectionPolicy; -import com.google.gwt.user.cellview.client.TextColumn; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.FlowPanel; - -/** - * Implementation of the {@link KeymapsPreferenceView}. - */ -public class KeymapsPreferenceViewImpl extends Composite implements KeymapsPreferenceView { - - /** UI binder interface for the {@link KeymapsPreferenceViewImpl} component. */ - interface KeymapsPreferenceViewImplUiBinder extends UiBinder { - } - - /** The UI binder instance. */ - private static final KeymapsPreferenceViewImplUiBinder UIBINDER = GWT.create(KeymapsPreferenceViewImplUiBinder.class); - - private final EditorTypeRegistry editorTypeRegistry; - private final EditorPreferenceResource.CellStyle cellStyle; - - private KeymapSelectionColumn keymapSelectionColumn; - - private ActionDelegate delegate; - private KeymapValuesHolder valuesHolder; - - @UiField(provided = true) - EditorPrefLocalizationConstant constants; - - @UiField(provided = true) - CellTable keyBindingSelection; - - - @Inject - public KeymapsPreferenceViewImpl(final EditorTypeRegistry editorTypeRegistry, - final EditorPreferenceResource resources, - final EditorPrefLocalizationConstant constants) { - this.keyBindingSelection = new CellTable(5, resources); - - this.constants = constants; - - initWidget(UIBINDER.createAndBindUi(this)); - - this.editorTypeRegistry = editorTypeRegistry; - this.cellStyle = resources.cellStyle(); - - // build keybinding selection table - final TextColumn editorColumn = new TextColumn() { - @Override - public String getValue(final EditorType type) { - return editorTypeRegistry.getName(type); - } - - @Override - public String getCellStyleNames(final Context context, final EditorType object) { - return resources.cellStyle().prefCell() + " " + resources.cellStyle().firstColumn(); - } - }; - - // disable row selection - this.keyBindingSelection.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.DISABLED); - } - - @Override - public void setDelegate(final ActionDelegate delegate) { - this.delegate = delegate; - } - - private void handleEditorKeymapChanged(final EditorType editorType, final Keymap keymap) { - this.delegate.editorKeymapChanged(editorType, keymap); - } - - @Override - protected void onLoad() { - setSelectionFromValuesHolder(); - } - - protected void setSelectionFromValuesHolder() { - // delayed until the view is displayed - keyBindingSelection.setRowData(editorTypeRegistry.getEditorTypes()); - for (final Entry entry : this.valuesHolder) { - keymapSelectionColumn.setSelection(entry.getKey(), entry.getValue()); - } - keyBindingSelection.redraw(); - } - - public void setKeymapValuesHolder(final KeymapValuesHolder newValue) { - this.valuesHolder = newValue; - - final FieldUpdater fieldUpdater = new FieldUpdater() { - @Override - public void update(final int index, final EditorType object, final Keymap value) { - handleEditorKeymapChanged(object, value); - } - }; - - keymapSelectionColumn = new KeymapSelectionColumn(valuesHolder, fieldUpdater, cellStyle.selectWidth()); - keyBindingSelection.addColumn(keymapSelectionColumn); - } - - @Override - public void refresh() { - setSelectionFromValuesHolder(); - } - -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/DefaultEditorTypePrefReader.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/DefaultEditorTypePrefReader.java deleted file mode 100644 index 090e625c37..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/DefaultEditorTypePrefReader.java +++ /dev/null @@ -1,92 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.prefmodel; - -import static org.eclipse.che.ide.jseditor.client.JsEditorExtension.DEFAULT_EDITOR_TYPE_INSTANCE; - -import javax.inject.Inject; -import javax.inject.Named; - -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.util.loging.Log; - -/** Utilisty to read and store default editor preference. */ -public class DefaultEditorTypePrefReader { - - /** The 'defaut default' editor, used when there is no preference set. */ - private final EditorType defaultEditorType; - /** The component used to read/store the editor preferences. */ - private final EditorPreferenceReader preferenceReader; - - @Inject - public DefaultEditorTypePrefReader(final EditorPreferenceReader preferenceReader, - final @Named(DEFAULT_EDITOR_TYPE_INSTANCE) EditorType defaultEditorType) { - this.defaultEditorType = defaultEditorType; - this.preferenceReader = preferenceReader; - } - - /** - * Read the default editor type value from the preferences. - * @return the default editor type - */ - public EditorType readPref() { - final EditorPreferences editorPreferences = this.preferenceReader.getPreferences(); - return readPref(editorPreferences); - } - - /** - * Read the default editor type value from the given editor preferences object. - * @param editorPreferences the preferences object - * @return the default editor type - */ - public EditorType readPref(final EditorPreferences editorPreferences) { - if (editorPreferences == null || editorPreferences.getDefaultEditor() == null) { - return this.defaultEditorType; - } - final String editorKey = editorPreferences.getDefaultEditor(); - final EditorType editorType = EditorType.getInstance(editorKey); - if (editorType != null) { - return editorType; - } else { - return this.defaultEditorType; - } - } - - /** - * Store the default editor type value in the preferences - * @param editorType the new editor type - */ - public void storePref(final EditorType editorType) { - final EditorPreferences editorPreferences = this.preferenceReader.getPreferences(); - storePref(editorPreferences, editorType); - } - - /** - * Store the default editor type value in the given editor preferences object. - * @param editorPreferences the preferences object - * @param editorType the new editor type - */ - public void storePref(final EditorPreferences editorPreferences, - final EditorType editorType) { - if (editorType == null) { - Log.warn(DefaultEditorTypePrefReader.class, "Attempt to set 'null' for default editor - won't comply."); - return; - } - - EditorPreferences usedPreferences = editorPreferences; - if (usedPreferences == null) { - usedPreferences = EditorPreferences.create(); - } - usedPreferences.setDefaultEditor(editorType.getEditorTypeKey()); - - this.preferenceReader.setPreferences(usedPreferences); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/EditorPreferenceReader.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/EditorPreferenceReader.java deleted file mode 100644 index 7f4fc56766..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/EditorPreferenceReader.java +++ /dev/null @@ -1,93 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.prefmodel; - -import com.google.gwt.core.client.JavaScriptObject; -import com.google.gwt.json.client.JSONObject; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONValue; - -import org.eclipse.che.ide.api.preferences.PreferencesManager; -import org.eclipse.che.ide.util.loging.Log; - -import javax.inject.Inject; -import javax.validation.constraints.NotNull; - -/** - * Utility to read {@link EditorPreferences} from the preferences. - */ -public class EditorPreferenceReader { - - /** The editor preference main property name. */ - private static final String PREFERENCE_PROPERTY = "editor"; - - /** the preferences manager instance. */ - private final PreferencesManager preferencesManager; - - @Inject - public EditorPreferenceReader(final PreferencesManager preferencesManager) { - this.preferencesManager = preferencesManager; - } - - /** - * Retrieves the editor preference object as stored in the preference json string. - * @return the preference object or null - */ - private EditorPreferences getPreferencesOrNull() { - final String prefAsJson = this.preferencesManager.getValue(PREFERENCE_PROPERTY); - if (prefAsJson == null || prefAsJson.isEmpty()) { - return null; - } - JSONValue propertyObject; - try { - final JSONValue parseResult = JSONParser.parseStrict(prefAsJson); - propertyObject = parseResult.isObject(); - } catch (final RuntimeException e) { - Log.error(KeymapPrefReader.class, "Error during preference parsing.", e); - return null; - } - if (propertyObject == null) { - return null; - } - JavaScriptObject propertyValue; - try { - propertyValue = propertyObject.isObject().getJavaScriptObject(); - } catch (final RuntimeException e) { - Log.error(KeymapPrefReader.class, "Invalid value for editor preference.", e); - return null; - } - return propertyValue.cast(); - } - - /** - * Returns the editor preference object.
- * If there is none, return a properly initialized preference object. - * @return editor preference - */ - @NotNull - public EditorPreferences getPreferences() { - final EditorPreferences resultOrNull = getPreferencesOrNull(); - if (resultOrNull == null) { - return EditorPreferences.create(); - } else { - return resultOrNull; - } - } - - /** - * Stores the editor preference object in the preferences. - * @param newPreferences the pref object to store - */ - public void setPreferences(final EditorPreferences newPreferences) { - final JSONObject json = new JSONObject(newPreferences); - this.preferencesManager.setValue(PREFERENCE_PROPERTY, json.toString()); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/EditorPreferences.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/EditorPreferences.java deleted file mode 100644 index 5f42602fda..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/EditorPreferences.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.prefmodel; - -import com.google.gwt.core.client.JavaScriptObject; - -import elemental.js.util.JsMapFromStringToString; - -/** Data object for the editor preferences. */ -public class EditorPreferences extends JavaScriptObject { - - /** JSO required protected constructor. */ - protected EditorPreferences() {} - - /** - * Returns the default editor. - * @return the default editor - */ - public final native String getDefaultEditor() /*-{ - return this.defaultEditor; - }-*/; - - /** - * Sets the default editor. - * @param newValue the new choice - */ - public final native void setDefaultEditor(String newValue) /*-{ - return this.defaultEditor = newValue; - }-*/; - - /** - * Returns the selected key bindings. - * @return the key bindings - */ - public final native JsMapFromStringToString getKeymaps() /*-{ - return this.keymaps; - }-*/; - - /** - * Creates a default instance. - * @return an instance - */ - public static final native EditorPreferences create() /*-{ - return { - 'keymaps': {} - }; - }-*/; -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/KeymapPrefReader.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/KeymapPrefReader.java deleted file mode 100644 index b5431a6632..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/prefmodel/KeymapPrefReader.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.prefmodel; - -import java.util.Map.Entry; - -import javax.inject.Inject; - -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; -import org.eclipse.che.ide.jseditor.client.keymap.KeymapValuesHolder; - -import elemental.js.util.JsArrayOfString; -import elemental.js.util.JsMapFromStringToString; - -/** Utility class to read and store keymap preferences. */ -public class KeymapPrefReader { - - /** The editor preferences reader. */ - private final EditorPreferenceReader preferenceReader; - - @Inject - public KeymapPrefReader(final EditorPreferenceReader preferenceReader) { - this.preferenceReader = preferenceReader; - } - - /** - * Reads the keymap preference for the given editor. - * @param editorKey the editor key - * @return the keymap in preference or null if none is set - */ - public String readPref(final String editorKey) { - final EditorPreferences editorPreferences = this.preferenceReader.getPreferences(); - if (editorPreferences.getKeymaps() == null) { - return null; - } - return editorPreferences.getKeymaps().get(editorKey); - } - - /** - * Reads the keymap preferences and fills the {@link org.eclipse.che.ide.jseditor.client.keymap.KeymapValuesHolder} instance. - * @param valuesHolder the object that keeps the values - */ - public void readPref(final KeymapValuesHolder valuesHolder) { - final EditorPreferences editorPreferences = preferenceReader.getPreferences(); - readPref(editorPreferences, valuesHolder); - } - - /** - * Reads the keymap preferences and fills the {@link KeymapValuesHolder} instance using an already known - * {@link EditorPreferences} instance. - * @param valuesHolder the object that keeps the values - */ - public void readPref(final EditorPreferences editorPreferences, - final KeymapValuesHolder valuesHolder) { - if (editorPreferences == null || editorPreferences.getKeymaps() == null) { - return; - } - final JsMapFromStringToString keymaps = editorPreferences.getKeymaps(); - final JsArrayOfString entries = keymaps.keys(); - - for (int i = 0; i < entries.length(); i++) { - final String key = entries.get(i); - final String value = keymaps.get(key); - if (value == null) { - continue; - } - - EditorType editorType = null; - Keymap keymap = null; - - editorType = EditorType.getInstance(key); - keymap = Keymap.fromKey(value); - - if (editorType != null && keymap != null) { - valuesHolder.setKeymap(editorType, keymap); - } - } - } - - /** - * Updates the keymap in preferences. - * @param valuesHolder the object that contains the values to store - */ - public void storePrefs(final KeymapValuesHolder valuesHolder) { - final EditorPreferences preferences = this.preferenceReader.getPreferences(); - final JsMapFromStringToString keymaps = preferences.getKeymaps(); - - for (final Entry entry : valuesHolder) { - if (entry.getKey() != null && entry.getValue() != null) { - keymaps.put(entry.getKey().getEditorTypeKey(), entry.getValue().getKey()); - } - } - - this.preferenceReader.setPreferences(preferences); - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/ConfigurableTextEditor.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/ConfigurableTextEditor.java deleted file mode 100644 index 1c0b11125d..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/ConfigurableTextEditor.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.texteditor; - -import javax.validation.constraints.NotNull; - -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.jseditor.client.editorconfig.TextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.keymap.Keybinding; - -public interface ConfigurableTextEditor extends TextEditor { - - /** - * Initializes this editor with the configuration and document provider/ - * - * @param configuration - * the configuration of this editor. - * @param notificationManager - * the manager that provides showing notifications - */ - - void initialize(@NotNull TextEditorConfiguration configuration, - @NotNull NotificationManager notificationManager); - - - /** - * Returns the text editor configuration that was used for initialization. - * @return the text editor configuration - */ - TextEditorConfiguration getConfiguration(); - - /** - * Add an editor-spcific key binding. - * @param keybinding the key binding - */ - void addKeybinding(Keybinding keybinding); -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditor.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditor.java deleted file mode 100644 index a0d231a516..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditor.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.texteditor; - -import org.eclipse.che.ide.jseditor.client.editorconfig.EditorUpdateAction; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; -import org.eclipse.che.ide.texteditor.selection.CursorModelWithHandler; - -public interface EmbeddedTextEditor extends TextEditor, ConfigurableTextEditor { - - /** - * @return the text editor view implementation //todo need to introduce more simple way to use TextEditorPartView interface - */ - @Deprecated - EmbeddedTextEditorPartView getView(); - - /** Calls all editor update actions for this editor. */ - void refreshEditor(); - - /** - * Adds an editor update action for this editor. - * @param action the action to add - */ - void addEditorUpdateAction(EditorUpdateAction action); - - /** - * Returns the cursor model for the editor. - * @return the cursor model - */ - CursorModelWithHandler getCursorModel(); - - /** - * Returns a position converter relative to this editor (pixel coordinates <-> line char positions). - * - * @return a position converter - */ - PositionConverter getPositionConverter(); -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenterFactory.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenterFactory.java deleted file mode 100644 index 5d8b9846ad..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/EmbeddedTextEditorPresenterFactory.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.texteditor; - -/** - * Factory for {@link EmbeddedTextEditorPresenter} objects. - * @param the type of the editor - */ -public interface EmbeddedTextEditorPresenterFactory { - /** - * Create an instance of {@link EmbeddedTextEditorPresenter}. - * @param editorWidgetFactory the {@link EditorWidget} factory tu use - * @return a new {@link EmbeddedTextEditorPresenter} - */ - EmbeddedTextEditorPresenter createTextEditor(EditorWidgetFactory editorWidgetFactory); -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TemporaryKeybindingsManager.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TemporaryKeybindingsManager.java deleted file mode 100644 index 0d894d713d..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/texteditor/TemporaryKeybindingsManager.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.texteditor; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.che.ide.jseditor.client.keymap.Keybinding; - -/** Hold {@link org.eclipse.che.ide.jseditor.client.keymap.Keybinding} until the editor is ready to accept them. */ -public class TemporaryKeybindingsManager implements HasKeybindings { - - private final List bindings = new ArrayList<>(); - - /** {@inheritDoc} */ - @Override - public void addKeybinding(final Keybinding keybinding) { - this.bindings.add(keybinding); - } - - /** {@inheritDoc} */ - @Override - public void addKeybinding(Keybinding keybinding, String actionDescription) { - this.bindings.add(keybinding); - } - - /** {@inheritDoc} */ - public List getbindings() { - return this.bindings; - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/util/PrintMap.java b/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/util/PrintMap.java deleted file mode 100644 index 0a7260df51..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/util/PrintMap.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.util; - -import java.util.Map; -import java.util.Map.Entry; - -/** - * Utility to pretty-print maps. - * - * @author "Mickaël Leduque" - */ -public final class PrintMap { - - private PrintMap() { - } - - /** - * Pretty prints a map, using toString() on both the keys and values. - * - * @param map - * the map to pretty print - * @return the display of the map - */ - public static String printMap(final Map map) { - final ToStringConverter keyConverter = new ToStringConverter(); - final ToStringConverter valueConverter = new ToStringConverter(); - return printMap(map, keyConverter, valueConverter); - } - - /** - * Pretty prints a map, using toString() on both the values and the provided converter for the keys. - * - * @param map - * the map to pretty print - * @param keyConverter - * the converter for the keys - * @return the display of the map - */ - public static String printMap(final Map map, final Converter keyConverter) { - final ToStringConverter valueConverter = new ToStringConverter(); - return printMap(map, keyConverter, valueConverter); - } - - /** - * Pretty prints a map, using the provided converters for the keys and values. - * - * @param map - * the map to pretty print - * @param keyConverter - * the converter for the keys - * @param valueConverter - * the converter for the values - * @return the display of the map - */ - public static String printMap(final Map map, final Converter keyConverter, final Converter valueConverter) { - final StringBuilder sb = new StringBuilder("{ "); - String separator = ""; - for (final Entry entry : map.entrySet()) { - sb.append(separator); - sb.append(keyConverter.convert(entry.getKey())); - sb.append("=>"); - sb.append(valueConverter.convert(entry.getValue())); - separator = ", "; - } - sb.append(" }"); - return sb.toString(); - } - - /** - * Interface for the object to string converters used to pretty print the maps. - * - * @param - * the type of the objects to convert to String - * @author "Mickaël Leduque" - */ - public interface Converter { - String convert(U item); - } - - /** - * {@link Converter} that just uses {@link #toString()}. - * - * @param - * @author "Mickaël Leduque" - */ - public static class ToStringConverter implements Converter { - - @Override - public String convert(final U item) { - return item.toString(); - } - - } -} diff --git a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/JsEditor.gwt.xml b/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/JsEditor.gwt.xml deleted file mode 100644 index fbc2e82202..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/JsEditor.gwt.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - diff --git a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/CellStyle.css b/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/CellStyle.css deleted file mode 100644 index 0f76a0e28a..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/CellStyle.css +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * 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 - *******************************************************************************/ -/* style for CellTable cells. */ -.prefCell { - height: 2em; -} - -.firstColumn { - width: 12em; -} - -.selectWidth { - width: 7em; - margin: 3px 0 3px 0; -} diff --git a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/CellTable-properties.css b/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/CellTable-properties.css deleted file mode 100644 index d6f2ca8197..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/CellTable-properties.css +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * 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 - *******************************************************************************/ -@def selectionBorderWidth 2px; -.cellTableWidget { - border-collapse: collapse; -} - -.cellTableFirstColumn { -} - -.cellTableLastColumn { -} - -.cellTableHeader, .cellTableFooter { -} - -.cellTableCell { - padding: 2px 5px; - text-align: left; - overflow: hidden; - font-family: mainFontFamily; - font-size: secondaryTextFontSize; - text-shadow: 0px 1px 0px rgba(46, 46, 46, 0.5); - border-width: 0px; - border-style: solid; - border-color: #2f2f2f; - font-weight: normal; - color: mainFontColor; -} - -.cellTableHeader, .cellTableCell { - max-width: 190px; - word-wrap: normal; - white-space: nowrap; -} - -.cellTableFirstColumnFooter { -} - -.cellTableFirstColumnHeader { -} - -.cellTableLastColumnFooter { -} - -.cellTableLastColumnHeader { -} - -.cellTableSortableHeader { - cursor: pointer; - cursor: hand; -} - -.cellTableSortableHeader:hover { - color: cellHoveredRow; -} - -.cellTableSortedHeaderAscending { - -} - -.cellTableSortedHeaderDescending { - -} - -.cellTableEvenRow { -} - -.cellTableEvenRowCell { -} - -.cellTableOddRow { -} - -.cellTableOddRowCell { -} - -.cellTableHoveredRow { -} - -.cellTableHoveredRowCell { -} - -.cellTableKeyboardSelectedRow { -} - -.cellTableKeyboardSelectedRowCell { -} - -.cellTableSelectedRow { -} - -.cellTableSelectedRowCell { -} - -/** - * The keyboard selected cell is visible over selection. - */ -.cellTableKeyboardSelectedCell { - background-color: cellKeyboardSelectedRow; -} - -.cellTableLoading { - margin: 30px; -} - diff --git a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/editor-icon.svg b/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/editor-icon.svg deleted file mode 100644 index 32fcfad68f..0000000000 --- a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/preference/editor-icon.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - diff --git a/core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapterTest.java b/core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapterTest.java deleted file mode 100644 index 9f536ed074..0000000000 --- a/core/ide/che-core-ide-jseditor/src/test/java/org/eclipse/che/ide/jseditor/client/editoradapter/DefaultEditorAdapterTest.java +++ /dev/null @@ -1,474 +0,0 @@ -/******************************************************************************* - * 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.jseditor.client.editoradapter; - -import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.google.gwt.user.client.ui.IsWidget; -import com.google.gwt.user.client.ui.RequiresResize; -import com.google.gwt.user.client.ui.Widget; -import com.google.gwtmockito.GwtMockitoTestRunner; -import com.google.web.bindery.event.shared.EventBus; - -import org.eclipse.che.ide.api.editor.EditorInitException; -import org.eclipse.che.ide.api.editor.EditorInput; -import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.event.FileEvent; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.parts.PartPresenter; -import org.eclipse.che.ide.api.parts.PropertyListener; -import org.eclipse.che.ide.api.parts.WorkspaceAgent; -import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.api.selection.Selection; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.editorconfig.TextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.keymap.Keybinding; -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.jseditor.client.texteditor.ConfigurableTextEditor; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.vectomatic.dom.svg.ui.SVGImage; -import org.vectomatic.dom.svg.ui.SVGResource; - -import static org.eclipse.che.ide.api.editor.EditorAgent.OpenEditorCallback; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - - -/** - * Test of the Default editor adapter class. - * - * @author Igor Vinokur - */ -@RunWith(GwtMockitoTestRunner.class) -public class DefaultEditorAdapterTest { - - @Mock - private ConfigurableTextEditor textEditor; - - @Mock - private NestablePresenter nestedPresenter; - - @Mock - private EventBus eventBus; - - @Mock - private WorkspaceAgent workspaceAgent; - - @InjectMocks - private DefaultEditorAdapter defaultEditorAdapter; - - @Before - public void prepare() { - defaultEditorAdapter.setTextEditor(textEditor); - defaultEditorAdapter.setPresenter(nestedPresenter); - } - - @Test - public void shouldClose() { - defaultEditorAdapter.close(true); - verify(textEditor).close(true); - - reset(textEditor); - - defaultEditorAdapter.close(false); - verify(textEditor).close(false); - } - - @Test - public void shouldIsEditableCalled() { - when(textEditor.isEditable()).thenReturn(true); - assertTrue(defaultEditorAdapter.isEditable()); - - when(textEditor.isEditable()).thenReturn(false); - assertFalse(defaultEditorAdapter.isEditable()); - } - - @Test - public void shouldRevertToSaved() { - defaultEditorAdapter.doRevertToSaved(); - - verify(textEditor).doRevertToSaved(); - } - - @Test - public void shouldGetDocument() { - final Document document = mock(Document.class); - - when(textEditor.getDocument()).thenReturn(document); - - assertEquals(document, defaultEditorAdapter.getDocument()); - } - - @Test - public void shouldGetContentType() { - when(textEditor.getContentType()).thenReturn("ContentType"); - - assertEquals("ContentType", defaultEditorAdapter.getContentType()); - } - - @Test - public void shouldGetSelectedTextRange() { - final TextRange textRange = mock(TextRange.class); - - when(textEditor.getSelectedTextRange()).thenReturn(textRange); - - Assert.assertEquals(textRange, defaultEditorAdapter.getSelectedTextRange()); - } - - @Test - public void shouldGetSelectedLinearRange() { - final LinearRange linearRange = mock(LinearRange.class); - - when(textEditor.getSelectedLinearRange()).thenReturn(linearRange); - - assertEquals(linearRange, defaultEditorAdapter.getSelectedLinearRange()); - } - - @Test - public void shouldGetCursorPosition() { - final TextPosition textPosition = mock(TextPosition.class); - - when(textEditor.getCursorPosition()).thenReturn(textPosition); - - assertEquals(textPosition, defaultEditorAdapter.getCursorPosition()); - } - - @Test - public void shouldGetCursorOffset() { - when(textEditor.getCursorOffset()).thenReturn(15); - - assertEquals(15, defaultEditorAdapter.getCursorOffset()); - } - - @Test - public void shouldShowMessage() { - defaultEditorAdapter.showMessage("Message"); - - verify(textEditor).showMessage("Message"); - } - - @Test - public void shouldInit() throws EditorInitException { - final EditorInput input = mock(EditorInput.class); - final OpenEditorCallback editorCallback = mock(OpenEditorCallback.class); - - defaultEditorAdapter.init(input, editorCallback); - - verify(textEditor).init(input, editorCallback); - } - - @Test - public void shouldGetEditorInput() { - final EditorInput editorInput = mock(EditorInput.class); - - when(textEditor.getEditorInput()).thenReturn(editorInput); - - assertEquals(editorInput, defaultEditorAdapter.getEditorInput()); - } - - @Test - public void shouldDoSave() { - defaultEditorAdapter.doSave(); - - verify(textEditor).doSave(); - } - - @Test - public void shouldDoSaveWithCallback() { - final AsyncCallback callback = mock(AsyncCallback.class); - - defaultEditorAdapter.doSave(callback); - - verify(textEditor).doSave(callback); - } - - @Test - public void shouldDoSaveAs() { - defaultEditorAdapter.doSaveAs(); - - verify(textEditor).doSaveAs(); - } - - @Test - public void shouldFileChanged() { - defaultEditorAdapter.onFileChanged(); - - verify(textEditor).onFileChanged(); - } - - @Test - public void shouldIsDirtyCalled() { - when(textEditor.isDirty()).thenReturn(true); - assertTrue(defaultEditorAdapter.isDirty()); - - when(textEditor.isDirty()).thenReturn(false); - assertFalse(defaultEditorAdapter.isDirty()); - } - - @Test - public void shouldAddCloseHandler() { - final EditorPartPresenter.EditorPartCloseHandler closeHandler = mock(EditorPartPresenter.EditorPartCloseHandler.class); - - defaultEditorAdapter.addCloseHandler(closeHandler); - - verify(textEditor).addCloseHandler(closeHandler); - } - - @Test - public void shouldActivate() { - defaultEditorAdapter.activate(); - - verify(textEditor).activate(); - } - - @Test - public void shouldGetTitle() { - when(textEditor.getTitle()).thenReturn("Title"); - - assertTrue(defaultEditorAdapter.getTitle().equals("Title")); - } - - @Test - public void shouldGetTitleImage() { - ImageResource imageResource = mock(ImageResource.class); - - when(textEditor.getTitleImage()).thenReturn(imageResource); - - assertEquals(imageResource, defaultEditorAdapter.getTitleImage()); - } - - @Test - public void shouldGetTitleSVGImage() { - SVGResource svgResource = mock(SVGResource.class); - - when(textEditor.getTitleSVGImage()).thenReturn(svgResource); - - assertEquals(svgResource, defaultEditorAdapter.getTitleSVGImage()); - } - - @Test - public void shouldDecorateIcon() { - SVGImage svgImage = mock(SVGImage.class); - SVGImage inputSvgImage = mock(SVGImage.class); - - when(textEditor.decorateIcon(inputSvgImage)).thenReturn(svgImage); - - assertEquals(svgImage, defaultEditorAdapter.decorateIcon(inputSvgImage)); - } - - @Test - public void shouldGetTitleWidget() { - IsWidget isWidget = mock(IsWidget.class); - - when(textEditor.getTitleWidget()).thenReturn(isWidget); - - assertEquals(isWidget, defaultEditorAdapter.getTitleWidget()); - } - - @Test - public void shouldGetTitleToolTip() { - when(textEditor.getTitleToolTip()).thenReturn("TitleToolTip"); - - assertEquals("TitleToolTip", defaultEditorAdapter.getTitleToolTip()); - } - - @Test - public void shouldGetSize() { - when(textEditor.getSize()).thenReturn(15); - - assertEquals(15, defaultEditorAdapter.getSize()); - } - - @Test - public void shouldOpen() { - defaultEditorAdapter.onOpen(); - - verify(textEditor).onOpen(); - } - - @Test - public void shouldCloseWithCallback() { - final AsyncCallback callback = mock(AsyncCallback.class); - - defaultEditorAdapter.onClose(callback); - - verify(nestedPresenter).onClose(callback); - } - - @Test - public void shouldGetSelection() { - Selection selection = mock(Selection.class); - - when(textEditor.getSelection()).thenReturn(selection); - - assertEquals(selection, defaultEditorAdapter.getSelection()); - } - - @Test - public void shouldAddPropertyListener() { - ArgumentCaptor newListener = ArgumentCaptor.forClass(PropertyListener.class); - - final PropertyListener listener = mock(PropertyListener.class); - final PartPresenter partPresenter = mock(PartPresenter.class); - - defaultEditorAdapter.addPropertyListener(listener); - - verify(textEditor).addPropertyListener(newListener.capture()); - - newListener.getAllValues().get(0).propertyChanged(partPresenter, 5); - - verify(listener).propertyChanged(defaultEditorAdapter, 5); - } - - @Test - public void shouldGo() { - final AcceptsOneWidget container = mock(AcceptsOneWidget.class); - - defaultEditorAdapter.go(container); - - verify(nestedPresenter).go(defaultEditorAdapter.panel); - verify(container).setWidget(defaultEditorAdapter.panel); - } - - @Test - public void shouldInitialize() { - final TextEditorConfiguration configuration = mock(TextEditorConfiguration.class); - final NotificationManager notificationManager = mock(NotificationManager.class); - - defaultEditorAdapter.initialize(configuration, notificationManager); - - verify(textEditor).initialize(configuration, notificationManager); - } - - @Test - public void shouldGetConfiguration() { - final TextEditorConfiguration editorConfiguration = mock(TextEditorConfiguration.class); - - when(textEditor.getConfiguration()).thenReturn(editorConfiguration); - - assertEquals(editorConfiguration, defaultEditorAdapter.getConfiguration()); - } - - @Test - public void shouldSetTextEditor() { - final ConfigurableTextEditor textEditor = mock(ConfigurableTextEditor.class); - - defaultEditorAdapter.setTextEditor(textEditor); - - assertEquals(textEditor, defaultEditorAdapter.getTextEditor()); - } - - @Test - public void shouldGetTextEditor() { - assertEquals(textEditor, defaultEditorAdapter.getTextEditor()); - } - - @Test - public void shouldResize() { - //Needed to initialise widget of "RequiresResize" instance - abstract class DummyWidget extends Widget implements RequiresResize { - } - - DummyWidget widget = mock(DummyWidget.class); - - when(defaultEditorAdapter.panel.getWidget()).thenReturn(widget); - - defaultEditorAdapter.onResize(); - - verify(widget).onResize(); - } - - @Test - public void shouldAddKeybinding() { - final Keybinding keybinding = mock(Keybinding.class); - - defaultEditorAdapter.addKeybinding(keybinding); - - verify(textEditor).addKeybinding(keybinding); - } - - @Test - public void shouldGetUndoRedo() { - //Needed to initialise textEditor of "UndoableEditor" instance - abstract class DummyTextEditor implements UndoableEditor, ConfigurableTextEditor { - } - - ConfigurableTextEditor textEditor = mock(DummyTextEditor.class); - - defaultEditorAdapter.setTextEditor(textEditor); - defaultEditorAdapter.getUndoRedo(); - - verify((UndoableEditor)textEditor).getUndoRedo(); - - defaultEditorAdapter.setTextEditor(this.textEditor); - - assertTrue(defaultEditorAdapter.getUndoRedo() instanceof DummyHandlesUndoRedo); - } - - @Test - public void shouldCloseEventFiredUp() throws EditorInitException { - final FileEvent event = mock(FileEvent.class); - final VirtualFile file = mock(VirtualFile.class); - final EditorInput input = mock(EditorInput.class); - final OpenEditorCallback editorCallback = mock(OpenEditorCallback.class); - String path = "filePath"; - - when(input.getFile()).thenReturn(file); - when(event.getFile()).thenReturn(file); - when(file.getPath()).thenReturn(path); - when(event.getOperationType()).thenReturn(FileEvent.FileOperation.CLOSE); - - defaultEditorAdapter.init(input, editorCallback); - defaultEditorAdapter.onFileOperation(event); - - verify(workspaceAgent).removePart(defaultEditorAdapter); - } - - @Test - public void shouldOpenEventFiredUp() throws EditorInitException { - final FileEvent event = mock(FileEvent.class); - - when(event.getOperationType()).thenReturn(FileEvent.FileOperation.OPEN); - - defaultEditorAdapter.onFileOperation(event); - - verify(workspaceAgent, never()).removePart(defaultEditorAdapter); - } - - @Test - public void shouldSaveEventFiredUp() throws EditorInitException { - final FileEvent event = mock(FileEvent.class); - - when(event.getOperationType()).thenReturn(FileEvent.FileOperation.SAVE); - - defaultEditorAdapter.onFileOperation(event); - - verify(workspaceAgent, never()).removePart(defaultEditorAdapter); - } - -} - diff --git a/core/ide/che-core-ide-jseditor/src/test/resources/logback-test.xml b/core/ide/che-core-ide-jseditor/src/test/resources/logback-test.xml deleted file mode 100644 index 3e4776b834..0000000000 --- a/core/ide/che-core-ide-jseditor/src/test/resources/logback-test.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - %-41(%date[%.15thread]) %-45([%-5level] [%.30logger{30} %L]) - %msg%n - - - - - target/log/WSO2.log - - %-41(%date[%.15thread]) %-45([%-5level] [%.30logger{30} %L]) - %msg%n - - - - - - - - - diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/choice/ChoiceDialogPresenter.java b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/choice/ChoiceDialogPresenter.java index 63c139971b..c872d06406 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/choice/ChoiceDialogPresenter.java +++ b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/choice/ChoiceDialogPresenter.java @@ -14,7 +14,8 @@ import javax.validation.constraints.NotNull; import org.eclipse.che.commons.annotation.Nullable; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.ChoiceDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.IsWidget; diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialogPresenter.java b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialogPresenter.java index 5c72960e67..7a309b778c 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialogPresenter.java +++ b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialogPresenter.java @@ -10,8 +10,9 @@ *******************************************************************************/ package org.eclipse.che.ide.ui.dialogs.confirm; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.IsWidget; diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenter.java b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenter.java index d939ade414..33b5b64654 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenter.java +++ b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenter.java @@ -10,9 +10,11 @@ *******************************************************************************/ package org.eclipse.che.ide.ui.dialogs.input; +import org.eclipse.che.ide.api.dialogs.InputDialog; +import org.eclipse.che.ide.api.dialogs.InputValidator; import org.eclipse.che.ide.ui.UILocalizationConstant; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.InputCallback; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; diff --git a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogPresenter.java b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogPresenter.java index 12648b1833..5715f12b88 100644 --- a/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogPresenter.java +++ b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogPresenter.java @@ -10,19 +10,16 @@ *******************************************************************************/ package org.eclipse.che.ide.ui.dialogs.message; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.MessageDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.IsWidget; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; - import javax.validation.constraints.NotNull; import org.eclipse.che.commons.annotation.Nullable; -import static org.eclipse.che.ide.ui.dialogs.message.MessageDialogView.ActionDelegate; - /** * {@link MessageDialog} implementation. * diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/popup/PopupKeyDownListener.java b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/popup/PopupKeyDownListener.java similarity index 98% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/popup/PopupKeyDownListener.java rename to core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/popup/PopupKeyDownListener.java index 5e0d0ce7c7..1a7702bcff 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/popup/PopupKeyDownListener.java +++ b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/popup/PopupKeyDownListener.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.popup; +package org.eclipse.che.ide.ui.popup; import org.eclipse.che.ide.util.dom.Elements; import com.google.gwt.core.client.Scheduler; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/popup/PopupResources.java b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/popup/PopupResources.java similarity index 95% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/popup/PopupResources.java rename to core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/popup/PopupResources.java index 91b559ed49..c966f852b0 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/popup/PopupResources.java +++ b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/popup/PopupResources.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.popup; +package org.eclipse.che.ide.ui.popup; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/popup/PopupWidget.java b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/popup/PopupWidget.java similarity index 99% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/popup/PopupWidget.java rename to core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/popup/PopupWidget.java index b7e0fbc43d..ab0f401e74 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/popup/PopupWidget.java +++ b/core/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/popup/PopupWidget.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.popup; +package org.eclipse.che.ide.ui.popup; import elemental.dom.Element; import elemental.events.Event; diff --git a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/popup/popup.css b/core/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/popup/popup.css similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/popup/popup.css rename to core/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/popup/popup.css index 847032cd92..88e600d203 100644 --- a/core/ide/che-core-ide-jseditor/src/main/resources/org/eclipse/che/ide/jseditor/client/popup/popup.css +++ b/core/ide/che-core-ide-ui/src/main/resources/org/eclipse/che/ide/ui/popup/popup.css @@ -8,8 +8,6 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -/* TODO we have to merge AutocompleteComponents.css here */ - .popup { position: absolute; z-index: 1; diff --git a/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/BaseTest.java b/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/BaseTest.java index 1e7c2fe1a4..1dc0c3fa91 100644 --- a/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/BaseTest.java +++ b/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/BaseTest.java @@ -13,6 +13,9 @@ package org.eclipse.che.ide.ui.dialogs; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwtmockito.GwtMockitoTestRunner; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.InputCallback; import org.junit.Before; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java b/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java index 9ce0b8b26d..64b274fda1 100644 --- a/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java +++ b/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ui.dialogs.input; +import org.eclipse.che.ide.api.dialogs.InputValidator; import org.eclipse.che.ide.ui.UILocalizationConstant; import org.eclipse.che.ide.ui.dialogs.BaseTest; diff --git a/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogPresenterTest.java b/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogPresenterTest.java index 6cdc25b047..43047e4d9e 100644 --- a/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogPresenterTest.java +++ b/core/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogPresenterTest.java @@ -11,9 +11,8 @@ package org.eclipse.che.ide.ui.dialogs.message; import org.eclipse.che.ide.ui.dialogs.BaseTest; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/core/ide/pom.xml b/core/ide/pom.xml index 055f224545..20ba1ce955 100644 --- a/core/ide/pom.xml +++ b/core/ide/pom.xml @@ -27,7 +27,6 @@ che-core-ide-generators che-core-ide-ui che-core-ide-app - che-core-ide-jseditor che-core-ide-templates che-core-ide-stacks diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml index 4288d1991b..a6ac81dc6a 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml @@ -30,10 +30,6 @@ com.google.inject guice - - javax.inject - javax.inject - javax.validation validation-api @@ -54,10 +50,6 @@ org.eclipse.che.core che-core-ide-app - - org.eclipse.che.core - che-core-ide-jseditor - org.eclipse.che.plugin che-plugin-cpp-lang-shared diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/CppJsEditorExtension.java b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/CppJsEditorExtension.java deleted file mode 100644 index 1222bdf141..0000000000 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/CppJsEditorExtension.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * 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.plugin.cpp.ide; - -import com.google.inject.name.Named; - -import org.eclipse.che.ide.api.editor.EditorRegistry; -import org.eclipse.che.ide.api.extension.Extension; -import org.eclipse.che.ide.api.filetypes.FileType; -import org.eclipse.che.plugin.cpp.ide.editor.CEditorProvider; -import org.eclipse.che.plugin.cpp.ide.editor.CppEditorProvider; - -import javax.inject.Inject; - -@Extension(title = "C/C++ JS Editor") -public class CppJsEditorExtension { - - @Inject - public CppJsEditorExtension(final EditorRegistry editorRegistry, - final @Named("CFileType") FileType cFile, - final @Named("HFileType") FileType hFile, - final @Named("CppFileType") FileType classFile, - final CEditorProvider cEditorProvider, - final CppEditorProvider cppEditorProvider) { - // register editor provider - editorRegistry.registerDefaultEditor(cFile, cEditorProvider); - editorRegistry.registerDefaultEditor(hFile, cEditorProvider); - editorRegistry.registerDefaultEditor(classFile, cppEditorProvider); - editorRegistry.registerDefaultEditor(classFile, cppEditorProvider); - } -} diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/editor/CEditorProvider.java b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/editor/CEditorProvider.java deleted file mode 100644 index e2af0ba293..0000000000 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/editor/CEditorProvider.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * 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.plugin.cpp.ide.editor; - -import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.editor.EditorProvider; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.jseditor.client.defaulteditor.DefaultEditorProvider; -import org.eclipse.che.ide.jseditor.client.editorconfig.AutoSaveTextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; - -import javax.inject.Inject; - - -/** - * EditorProvider that provides a text editor configured for C source files. - * - * @author Vitalii Parfonov - */ -public class CEditorProvider implements EditorProvider { - - private final DefaultEditorProvider editorProvider; - private final NotificationManager notificationManager; - - - @Inject - public CEditorProvider(final DefaultEditorProvider editorProvider, - final NotificationManager notificationManager) { - this.editorProvider = editorProvider; - this.notificationManager = notificationManager; - } - - @Override - public String getId() { - return "CEditor"; - } - - @Override - public String getDescription() { - return "C Editor"; - } - - @Override - public EditorPartPresenter getEditor() { - final EditorPartPresenter textEditor = editorProvider.getEditor(); - if (textEditor instanceof EmbeddedTextEditorPresenter) { - final EmbeddedTextEditorPresenter editor = (EmbeddedTextEditorPresenter)textEditor; - editor.initialize(new AutoSaveTextEditorConfiguration(), notificationManager); - } - return textEditor; - } - -} diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/editor/CppEditorProvider.java b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/editor/CppEditorProvider.java deleted file mode 100644 index 2eb635209f..0000000000 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/editor/CppEditorProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * 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.plugin.cpp.ide.editor; - -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.jseditor.client.defaulteditor.DefaultEditorProvider; - -import javax.inject.Inject; - - -/** - * EditorProvider that provides a text editor configured for C++ source files. - * - * @author Vitalii Parfonov - */ -public class CppEditorProvider extends CEditorProvider { - - @Inject - public CppEditorProvider(final DefaultEditorProvider editorProvider, - final NotificationManager notificationManager) { - super(editorProvider, notificationManager); - } - - @Override - public String getId() { - return "CppEditor"; - } - - @Override - public String getDescription() { - return "C++ Editor"; - } -} diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/inject/CppGinModule.java b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/inject/CppGinModule.java index 549d0b620c..fefe1ac4db 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/inject/CppGinModule.java +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/java/org/eclipse/che/plugin/cpp/ide/inject/CppGinModule.java @@ -16,7 +16,6 @@ import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.name.Named; -import org.eclipse.che.ide.MimeType; import org.eclipse.che.ide.api.extension.ExtensionGinModule; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.project.type.wizard.ProjectWizardRegistrar; @@ -46,20 +45,20 @@ public class CppGinModule extends AbstractGinModule { @Singleton @Named("CFileType") protected FileType provideCFile() { - return new FileType("C", CppResources.INSTANCE.cFile(), MimeType.TEXT_C, C_EXT); + return new FileType(CppResources.INSTANCE.cFile(), C_EXT); } @Provides @Singleton @Named("CppFileType") protected FileType provideCppFile() { - return new FileType("C++", CppResources.INSTANCE.cppFile(), MimeType.TEXT_CPP, CPP_EXT); + return new FileType(CppResources.INSTANCE.cppFile(), CPP_EXT); } @Provides @Singleton @Named("HFileType") protected FileType provideHeaderFile() { - return new FileType("C Header", CppResources.INSTANCE.cHeaderFile(), MimeType.TEXT_H, H_EXT); + return new FileType(CppResources.INSTANCE.cHeaderFile(), H_EXT); } } diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml index ebabb50146..fa05245236 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml @@ -22,7 +22,6 @@ - diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/actions/DebugAction.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/actions/DebugAction.java index 227882a995..b418934a5c 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/actions/DebugAction.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/actions/DebugAction.java @@ -25,7 +25,7 @@ import org.eclipse.che.ide.debug.Debugger; import org.eclipse.che.ide.debug.DebuggerManager; import org.eclipse.che.ide.ext.debugger.client.DebuggerLocalizationConstant; import org.eclipse.che.ide.ext.debugger.client.DebuggerResources; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import java.util.Collections; import java.util.HashMap; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/actions/DeleteAllBreakpointsAction.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/actions/DeleteAllBreakpointsAction.java index 13f8d66ee3..61f951afd6 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/actions/DeleteAllBreakpointsAction.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/actions/DeleteAllBreakpointsAction.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; import org.eclipse.che.ide.api.action.ActionEvent; -import org.eclipse.che.ide.debug.BreakpointManager; +import org.eclipse.che.ide.api.debug.BreakpointManager; import org.eclipse.che.ide.ext.debugger.client.DebuggerLocalizationConstant; import org.eclipse.che.ide.ext.debugger.client.DebuggerResources; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/configuration/EditDebugConfigurationsPresenter.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/configuration/EditDebugConfigurationsPresenter.java index 0bcdf2bc14..29a1ffd9fb 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/configuration/EditDebugConfigurationsPresenter.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/configuration/EditDebugConfigurationsPresenter.java @@ -20,10 +20,10 @@ import org.eclipse.che.ide.api.debug.DebugConfigurationPage.DirtyStateListener; import org.eclipse.che.ide.api.debug.DebugConfigurationType; import org.eclipse.che.ide.api.debug.DebugConfigurationsManager; import org.eclipse.che.ide.ext.debugger.client.DebuggerLocalizationConstant; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.choice.ChoiceDialog; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ChoiceDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import java.util.ArrayList; import java.util.Collections; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/AbstractDebugger.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/AbstractDebugger.java index cdc2d8e46d..8a1d0f8b26 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/AbstractDebugger.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/AbstractDebugger.java @@ -28,7 +28,7 @@ import org.eclipse.che.api.promises.client.js.Promises; import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.debug.Breakpoint; +import org.eclipse.che.ide.api.debug.Breakpoint; import org.eclipse.che.ide.debug.Debugger; import org.eclipse.che.ide.debug.DebuggerDescriptor; import org.eclipse.che.ide.debug.DebuggerManager; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerPresenter.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerPresenter.java index b7e986d4c1..a2f15b9111 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerPresenter.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerPresenter.java @@ -26,9 +26,9 @@ import org.eclipse.che.ide.api.notification.StatusNotification; import org.eclipse.che.ide.api.parts.PartStackType; import org.eclipse.che.ide.api.parts.WorkspaceAgent; import org.eclipse.che.ide.api.parts.base.BasePresenter; -import org.eclipse.che.ide.debug.Breakpoint; -import org.eclipse.che.ide.debug.BreakpointManager; -import org.eclipse.che.ide.debug.BreakpointManagerObserver; +import org.eclipse.che.ide.api.debug.Breakpoint; +import org.eclipse.che.ide.api.debug.BreakpointManager; +import org.eclipse.che.ide.api.debug.BreakpointManagerObserver; import org.eclipse.che.ide.debug.Debugger; import org.eclipse.che.ide.debug.DebuggerDescriptor; import org.eclipse.che.ide.debug.DebuggerManager; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerView.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerView.java index 5dde137b65..9148a9740f 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerView.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerView.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import org.eclipse.che.ide.api.mvp.View; import org.eclipse.che.ide.api.parts.base.BaseActionDelegate; -import org.eclipse.che.ide.debug.Breakpoint; +import org.eclipse.che.ide.api.debug.Breakpoint; import org.eclipse.che.ide.ext.debugger.shared.Location; import javax.validation.constraints.NotNull; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerViewImpl.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerViewImpl.java index 039daa5beb..041fcebefd 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerViewImpl.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerViewImpl.java @@ -32,7 +32,7 @@ import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.ide.Resources; import org.eclipse.che.ide.api.parts.PartStackUIResources; import org.eclipse.che.ide.api.parts.base.BaseView; -import org.eclipse.che.ide.debug.Breakpoint; +import org.eclipse.che.ide.api.debug.Breakpoint; import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.ext.debugger.client.DebuggerLocalizationConstant; import org.eclipse.che.ide.ext.debugger.client.DebuggerResources; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/fqn/FqnResolverFactory.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/fqn/FqnResolverFactory.java index adc1c8962f..fd28151bc2 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/fqn/FqnResolverFactory.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/fqn/FqnResolverFactory.java @@ -34,8 +34,8 @@ public class FqnResolverFactory implements FqnResolverObservable { this.listeners = new LinkedList<>(); } - public void addResolver(@NotNull String mimeType, @NotNull FqnResolver resolver) { - resolvers.put(mimeType, resolver); + public void addResolver(@NotNull String fileExtension, @NotNull FqnResolver resolver) { + resolvers.put(fileExtension, resolver); onFqnResolverAdded(resolver); } @@ -46,8 +46,8 @@ public class FqnResolverFactory implements FqnResolverObservable { } @Nullable - public FqnResolver getResolver(@NotNull String mimeType) { - return resolvers.get(mimeType); + public FqnResolver getResolver(@NotNull String fileExtension) { + return resolvers.get(fileExtension); } @Override diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/actions/DebugActionTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/actions/DebugActionTest.java index c9edea1db5..2c1750af74 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/actions/DebugActionTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/actions/DebugActionTest.java @@ -20,7 +20,7 @@ import org.eclipse.che.ide.debug.Debugger; import org.eclipse.che.ide.debug.DebuggerManager; import org.eclipse.che.ide.ext.debugger.client.DebuggerLocalizationConstant; import org.eclipse.che.ide.ext.debugger.client.DebuggerResources; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerPresenterTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerPresenterTest.java index 52ab62400c..4cdecfff4b 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerPresenterTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerPresenterTest.java @@ -22,8 +22,8 @@ import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.parts.WorkspaceAgent; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.debug.Breakpoint; -import org.eclipse.che.ide.debug.BreakpointManager; +import org.eclipse.che.ide.api.debug.Breakpoint; +import org.eclipse.che.ide.api.debug.BreakpointManager; import org.eclipse.che.ide.debug.Debugger; import org.eclipse.che.ide.debug.DebuggerDescriptor; import org.eclipse.che.ide.debug.DebuggerManager; @@ -42,7 +42,6 @@ import org.mockito.Captor; import org.mockito.Mock; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; @@ -127,7 +126,7 @@ public class DebuggerPresenterTest extends BaseTest { presenter.onSelectedVariableElement(selectedVariable); FileType fileType = mock(FileType.class); - doReturn(Collections.singletonList("application/java")).when(fileType).getMimeTypes(); + doReturn("java").when(fileType).getExtension(); doReturn(fileType).when(fileTypeRegistry).getFileTypeByFile(eq(file)); } diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerTest.java index de42a0b868..bbe6327822 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerTest.java @@ -25,7 +25,7 @@ import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.debug.Breakpoint; +import org.eclipse.che.ide.api.debug.Breakpoint; import org.eclipse.che.ide.debug.DebuggerDescriptor; import org.eclipse.che.ide.debug.DebuggerManager; import org.eclipse.che.ide.debug.DebuggerObserver; @@ -186,7 +186,7 @@ public class DebuggerTest extends BaseTest { debugger.addObserver(observer); FileType fileType = mock(FileType.class); - doReturn(Collections.singletonList("application/java")).when(fileType).getMimeTypes(); + doReturn("java").when(fileType).getExtension(); doReturn(fileType).when(fileTypeRegistry).getFileTypeByFile(eq(file)); } diff --git a/plugins/plugin-docker/che-plugin-docker-ext-client/src/main/java/org/eclipse/che/plugin/docker/ext/client/manage/CredentialsPreferencesPresenter.java b/plugins/plugin-docker/che-plugin-docker-ext-client/src/main/java/org/eclipse/che/plugin/docker/ext/client/manage/CredentialsPreferencesPresenter.java index 19b71a8271..dfffcec509 100644 --- a/plugins/plugin-docker/che-plugin-docker-ext-client/src/main/java/org/eclipse/che/plugin/docker/ext/client/manage/CredentialsPreferencesPresenter.java +++ b/plugins/plugin-docker/che-plugin-docker-ext-client/src/main/java/org/eclipse/che/plugin/docker/ext/client/manage/CredentialsPreferencesPresenter.java @@ -19,8 +19,8 @@ import org.eclipse.che.api.user.gwt.client.UserProfileServiceClient; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.preferences.AbstractPreferencePagePresenter; import org.eclipse.che.ide.dto.DtoFactory; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.util.Base64; import org.eclipse.che.plugin.docker.client.dto.AuthConfig; import org.eclipse.che.plugin.docker.client.dto.AuthConfigs; @@ -59,7 +59,7 @@ public class CredentialsPreferencesPresenter extends AbstractPreferencePagePrese CredentialsDialogFactory credentialsDialogFactory, AppContext appContext, DialogFactory dialogFactory) { - super(locale.dockerPreferencesTitle(), locale.dockerPreferencesCategory(), null); + super(locale.dockerPreferencesTitle(), locale.dockerPreferencesCategory()); this.view = view; this.view.setDelegate(this); this.userProfileServiceClient = userProfileServiceClient; diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/java/org/eclipse/che/ide/gdb/client/GdbDebuggerFileHandler.java b/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/java/org/eclipse/che/ide/gdb/client/GdbDebuggerFileHandler.java index 4d89057347..bd3c49f028 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/java/org/eclipse/che/ide/gdb/client/GdbDebuggerFileHandler.java +++ b/plugins/plugin-gdb/che-plugin-gdb-ide/src/main/java/org/eclipse/che/ide/gdb/client/GdbDebuggerFileHandler.java @@ -26,9 +26,9 @@ import org.eclipse.che.ide.api.project.node.Node; import org.eclipse.che.ide.api.project.tree.VirtualFile; import org.eclipse.che.ide.ext.debugger.client.debug.ActiveFileHandler; import org.eclipse.che.ide.ext.debugger.client.debug.DebuggerPresenter; -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.texteditor.EmbeddedTextEditorPresenter; +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.texteditor.TextEditorPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.FileReferenceNode; import org.eclipse.che.ide.util.loging.Log; @@ -73,7 +73,7 @@ public class GdbDebuggerFileHandler implements ActiveFileHandler { openFile(className, filePaths, 0, new AsyncCallback() { @Override public void onSuccess(VirtualFile result) { - scrollEditorToExecutionPoint((EmbeddedTextEditorPresenter)editorAgent.getActiveEditor(), lineNumber); + scrollEditorToExecutionPoint((TextEditorPresenter)editorAgent.getActiveEditor(), lineNumber); callback.onSuccess(result); } @@ -83,7 +83,7 @@ public class GdbDebuggerFileHandler implements ActiveFileHandler { } }); } else { - scrollEditorToExecutionPoint((EmbeddedTextEditorPresenter)activeEditor, lineNumber); + scrollEditorToExecutionPoint((TextEditorPresenter)activeEditor, lineNumber); callback.onSuccess(activeFile); } } @@ -151,7 +151,7 @@ public class GdbDebuggerFileHandler implements ActiveFileHandler { }); } - private void scrollEditorToExecutionPoint(EmbeddedTextEditorPresenter editor, int lineNumber) { + private void scrollEditorToExecutionPoint(TextEditorPresenter editor, int lineNumber) { Document document = editor.getDocument(); if (document != null) { diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java index 37a6383810..931aef29f2 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java @@ -28,8 +28,8 @@ import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.ResourceBasedNode; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.StringUnmarshaller; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import java.util.Collections; import java.util.HashMap; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/DeleteRepositoryAction.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/DeleteRepositoryAction.java index b31386777c..92c1acacc7 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/DeleteRepositoryAction.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/DeleteRepositoryAction.java @@ -19,8 +19,8 @@ import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant; import org.eclipse.che.ide.ext.git.client.GitResources; import org.eclipse.che.ide.ext.git.client.delete.DeleteRepositoryPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; /** @author Andrey Plotnikov */ @Singleton diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/InitRepositoryAction.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/InitRepositoryAction.java index 664079e95e..578604fb1a 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/InitRepositoryAction.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/InitRepositoryAction.java @@ -19,8 +19,8 @@ import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant; import org.eclipse.che.ide.ext.git.client.GitResources; import org.eclipse.che.ide.ext.git.client.init.InitRepositoryPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java index c8dbb6be40..9d907fbd25 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java @@ -42,9 +42,9 @@ import org.eclipse.che.ide.extension.machine.client.processes.ConsolesPanelPrese import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.InputCallback; import javax.validation.constraints.NotNull; import java.util.List; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.java index 8ce18586bf..fad0326a7a 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.java @@ -18,8 +18,8 @@ import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant; import org.eclipse.che.api.git.shared.Branch; import org.eclipse.che.ide.ext.git.client.GitResources; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.ui.list.SimpleList; import org.eclipse.che.ide.ui.window.Window; import org.eclipse.che.ide.util.dom.Elements; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java index bcb19e76eb..5b205bccfc 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java @@ -32,8 +32,8 @@ import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.util.loging.Log; import org.eclipse.che.ide.websocket.WebSocketException; import org.eclipse.che.ide.websocket.rest.RequestCallback; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/ComparePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/ComparePresenter.java index 4759831618..1ee5fd0873 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/ComparePresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/ComparePresenter.java @@ -25,9 +25,9 @@ import org.eclipse.che.ide.ext.git.client.compare.FileStatus.Status; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.StringUnmarshaller; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.NOT_EMERGE_MODE; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/branchList/BranchListPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/branchList/BranchListPresenter.java index e622e3bc41..af903d233e 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/branchList/BranchListPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/branchList/BranchListPresenter.java @@ -33,8 +33,8 @@ import org.eclipse.che.ide.project.node.ResourceBasedNode; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.StringUnmarshaller; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; import java.util.Collections; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/revisionsList/RevisionListPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/revisionsList/RevisionListPresenter.java index 5f42e6f954..43c762e95b 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/revisionsList/RevisionListPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/revisionsList/RevisionListPresenter.java @@ -28,8 +28,8 @@ import org.eclipse.che.ide.ext.git.client.compare.ComparePresenter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.StringUnmarshaller; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; import java.util.Collections; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenter.java index 706c2f41f6..9f8fd327a0 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenter.java @@ -43,7 +43,7 @@ import org.eclipse.che.ide.extension.machine.client.processes.ConsolesPanelPrese import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.StringUnmarshaller; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.vectomatic.dom.svg.ui.SVGResource; import javax.validation.constraints.NotNull; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java index b69e7b6f40..748a9f78e5 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java @@ -33,8 +33,8 @@ import org.eclipse.che.ide.extension.machine.client.processes.ConsolesPanelPrese import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; import java.util.ArrayList; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/preference/CommitterPreferencePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/preference/CommitterPreferencePresenter.java index d7f20a842b..189ba8aae7 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/preference/CommitterPreferencePresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/preference/CommitterPreferencePresenter.java @@ -39,7 +39,7 @@ public class CommitterPreferencePresenter extends AbstractPreferencePagePresente public CommitterPreferencePresenter(CommitterPreferenceView view, GitLocalizationConstant constant, PreferencesManager preferencesManager) { - super(constant.committerTitle(), constant.committerPreferenceCategory(), null); + super(constant.committerTitle(), constant.committerPreferenceCategory()); this.view = view; this.preferencesManager = preferencesManager; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/pull/PullPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/pull/PullPresenter.java index 95a27041cf..1877280bcb 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/pull/PullPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/pull/PullPresenter.java @@ -35,7 +35,7 @@ import org.eclipse.che.ide.extension.machine.client.processes.ConsolesPanelPrese import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; import java.util.List; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/RemoteViewImpl.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/RemoteViewImpl.java index f09418c113..1e97ce3439 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/RemoteViewImpl.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/RemoteViewImpl.java @@ -14,8 +14,8 @@ import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant; import org.eclipse.che.api.git.shared.Remote; import org.eclipse.che.ide.ext.git.client.GitResources; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.ui.window.Window; import com.google.gwt.cell.client.Cell; import com.google.gwt.cell.client.TextCell; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java index b70fa69b7c..78386037e1 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java @@ -29,7 +29,7 @@ import org.eclipse.che.ide.ext.git.client.outputconsole.GitOutputConsoleFactory; import org.eclipse.che.ide.extension.machine.client.processes.ConsolesPanelPresenter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java index 00a8b30abb..a0fc301152 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java @@ -26,7 +26,7 @@ import org.eclipse.che.ide.ext.git.client.outputconsole.GitOutputConsoleFactory; import org.eclipse.che.ide.extension.machine.client.processes.ConsolesPanelPresenter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import java.util.ArrayList; import java.util.List; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java index b4a4980427..2b1d3bf428 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java @@ -26,7 +26,7 @@ import org.eclipse.che.ide.ext.git.client.outputconsole.GitOutputConsoleFactory; import org.eclipse.che.ide.extension.machine.client.processes.ConsolesPanelPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.junit.Before; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java index 0a92c6601d..eb5f03cc1f 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java @@ -26,11 +26,11 @@ import org.eclipse.che.ide.api.project.tree.VirtualFile; import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.ext.git.client.BaseTest; import org.eclipse.che.ide.rest.AsyncRequestCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.InputCallback; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; -import org.eclipse.che.ide.ui.dialogs.input.InputDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.InputDialog; import org.eclipse.che.test.GwtReflectionUtils; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenterTest.java index ee99115684..fbf6645097 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenterTest.java @@ -17,8 +17,8 @@ import org.eclipse.che.api.git.shared.ResetRequest; import org.eclipse.che.api.git.shared.Status; import org.eclipse.che.ide.ext.git.client.BaseTest; import org.eclipse.che.ide.rest.AsyncRequestCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.message.MessageDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.MessageDialog; import org.junit.Test; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; diff --git a/plugins/plugin-git/che-plugin-git-ssh-client/src/main/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenter.java b/plugins/plugin-git/che-plugin-git-ssh-client/src/main/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenter.java index 797cfefd3f..144efbb0f6 100644 --- a/plugins/plugin-git/che-plugin-git-ssh-client/src/main/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ssh-client/src/main/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenter.java @@ -28,10 +28,10 @@ import org.eclipse.che.ide.ext.git.ssh.client.GitSshKeyUploaderRegistry; import org.eclipse.che.ide.ext.git.ssh.client.SshKeyUploader; import org.eclipse.che.ide.ext.git.ssh.client.SshLocalizationConstant; import org.eclipse.che.ide.ext.git.ssh.client.upload.UploadSshKeyPresenter; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.InputCallback; import javax.validation.constraints.NotNull; import java.util.List; @@ -68,7 +68,7 @@ public class SshKeyManagerPresenter extends AbstractPreferencePagePresenter impl NotificationManager notificationManager, DialogFactory dialogFactory, GitSshKeyUploaderRegistry registry) { - super(constant.sshManagerTitle(), constant.sshManagerCategory(), null); + super(constant.sshManagerTitle(), constant.sshManagerCategory()); this.view = view; this.appContext = appContext; diff --git a/plugins/plugin-git/che-plugin-git-ssh-client/src/test/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenterTest.java b/plugins/plugin-git/che-plugin-git-ssh-client/src/test/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenterTest.java index 462f95e14c..4d3ef311bd 100644 --- a/plugins/plugin-git/che-plugin-git-ssh-client/src/test/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ssh-client/src/test/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenterTest.java @@ -30,13 +30,13 @@ import org.eclipse.che.ide.ext.git.ssh.client.SshLocalizationConstant; import org.eclipse.che.ide.ext.git.ssh.client.SshResources; import org.eclipse.che.ide.ext.git.ssh.client.upload.UploadSshKeyPresenter; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.InputCallback; -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 org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.InputDialog; +import org.eclipse.che.ide.api.dialogs.MessageDialog; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/GitHubSshKeyUploader.java b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/GitHubSshKeyUploader.java index 09810b3e8d..2f3776f413 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/GitHubSshKeyUploader.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/GitHubSshKeyUploader.java @@ -23,9 +23,9 @@ import org.eclipse.che.ide.commons.exception.UnauthorizedException; import org.eclipse.che.ide.ext.git.ssh.client.SshKeyUploader; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.RestContext; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.security.oauth.JsOAuthWindow; import org.eclipse.che.security.oauth.OAuthCallback; import org.eclipse.che.security.oauth.OAuthStatus; diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java index f1d9bb087e..8ee4c20bed 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java @@ -29,7 +29,7 @@ import org.eclipse.che.ide.ext.git.ssh.client.GitSshKeyUploaderRegistry; import org.eclipse.che.ide.ext.git.ssh.client.SshKeyUploader; import org.eclipse.che.ide.ext.git.ssh.client.manage.SshKeyManagerPresenter; import org.eclipse.che.ide.rest.RestContext; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.util.loging.Log; import org.eclipse.che.plugin.github.ide.GitHubLocalizationConstant; import org.eclipse.che.security.oauth.JsOAuthWindow; diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorViewImpl.java b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorViewImpl.java index 7aa6c11fa5..8f67f87720 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorViewImpl.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorViewImpl.java @@ -19,9 +19,9 @@ import com.google.inject.Inject; import org.eclipse.che.ide.api.ProductInfoDataProvider; import org.eclipse.che.plugin.github.ide.GitHubLocalizationConstant; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; /** * @author Roman Nikitenko diff --git a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java index 07e26e277e..8b2e9be42f 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java @@ -27,9 +27,9 @@ import org.eclipse.che.ide.ext.git.ssh.client.GitSshKeyUploaderRegistry; import org.eclipse.che.ide.ext.git.ssh.client.SshKeyUploader; import org.eclipse.che.ide.ext.git.ssh.client.manage.SshKeyManagerPresenter; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.message.MessageDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.MessageDialog; import org.eclipse.che.plugin.github.ide.GitHubLocalizationConstant; import org.eclipse.che.security.oauth.OAuthStatus; import org.junit.Before; diff --git a/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/JavaRuntimeExtension.java b/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/JavaRuntimeExtension.java index 7cbc74d0dd..573f8c840c 100644 --- a/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/JavaRuntimeExtension.java +++ b/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/JavaRuntimeExtension.java @@ -15,14 +15,10 @@ import com.google.inject.Singleton; import org.eclipse.che.ide.api.extension.Extension; import org.eclipse.che.ide.debug.DebuggerManager; -import org.eclipse.che.ide.ext.java.jdi.client.debug.JavaDebugger; import org.eclipse.che.ide.ext.debugger.client.fqn.FqnResolverFactory; -import org.eclipse.che.ide.ext.java.jdi.client.fqn.JavaFqnResolver; +import org.eclipse.che.ide.ext.java.jdi.client.debug.JavaDebugger; import org.eclipse.che.ide.ext.java.jdi.client.fqn.JavaClassFqnResolver; - -import static org.eclipse.che.ide.MimeType.APPLICATION_JAVA_CLASS; -import static org.eclipse.che.ide.MimeType.TEXT_X_JAVA; -import static org.eclipse.che.ide.MimeType.TEXT_X_JAVA_SOURCE; +import org.eclipse.che.ide.ext.java.jdi.client.fqn.JavaFqnResolver; /** * Extension allows debug Java web applications. @@ -44,9 +40,7 @@ public class JavaRuntimeExtension { JavaFqnResolver javaFqnResolver, JavaClassFqnResolver javaClassFqnResolver) { debuggerManager.registeredDebugger(JavaDebugger.ID, javaDebugger); - resolverFactory.addResolver(TEXT_X_JAVA, javaFqnResolver); - resolverFactory.addResolver("application/java", javaFqnResolver); - resolverFactory.addResolver(APPLICATION_JAVA_CLASS, javaClassFqnResolver); - resolverFactory.addResolver(TEXT_X_JAVA_SOURCE, javaFqnResolver); + resolverFactory.addResolver("java", javaFqnResolver); + resolverFactory.addResolver("class", javaClassFqnResolver); } } diff --git a/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/debug/JavaDebugger.java b/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/debug/JavaDebugger.java index 2988a70319..f9f8d23f31 100644 --- a/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/debug/JavaDebugger.java +++ b/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/debug/JavaDebugger.java @@ -89,14 +89,11 @@ public class JavaDebugger extends AbstractDebugger { @Override protected String pathToFqn(VirtualFile file) { - List mimeTypes = fileTypeRegistry.getFileTypeByFile(file).getMimeTypes(); + String fileExtension = fileTypeRegistry.getFileTypeByFile(file).getExtension(); - if (!mimeTypes.isEmpty()) { - String mediaType = mimeTypes.get(0); - FqnResolver resolver = fqnResolverFactory.getResolver(mediaType); - if (resolver != null) { - return resolver.resolveFqn(file); - } + FqnResolver resolver = fqnResolverFactory.getResolver(fileExtension); + if (resolver != null) { + return resolver.resolveFqn(file); } return null; diff --git a/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/debug/JavaDebuggerFileHandler.java b/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/debug/JavaDebuggerFileHandler.java index 7ea644a3b1..4352444877 100644 --- a/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/debug/JavaDebuggerFileHandler.java +++ b/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/debug/JavaDebuggerFileHandler.java @@ -32,9 +32,9 @@ import org.eclipse.che.ide.ext.debugger.client.debug.DebuggerPresenter; import org.eclipse.che.ide.ext.java.client.project.node.JavaNodeManager; import org.eclipse.che.ide.ext.java.client.project.node.jar.JarFileNode; import org.eclipse.che.ide.ext.java.shared.JarEntry; -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.texteditor.EmbeddedTextEditorPresenter; +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.texteditor.TextEditorPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.FileReferenceNode; import org.eclipse.che.ide.util.loging.Log; @@ -96,7 +96,7 @@ public class JavaDebuggerFileHandler implements ActiveFileHandler { openFile(className, filePaths, 0, new AsyncCallback() { @Override public void onSuccess(VirtualFile result) { - scrollEditorToExecutionPoint((EmbeddedTextEditorPresenter)editorAgent.getActiveEditor(), lineNumber); + scrollEditorToExecutionPoint((TextEditorPresenter)editorAgent.getActiveEditor(), lineNumber); callback.onSuccess(result); } @@ -106,7 +106,7 @@ public class JavaDebuggerFileHandler implements ActiveFileHandler { } }); } else { - scrollEditorToExecutionPoint((EmbeddedTextEditorPresenter)activeEditor, lineNumber); + scrollEditorToExecutionPoint((TextEditorPresenter)activeEditor, lineNumber); callback.onSuccess(activeFile); } } @@ -195,7 +195,7 @@ public class JavaDebuggerFileHandler implements ActiveFileHandler { }); } - private void scrollEditorToExecutionPoint(EmbeddedTextEditorPresenter editor, int lineNumber) { + private void scrollEditorToExecutionPoint(TextEditorPresenter editor, int lineNumber) { Document document = editor.getDocument(); if (document != null) { diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml index 4982afcae9..fcd038be8f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml @@ -82,10 +82,6 @@ org.eclipse.che.core che-core-ide-app - - org.eclipse.che.core - che-core-ide-jseditor - org.eclipse.che.core che-core-ide-ui diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/JavaJsEditorExtension.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/JavaEditorExtension.java similarity index 69% rename from plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/JavaJsEditorExtension.java rename to plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/JavaEditorExtension.java index 0a32a20f41..fbeb1554cd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/JavaJsEditorExtension.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/JavaEditorExtension.java @@ -19,15 +19,15 @@ import org.eclipse.che.ide.ext.java.client.editor.JsJavaEditorProvider; import javax.inject.Inject; -@Extension(title = "Java JS Editor", version = "3.1.0") -public class JavaJsEditorExtension { +@Extension(title = "Java Editor", version = "3.1.0") +public class JavaEditorExtension { @Inject - public JavaJsEditorExtension(final EditorRegistry editorRegistry, - final @Named("JavaFileType") FileType javaFile, - final @Named("JavaClassFileType") FileType classFile, - final JsJavaEditorProvider javaEditorProvider, - final JavaResources javaResources, Resources resources) { + public JavaEditorExtension(final EditorRegistry editorRegistry, + final @Named("JavaFileType") FileType javaFile, + final @Named("JavaClassFileType") FileType classFile, + final JsJavaEditorProvider javaEditorProvider, + final JavaResources javaResources, Resources resources) { // register editor provider editorRegistry.registerDefaultEditor(javaFile, javaEditorProvider); editorRegistry.registerDefaultEditor(classFile, javaEditorProvider); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/FindUsagesAction.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/FindUsagesAction.java index 87aaa3b1c2..77e53f6b79 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/FindUsagesAction.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/FindUsagesAction.java @@ -20,7 +20,7 @@ import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.search.FindUsagesPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; /** * Action invoked 'find usages' search for java elements diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/JavaEditorAction.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/JavaEditorAction.java index 9b7058fca3..d597996ecc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/JavaEditorAction.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/JavaEditorAction.java @@ -10,22 +10,14 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.client.action; -import com.google.api.client.util.Collections2; -import com.google.common.collect.Lists; - -import org.eclipse.che.ide.MimeType; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.action.ProjectAction; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorInput; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.util.loging.Log; import org.vectomatic.dom.svg.ui.SVGResource; -import java.util.Collections; -import java.util.List; - /** * Base action for Java editor related action. * @@ -55,14 +47,8 @@ public abstract class JavaEditorAction extends ProjectAction { if (editorAgent.getActiveEditor() != null) { EditorInput input = editorAgent.getActiveEditor().getEditorInput(); VirtualFile file = input.getFile(); - final List mimeTypes = fileTypeRegistry.getFileTypeByFile(file).getMimeTypes(); - if (mimeTypes == null || mimeTypes.isEmpty()) { - return; - } - String mediaType = mimeTypes.get(0); - if (mediaType != null && (mediaType.equals(MimeType.TEXT_X_JAVA) || - mediaType.equals(MimeType.TEXT_X_JAVA_SOURCE) || - mediaType.equals(MimeType.APPLICATION_JAVA_CLASS))) { + final String fileExtension = fileTypeRegistry.getFileTypeByFile(file).getExtension(); + if (fileExtension.equals("java") || fileExtension.equals("class")) { e.getPresentation().setEnabledAndVisible(true); return; } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/NewPackageAction.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/NewPackageAction.java index 0822363268..bb674587fb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/NewPackageAction.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/NewPackageAction.java @@ -30,9 +30,9 @@ import org.eclipse.che.ide.json.JsonHelper; import org.eclipse.che.ide.newresource.AbstractNewResourceAction; import org.eclipse.che.ide.project.node.FolderReferenceNode; import org.eclipse.che.ide.rest.AsyncRequestCallback; -import org.eclipse.che.ide.ui.dialogs.InputCallback; -import org.eclipse.che.ide.ui.dialogs.input.InputDialog; -import org.eclipse.che.ide.ui.dialogs.input.InputValidator; +import org.eclipse.che.ide.api.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.InputDialog; +import org.eclipse.che.ide.api.dialogs.InputValidator; import javax.validation.constraints.NotNull; import java.util.List; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/OpenImplementationAction.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/OpenImplementationAction.java index 8b72ca6c65..910a9afee7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/OpenImplementationAction.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/OpenImplementationAction.java @@ -18,7 +18,7 @@ import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.navigation.openimplementation.OpenImplementationPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; /** * Action which is opened the implementations of selected JAva Element. diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/ParametersHintsAction.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/ParametersHintsAction.java index 979f6f51b8..1fd3efea5d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/ParametersHintsAction.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/ParametersHintsAction.java @@ -19,7 +19,7 @@ import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.navigation.paraminfo.ParametersHintsPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; /** * @author Dmitry Shnurenko @@ -42,10 +42,10 @@ public class ParametersHintsAction extends JavaEditorAction { @Override public void actionPerformed(ActionEvent event) { EditorPartPresenter activeEditor = editorAgent.getActiveEditor(); - if (!(activeEditor instanceof EmbeddedTextEditorPresenter)) { + if (!(activeEditor instanceof TextEditorPresenter)) { return; } - parametersHintsPresenter.show((EmbeddedTextEditorPresenter)activeEditor); + parametersHintsPresenter.show((TextEditorPresenter)activeEditor); } } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/QuickDocumentationAction.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/QuickDocumentationAction.java index 87ee00a309..528acbf151 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/QuickDocumentationAction.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/QuickDocumentationAction.java @@ -20,8 +20,8 @@ import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.JavaResources; import org.eclipse.che.ide.ext.java.client.documentation.QuickDocumentation; -import org.eclipse.che.ide.jseditor.client.codeassist.HasCompletionInformation; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.codeassist.HasCompletionInformation; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; /** * @author Evgen Vidolob @@ -51,8 +51,8 @@ public class QuickDocumentationAction extends JavaEditorAction { if(activeEditor == null){ return; } - if(activeEditor instanceof EmbeddedTextEditorPresenter && activeEditor instanceof HasCompletionInformation) { - if (((EmbeddedTextEditorPresenter)activeEditor).isCompletionProposalsShowing() ) { + if(activeEditor instanceof TextEditorPresenter && activeEditor instanceof HasCompletionInformation) { + if (((TextEditorPresenter)activeEditor).isCompletionProposalsShowing() ) { ((HasCompletionInformation)activeEditor).showCompletionInformation(); return; } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/QuickFixAction.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/QuickFixAction.java index a8517c2464..22d9eadd60 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/QuickFixAction.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/action/QuickFixAction.java @@ -18,7 +18,7 @@ import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; /** * Action to show Quick fix in editor. @@ -45,8 +45,8 @@ public class QuickFixAction extends JavaEditorAction { if(activeEditor == null){ return; } - if(activeEditor instanceof EmbeddedTextEditorPresenter) { - ((EmbeddedTextEditorPresenter)activeEditor).showQuickAssist(); + if(activeEditor instanceof TextEditorPresenter) { + ((TextEditorPresenter)activeEditor).showQuickAssist(); } } } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/document/FormatterDocument.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/document/FormatterDocument.java index c7ef532017..2977de7b1d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/document/FormatterDocument.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/document/FormatterDocument.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.ext.java.client.document; import org.eclipse.che.ide.ext.java.jdt.text.AbstractDocument; import org.eclipse.che.ide.ext.java.jdt.text.ConfigurableLineTracker; -import org.eclipse.che.ide.jseditor.client.document.Document; +import org.eclipse.che.ide.api.editor.document.Document; /** * This class realises adapter for manipulation object with type diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/document/FormatterStore.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/document/FormatterStore.java index cd98575350..bd0c188881 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/document/FormatterStore.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/document/FormatterStore.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.ext.java.client.document; import org.eclipse.che.ide.ext.java.jdt.text.TextStore; -import org.eclipse.che.ide.jseditor.client.document.Document; +import org.eclipse.che.ide.api.editor.document.Document; /** * Provides access to the stored text into document and allows to manipulate it. diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java index 136d76ba9d..448451fccd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java @@ -17,8 +17,8 @@ import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.ext.java.client.projecttree.JavaSourceFolderUtil; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.position.PositionConverter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.util.loging.Log; /** @@ -48,12 +48,12 @@ public class QuickDocPresenter implements QuickDocumentation, QuickDocView.Actio return; } - if (!(activeEditor instanceof EmbeddedTextEditorPresenter)) { - Log.error(getClass(), "Quick Document support only EmbeddedTextEditorPresenter as editor"); + if (!(activeEditor instanceof TextEditorPresenter)) { + Log.error(getClass(), "Quick Document support only TextEditorPresenter as editor"); return; } - EmbeddedTextEditorPresenter editor = ((EmbeddedTextEditorPresenter)activeEditor); + TextEditorPresenter editor = ((TextEditorPresenter)activeEditor); int offset = editor.getCursorOffset(); final PositionConverter.PixelCoordinates coordinates = editor.getPositionConverter().offsetToPixel(offset); view.show(appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/" + appContext.getDevMachine().getWorkspace() + "/javadoc/find?fqn=" + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/ActionCompletionProposal.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/ActionCompletionProposal.java index 0dbe5ba999..2156804d25 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/ActionCompletionProposal.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/ActionCompletionProposal.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.ui.Widget; import org.eclipse.che.ide.api.icon.Icon; import org.eclipse.che.ide.ext.java.client.action.ProposalAction; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal; import org.eclipse.che.ide.util.loging.Log; /** diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/FileWatcher.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/FileWatcher.java index 9fec30edf1..f7e1ba442d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/FileWatcher.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/FileWatcher.java @@ -22,7 +22,7 @@ import org.eclipse.che.ide.api.parts.PartPresenter; import org.eclipse.che.ide.api.parts.PropertyListener; import org.eclipse.che.ide.ext.java.client.project.node.JavaFileNode; import org.eclipse.che.ide.ext.java.client.project.node.PackageNode; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.project.event.ResourceNodeDeletedEvent; import org.eclipse.che.ide.project.node.ResourceBasedNode; @@ -38,7 +38,7 @@ public class FileWatcher { @Inject private EditorAgent editorAgent; - private Set editor2reconcile = new HashSet<>(); + private Set editor2reconcile = new HashSet<>(); @Inject private void handleFileOperations(EventBus eventBus) { @@ -56,16 +56,16 @@ public class FileWatcher { eventBus.addHandler(ActivePartChangedEvent.TYPE, new ActivePartChangedHandler() { @Override public void onActivePartChanged(ActivePartChangedEvent event) { - if (event.getActivePart() instanceof EmbeddedTextEditorPresenter) { + if (event.getActivePart() instanceof TextEditorPresenter) { if (editor2reconcile.contains(event.getActivePart())) { - reParseEditor((EmbeddedTextEditorPresenter)event.getActivePart()); + reParseEditor((TextEditorPresenter)event.getActivePart()); } } } }); } - private void reParseEditor(EmbeddedTextEditorPresenter editor) { + private void reParseEditor(TextEditorPresenter editor) { editor.refreshEditor(); editor2reconcile.remove(editor); } @@ -78,7 +78,7 @@ public class FileWatcher { if (!editor.isDirty()) { reparseAllOpenedFiles(); //remove just saved editor - editor2reconcile.remove((EmbeddedTextEditorPresenter)editor); + editor2reconcile.remove((TextEditorPresenter)editor); } } } @@ -88,8 +88,8 @@ public class FileWatcher { private void reparseAllOpenedFiles() { for (EditorPartPresenter editorPartPresenter: editorAgent.getOpenedEditors()) { - if (editorPartPresenter instanceof EmbeddedTextEditorPresenter) { - final EmbeddedTextEditorPresenter< ? > editor = (EmbeddedTextEditorPresenter< ? >)editorPartPresenter; + if (editorPartPresenter instanceof TextEditorPresenter) { + final TextEditorPresenter< ? > editor = (TextEditorPresenter< ? >)editorPartPresenter; editor.refreshEditor(); } } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationModel.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationModel.java index d5323115f9..4261b87b98 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationModel.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationModel.java @@ -13,15 +13,15 @@ package org.eclipse.che.ide.ext.java.client.editor; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; -import org.eclipse.che.ide.api.text.Position; +import org.eclipse.che.ide.api.editor.text.Position; import org.eclipse.che.ide.ext.java.client.JavaCss; import org.eclipse.che.ide.ext.java.client.JavaResources; import org.eclipse.che.ide.ext.java.shared.dto.Problem; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModelImpl; -import org.eclipse.che.ide.jseditor.client.partition.DocumentPositionMap; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorResources; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorResources.EditorCss; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModel; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModelImpl; +import org.eclipse.che.ide.api.editor.partition.DocumentPositionMap; +import org.eclipse.che.ide.api.editor.texteditor.EditorResources; +import org.eclipse.che.ide.api.editor.texteditor.EditorResources.EditorCss; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationModelFactory.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationModelFactory.java index dde045762e..1298f06a59 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationModelFactory.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationModelFactory.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.client.editor; -import org.eclipse.che.ide.jseditor.client.partition.DocumentPositionMap; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorHandle; +import org.eclipse.che.ide.api.editor.partition.DocumentPositionMap; +import org.eclipse.che.ide.api.editor.texteditor.EditorHandle; /** * Factory for {@link JavaAnnotationModel} instances. diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationUtil.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationUtil.java index 4e8f9860d5..08e8da3a6c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationUtil.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaAnnotationUtil.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.client.editor; -import org.eclipse.che.ide.api.text.annotation.Annotation; +import org.eclipse.che.ide.api.editor.text.annotation.Annotation; public final class JavaAnnotationUtil { diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaChangeInterceptorProvider.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaChangeInterceptorProvider.java index c66bdcddac..d52a379f32 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaChangeInterceptorProvider.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaChangeInterceptorProvider.java @@ -16,9 +16,9 @@ import java.util.List; import java.util.Map; import org.eclipse.che.ide.ext.java.jdt.JavaPartitions; -import org.eclipse.che.ide.jseditor.client.changeintercept.ChangeInterceptorProvider; -import org.eclipse.che.ide.jseditor.client.changeintercept.CloseCStyleCommentChangeInterceptor; -import org.eclipse.che.ide.jseditor.client.changeintercept.TextChangeInterceptor; +import org.eclipse.che.ide.api.editor.changeintercept.ChangeInterceptorProvider; +import org.eclipse.che.ide.api.editor.changeintercept.CloseCStyleCommentChangeInterceptor; +import org.eclipse.che.ide.api.editor.changeintercept.TextChangeInterceptor; /** Provider for {@link TextChangeInterceptor}s for java. */ public class JavaChangeInterceptorProvider implements ChangeInterceptorProvider { diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistProcessor.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistProcessor.java index c9fac6fe94..3d3ded5dde 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistProcessor.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistProcessor.java @@ -23,11 +23,11 @@ import org.eclipse.che.ide.ext.java.client.projecttree.JavaSourceFolderUtil; import org.eclipse.che.ide.ext.java.client.refactoring.RefactoringUpdater; import org.eclipse.che.ide.ext.java.shared.dto.ProposalPresentation; import org.eclipse.che.ide.ext.java.shared.dto.Proposals; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistCallback; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; -import org.eclipse.che.ide.jseditor.client.link.HasLinkedMode; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistCallback; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal; +import org.eclipse.che.ide.api.editor.link.HasLinkedMode; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCompletionProposal.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCompletionProposal.java index 966cde5281..4b18300b89 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCompletionProposal.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCompletionProposal.java @@ -17,7 +17,7 @@ import com.google.gwt.user.client.ui.Widget; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.icon.Icon; -import org.eclipse.che.ide.api.text.Position; +import org.eclipse.che.ide.api.editor.text.Position; import org.eclipse.che.ide.ext.java.client.refactoring.RefactorInfo; import org.eclipse.che.ide.ext.java.client.refactoring.RefactoringUpdater; import org.eclipse.che.ide.ext.java.client.refactoring.move.RefactoredItemType; @@ -28,16 +28,16 @@ import org.eclipse.che.ide.ext.java.shared.dto.LinkedPositionGroup; import org.eclipse.che.ide.ext.java.shared.dto.ProposalApplyResult; import org.eclipse.che.ide.ext.java.shared.dto.Region; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ChangeInfo; -import org.eclipse.che.ide.jseditor.client.codeassist.Completion; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposalExtension; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.link.HasLinkedMode; -import org.eclipse.che.ide.jseditor.client.link.LinkedMode; -import org.eclipse.che.ide.jseditor.client.link.LinkedModel; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelData; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelGroup; -import org.eclipse.che.ide.jseditor.client.text.LinearRange; +import org.eclipse.che.ide.api.editor.codeassist.Completion; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposalExtension; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.link.HasLinkedMode; +import org.eclipse.che.ide.api.editor.link.LinkedMode; +import org.eclipse.che.ide.api.editor.link.LinkedModel; +import org.eclipse.che.ide.api.editor.link.LinkedModelData; +import org.eclipse.che.ide.api.editor.link.LinkedModelGroup; +import org.eclipse.che.ide.api.editor.text.LinearRange; import org.eclipse.che.ide.util.loging.Log; import java.util.ArrayList; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaFormatter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaFormatter.java index 3d069c4fa3..fca196c352 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaFormatter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaFormatter.java @@ -18,11 +18,11 @@ import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; +import org.eclipse.che.ide.api.editor.texteditor.HandlesUndoRedo; +import org.eclipse.che.ide.api.editor.texteditor.UndoableEditor; import org.eclipse.che.ide.ext.java.shared.dto.Change; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.formatter.ContentFormatter; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.formatter.ContentFormatter; import org.eclipse.che.ide.util.loging.Log; import java.util.List; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaPartitionScanner.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaPartitionScanner.java index ff336be724..7dc50707dd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaPartitionScanner.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaPartitionScanner.java @@ -15,11 +15,11 @@ import java.util.List; import javax.inject.Inject; -import org.eclipse.che.ide.api.text.rules.Token; -import org.eclipse.che.ide.api.text.rules.TokenImpl; +import org.eclipse.che.ide.api.editor.text.rules.Token; +import org.eclipse.che.ide.api.editor.text.rules.TokenImpl; import org.eclipse.che.ide.ext.java.jdt.JavaPartitions; -import org.eclipse.che.ide.jseditor.client.partition.PartitionScanner; -import org.eclipse.che.ide.jseditor.client.partition.StringCharacterScanner; +import org.eclipse.che.ide.api.editor.partition.PartitionScanner; +import org.eclipse.che.ide.api.editor.partition.StringCharacterScanner; import org.eclipse.che.ide.ext.java.jdt.text.rules.CharacterScanner; /** diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaPartitionerFactory.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaPartitionerFactory.java index 6f77179362..d5a805c2f2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaPartitionerFactory.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaPartitionerFactory.java @@ -17,11 +17,11 @@ import java.util.List; import javax.inject.Inject; import org.eclipse.che.ide.ext.java.jdt.JavaPartitions; -import org.eclipse.che.ide.jseditor.client.partition.DefaultPartitioner; -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.partition.PartitionScanner; -import org.eclipse.che.ide.jseditor.client.partition.PartitionerFactory; +import org.eclipse.che.ide.api.editor.partition.DefaultPartitioner; +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.partition.PartitionScanner; +import org.eclipse.che.ide.api.editor.partition.PartitionerFactory; /** * Factory of document partitioner for java documents. diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaQuickAssistProcessor.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaQuickAssistProcessor.java index 727e4a0890..0e7e0116a1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaQuickAssistProcessor.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaQuickAssistProcessor.java @@ -12,8 +12,8 @@ package org.eclipse.che.ide.ext.java.client.editor; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.project.tree.VirtualFile; -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.dto.DtoFactory; import org.eclipse.che.ide.ext.java.client.JavaResources; import org.eclipse.che.ide.ext.java.client.action.ProposalAction; @@ -22,16 +22,16 @@ import org.eclipse.che.ide.ext.java.client.refactoring.RefactoringUpdater; import org.eclipse.che.ide.ext.java.shared.dto.Problem; import org.eclipse.che.ide.ext.java.shared.dto.ProposalPresentation; import org.eclipse.che.ide.ext.java.shared.dto.Proposals; -import org.eclipse.che.ide.jseditor.client.annotation.QueryAnnotationsEvent; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistCallback; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.link.HasLinkedMode; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistInvocationContext; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistProcessor; -import org.eclipse.che.ide.jseditor.client.text.LinearRange; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.annotation.QueryAnnotationsEvent; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistCallback; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.link.HasLinkedMode; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistInvocationContext; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistProcessor; +import org.eclipse.che.ide.api.editor.text.LinearRange; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; @@ -107,7 +107,7 @@ public class JavaQuickAssistProcessor implements QuickAssistProcessor { /*final Map problems =*/ int offset = collectQuickFixableAnnotations(range, document, annotations, goToClosest, problems); if (offset != range.getStartOffset()) { - EmbeddedTextEditorPresenter presenter = ((EmbeddedTextEditorPresenter)textEditor); + TextEditorPresenter presenter = ((TextEditorPresenter)textEditor); presenter.getCursorModel().setCursorPosition(offset); } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategy.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategy.java index 7ebd8257dc..65673aa2ae 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategy.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategy.java @@ -17,17 +17,17 @@ import com.google.web.bindery.event.shared.HandlerRegistration; import org.eclipse.che.ide.api.editor.EditorWithErrors; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.api.text.Region; +import org.eclipse.che.ide.api.editor.text.Region; import org.eclipse.che.ide.ext.java.client.event.DependencyUpdatedEvent; import org.eclipse.che.ide.ext.java.client.event.DependencyUpdatedEventHandler; import org.eclipse.che.ide.ext.java.client.projecttree.JavaSourceFolderUtil; import org.eclipse.che.ide.ext.java.shared.dto.Problem; import org.eclipse.che.ide.ext.java.shared.dto.ReconcileResult; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.reconciler.DirtyRegion; -import org.eclipse.che.ide.jseditor.client.reconciler.ReconcilingStrategy; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModel; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.reconciler.DirtyRegion; +import org.eclipse.che.ide.api.editor.reconciler.ReconcilingStrategy; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.util.loging.Log; import javax.validation.constraints.NotNull; @@ -36,17 +36,17 @@ import java.util.List; public class JavaReconcilerStrategy implements ReconcilingStrategy { - private final EmbeddedTextEditorPresenter editor; - private final JavaCodeAssistProcessor codeAssistProcessor; - private final AnnotationModel annotationModel; - private final HandlerRegistration handlerRegistration; - private SemanticHighlightRenderer highlighter; - private JavaReconcileClient client; - private VirtualFile file; + private final TextEditorPresenter editor; + private final JavaCodeAssistProcessor codeAssistProcessor; + private final AnnotationModel annotationModel; + private final HandlerRegistration handlerRegistration; + private SemanticHighlightRenderer highlighter; + private JavaReconcileClient client; + private VirtualFile file; private boolean first = true; @AssistedInject - public JavaReconcilerStrategy(@Assisted @NotNull final EmbeddedTextEditorPresenter editor, + public JavaReconcilerStrategy(@Assisted @NotNull final TextEditorPresenter editor, @Assisted final JavaCodeAssistProcessor codeAssistProcessor, @Assisted final AnnotationModel annotationModel, final JavaReconcileClient client, diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyFactory.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyFactory.java index d70cb681dc..725d012589 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyFactory.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyFactory.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.client.editor; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModel; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; /** * Factory of reconciler factories for java documents. */ public interface JavaReconcilerStrategyFactory { - JavaReconcilerStrategy create(EmbeddedTextEditorPresenter< ? > editor, + JavaReconcilerStrategy create(TextEditorPresenter< ? > editor, JavaCodeAssistProcessor codeAssistProcessor, AnnotationModel annotationModel); } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorConfiguration.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorConfiguration.java index d7063437f3..23f7218424 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorConfiguration.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorConfiguration.java @@ -14,23 +14,23 @@ import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; -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.editorconfig.DefaultTextEditorConfiguration; -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.jseditor.client.reconciler.ReconcilerFactory; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +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.editorconfig.DefaultTextEditorConfiguration; +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 org.eclipse.che.ide.api.editor.reconciler.ReconcilerFactory; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import java.util.HashMap; import java.util.Map; -import static org.eclipse.che.ide.jseditor.client.partition.DefaultPartitioner.DEFAULT_PARTITIONING; -import static org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner.DEFAULT_CONTENT_TYPE; +import static org.eclipse.che.ide.api.editor.partition.DefaultPartitioner.DEFAULT_PARTITIONING; +import static org.eclipse.che.ide.api.editor.partition.DocumentPartitioner.DEFAULT_CONTENT_TYPE; /** * Text editor configuration for java files. @@ -47,7 +47,7 @@ public class JsJavaEditorConfiguration extends DefaultTextEditorConfiguration { private final ContentFormatter contentFormatter; @AssistedInject - public JsJavaEditorConfiguration(@Assisted final EmbeddedTextEditorPresenter editor, + public JsJavaEditorConfiguration(@Assisted final TextEditorPresenter editor, final JavaCodeAssistProcessorFactory codeAssistProcessorFactory, final JavaQuickAssistProcessorFactory quickAssistProcessorFactory, final ReconcilerFactory reconcilerFactory, diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorConfigurationFactory.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorConfigurationFactory.java index 3f01b970af..8c5a8c51e0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorConfigurationFactory.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorConfigurationFactory.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.client.editor; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; public interface JsJavaEditorConfigurationFactory { - JsJavaEditorConfiguration create(EmbeddedTextEditorPresenter< ? > editor); + JsJavaEditorConfiguration create(TextEditorPresenter< ? > editor); } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorProvider.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorProvider.java index 131a79108a..165eee5388 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorProvider.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JsJavaEditorProvider.java @@ -10,42 +10,31 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.client.editor; -import static org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner.DEFAULT_CONTENT_TYPE; - -import java.util.logging.Logger; +import org.eclipse.che.ide.api.editor.defaulteditor.AbstractTextEditorProvider; +import org.eclipse.che.ide.api.editor.editorconfig.EditorUpdateAction; +import org.eclipse.che.ide.api.editor.editorconfig.TextEditorConfiguration; +import org.eclipse.che.ide.api.editor.reconciler.Reconciler; +import org.eclipse.che.ide.api.editor.reconciler.ReconcilingStrategy; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import javax.inject.Inject; +import java.util.logging.Logger; -import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.editor.EditorProvider; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.jseditor.client.defaulteditor.DefaultEditorProvider; -import org.eclipse.che.ide.jseditor.client.editorconfig.EditorUpdateAction; -import org.eclipse.che.ide.jseditor.client.editorconfig.TextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.reconciler.Reconciler; -import org.eclipse.che.ide.jseditor.client.reconciler.ReconcilingStrategy; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import static org.eclipse.che.ide.api.editor.partition.DocumentPartitioner.DEFAULT_CONTENT_TYPE; /** EditorProvider that provides a text editor configured for java source files. */ -public class JsJavaEditorProvider implements EditorProvider { +public class JsJavaEditorProvider extends AbstractTextEditorProvider { private static final Logger LOG = Logger.getLogger(JsJavaEditorProvider.class.getName()); - private final DefaultEditorProvider editorProvider; - private final FileWatcher watcher; - private final JsJavaEditorConfigurationFactory jsJavaEditorConfigurationFactory; - private final NotificationManager notificationManager; - + private final FileWatcher watcher; + private final JsJavaEditorConfigurationFactory configurationFactory; @Inject - public JsJavaEditorProvider(final DefaultEditorProvider editorProvider, - final FileWatcher watcher, - final JsJavaEditorConfigurationFactory jsJavaEditorConfigurationFactory, - final NotificationManager notificationManager) { - this.editorProvider = editorProvider; + public JsJavaEditorProvider(FileWatcher watcher, JsJavaEditorConfigurationFactory jsJavaEditorConfigurationFactory) { this.watcher = watcher; - this.jsJavaEditorConfigurationFactory = jsJavaEditorConfigurationFactory; - this.notificationManager = notificationManager; + this.configurationFactory = jsJavaEditorConfigurationFactory; } @Override @@ -59,16 +48,15 @@ public class JsJavaEditorProvider implements EditorProvider { } @Override - public EditorPartPresenter getEditor() { + public TextEditor getEditor() { LOG.fine("JsJavaEditor instance creation."); - final EditorPartPresenter textEditor = editorProvider.getEditor(); + final TextEditor textEditor = super.getEditor(); - if (textEditor instanceof EmbeddedTextEditorPresenter) { - final EmbeddedTextEditorPresenter< ? > editor = (EmbeddedTextEditorPresenter< ? >)textEditor; - final TextEditorConfiguration configuration = - this.jsJavaEditorConfigurationFactory.create(editor); - editor.initialize(configuration, this.notificationManager); + if (textEditor instanceof TextEditorPresenter) { + final TextEditorPresenter editor = (TextEditorPresenter)textEditor; + final TextEditorConfiguration configuration = configurationFactory.create(editor); + editor.initialize(configuration); editor.addEditorUpdateAction(new EditorUpdateAction() { @Override public void doRefresh() { @@ -82,8 +70,9 @@ public class JsJavaEditorProvider implements EditorProvider { } }); } + watcher.editorOpened(textEditor); + return textEditor; } - } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/OpenDeclarationFinder.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/OpenDeclarationFinder.java index edcc8c3ba1..aac9ffc996 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/OpenDeclarationFinder.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/OpenDeclarationFinder.java @@ -29,8 +29,8 @@ import org.eclipse.che.ide.ext.java.client.navigation.service.JavaNavigationServ import org.eclipse.che.ide.ext.java.client.project.node.JavaNodeManager; import org.eclipse.che.ide.ext.java.client.projecttree.JavaSourceFolderUtil; import org.eclipse.che.ide.ext.java.shared.OpenDeclarationDescriptor; -import org.eclipse.che.ide.jseditor.client.text.LinearRange; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.text.LinearRange; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.FileReferenceNode; import org.eclipse.che.ide.resource.Path; @@ -73,11 +73,11 @@ public class OpenDeclarationFinder { return; } - if (!(activeEditor instanceof EmbeddedTextEditorPresenter)) { - Log.error(getClass(), "Open Declaration support only EmbeddedTextEditorPresenter as editor"); + if (!(activeEditor instanceof TextEditorPresenter)) { + Log.error(getClass(), "Open Declaration support only TextEditorPresenter as editor"); return; } - EmbeddedTextEditorPresenter editor = ((EmbeddedTextEditorPresenter)activeEditor); + TextEditorPresenter editor = ((TextEditorPresenter)activeEditor); int offset = editor.getCursorOffset(); final VirtualFile file = editor.getEditorInput().getFile(); Unmarshallable unmarshaller = @@ -168,8 +168,8 @@ public class OpenDeclarationFinder { new Timer() { //in some reason we need here timeout otherwise it not work cursor don't set to correct position @Override public void run() { - if (editor instanceof EmbeddedTextEditorPresenter) { - ((EmbeddedTextEditorPresenter)editor).getDocument().setSelectedRange( + if (editor instanceof TextEditorPresenter) { + ((TextEditorPresenter)editor).getDocument().setSelectedRange( LinearRange.createWithStart(offset).andLength(0), true); } } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/ProblemAnnotation.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/ProblemAnnotation.java index 7c0206146e..5c02223621 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/ProblemAnnotation.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/ProblemAnnotation.java @@ -13,9 +13,7 @@ package org.eclipse.che.ide.ext.java.client.editor; import elemental.dom.Element; import elemental.js.dom.JsElement; -import com.google.gwt.user.client.ui.Image; - -import org.eclipse.che.ide.api.text.annotation.Annotation; +import org.eclipse.che.ide.api.editor.text.annotation.Annotation; import org.eclipse.che.ide.ext.java.client.JavaResources; import org.eclipse.che.ide.ext.java.shared.dto.Problem; import org.eclipse.che.ide.runtime.Assert; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/SemanticHighlightRenderer.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/SemanticHighlightRenderer.java index 703292db9b..26b5d558c2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/SemanticHighlightRenderer.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/SemanticHighlightRenderer.java @@ -13,10 +13,10 @@ package org.eclipse.che.ide.ext.java.client.editor; import com.google.inject.Inject; import org.eclipse.che.ide.ext.java.shared.dto.HighlightedPosition; -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.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.ext.java.client.Resources; import java.util.ArrayList; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaJsEditorGinModule.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaEditorGinModule.java similarity index 93% rename from plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaJsEditorGinModule.java rename to plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaEditorGinModule.java index 4e930be0a2..27a439526a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaJsEditorGinModule.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaEditorGinModule.java @@ -19,13 +19,13 @@ import org.eclipse.che.ide.ext.java.client.editor.JavaQuickAssistProcessorFactor import org.eclipse.che.ide.ext.java.client.editor.JavaReconcilerStrategyFactory; import org.eclipse.che.ide.ext.java.client.editor.JsJavaEditorConfigurationFactory; import org.eclipse.che.ide.ext.java.client.editor.JavaFormatter; -import org.eclipse.che.ide.jseditor.client.formatter.ContentFormatter; +import org.eclipse.che.ide.api.editor.formatter.ContentFormatter; import com.google.gwt.inject.client.AbstractGinModule; import com.google.gwt.inject.client.assistedinject.GinFactoryModuleBuilder; @ExtensionGinModule -public class JavaJsEditorGinModule extends AbstractGinModule { +public class JavaEditorGinModule extends AbstractGinModule { @Override protected void configure() { diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaGinModule.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaGinModule.java index a1c31a84db..c6d4a349b5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaGinModule.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/inject/JavaGinModule.java @@ -18,7 +18,6 @@ import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.name.Named; -import org.eclipse.che.ide.MimeType; import org.eclipse.che.ide.api.extension.ExtensionGinModule; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.preferences.PreferencePagePresenter; @@ -115,21 +114,21 @@ public class JavaGinModule extends AbstractGinModule { @Singleton @Named("JavaFileType") protected FileType provideJavaFile() { - return new FileType("Java", JavaResources.INSTANCE.javaFile(), MimeType.TEXT_X_JAVA, "java"); + return new FileType(JavaResources.INSTANCE.javaFile(), "java"); } @Provides @Singleton @Named("JavaClassFileType") protected FileType provideJavaClassFile() { - return new FileType("Java Class", JavaResources.INSTANCE.javaFile(), MimeType.APPLICATION_JAVA_CLASS, "class"); + return new FileType(JavaResources.INSTANCE.javaFile(), "class"); } @Provides @Singleton @Named("JspFileType") protected FileType provideJspFile() { - return new FileType("Jsp", JavaResources.INSTANCE.jspFile(), MimeType.APPLICATION_JSP, "jsp"); + return new FileType(JavaResources.INSTANCE.jspFile(), "jsp"); } @@ -137,6 +136,6 @@ public class JavaGinModule extends AbstractGinModule { @Singleton @Named("JsfFileType") protected FileType provideJsfFile() { - return new FileType("Jsf", JavaResources.INSTANCE.jsfFile(), MimeType.TEXT_X_JAVA, "jsf"); + return new FileType(JavaResources.INSTANCE.jsfFile(), "jsf"); } } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenter.java index 5dcbe443b1..a7ef5cd271 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenter.java @@ -33,8 +33,8 @@ import org.eclipse.che.ide.ext.java.client.projecttree.JavaSourceFolderUtil; import org.eclipse.che.ide.ext.java.shared.dto.Region; import org.eclipse.che.ide.ext.java.shared.dto.model.CompilationUnit; import org.eclipse.che.ide.ext.java.shared.dto.model.Member; -import org.eclipse.che.ide.jseditor.client.text.LinearRange; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.text.LinearRange; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.FileReferenceNode; import org.eclipse.che.ide.ui.loaders.request.LoaderFactory; @@ -56,9 +56,9 @@ public class FileStructurePresenter implements FileStructure.ActionDelegate { private final ProjectExplorerPresenter projectExplorer; private final JavaNodeManager javaNodeManager; - private EmbeddedTextEditorPresenter activeEditor; - private boolean showInheritedMembers; - private int cursorOffset; + private TextEditorPresenter activeEditor; + private boolean showInheritedMembers; + private int cursorOffset; @Inject public FileStructurePresenter(FileStructure view, @@ -88,11 +88,11 @@ public class FileStructurePresenter implements FileStructure.ActionDelegate { loader.show(); view.setTitle(editorPartPresenter.getEditorInput().getFile().getName()); - if (!(editorPartPresenter instanceof EmbeddedTextEditorPresenter)) { - Log.error(getClass(), "Open Declaration support only EmbeddedTextEditorPresenter as editor"); + if (!(editorPartPresenter instanceof TextEditorPresenter)) { + Log.error(getClass(), "Open Declaration support only TextEditorPresenter as editor"); return; } - activeEditor = ((EmbeddedTextEditorPresenter)editorPartPresenter); + activeEditor = ((TextEditorPresenter)editorPartPresenter); cursorOffset = activeEditor.getCursorOffset(); VirtualFile file = activeEditor.getEditorInput().getFile(); @@ -190,8 +190,8 @@ public class FileStructurePresenter implements FileStructure.ActionDelegate { } private void setCursor(EditorPartPresenter editor, int offset) { - if (editor instanceof EmbeddedTextEditorPresenter) { - ((EmbeddedTextEditorPresenter)editor).getDocument().setSelectedRange(LinearRange.createWithStart(offset).andLength(0), true); + if (editor instanceof TextEditorPresenter) { + ((TextEditorPresenter)editor).getDocument().setSelectedRange(LinearRange.createWithStart(offset).andLength(0), true); } } } \ No newline at end of file diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/NoImplementationWidget.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/NoImplementationWidget.java index 66987dc50c..e86c339638 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/NoImplementationWidget.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/NoImplementationWidget.java @@ -21,8 +21,8 @@ import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.JavaResources; import org.eclipse.che.ide.ext.java.client.util.Flags; import org.eclipse.che.ide.ext.java.shared.dto.model.Type; -import org.eclipse.che.ide.jseditor.client.popup.PopupResources; -import org.eclipse.che.ide.jseditor.client.popup.PopupWidget; +import org.eclipse.che.ide.ui.popup.PopupResources; +import org.eclipse.che.ide.ui.popup.PopupWidget; import org.eclipse.che.ide.util.dom.Elements; import org.vectomatic.dom.svg.ui.SVGImage; import org.vectomatic.dom.svg.ui.SVGResource; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenter.java index 08fc7485ec..c36dbc0830 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenter.java @@ -37,10 +37,10 @@ import org.eclipse.che.ide.ext.java.shared.dto.ImplementationsDescriptorDTO; import org.eclipse.che.ide.ext.java.shared.dto.Region; import org.eclipse.che.ide.ext.java.shared.dto.model.Member; import org.eclipse.che.ide.ext.java.shared.dto.model.Type; -import org.eclipse.che.ide.jseditor.client.popup.PopupResources; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; -import org.eclipse.che.ide.jseditor.client.text.LinearRange; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.ui.popup.PopupResources; +import org.eclipse.che.ide.api.editor.position.PositionConverter; +import org.eclipse.che.ide.api.editor.text.LinearRange; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.FileReferenceNode; import org.eclipse.che.ide.util.loging.Log; @@ -64,7 +64,7 @@ public class OpenImplementationPresenter { private final PopupResources popupResources; private final JavaLocalizationConstant locale; - private EmbeddedTextEditorPresenter activeEditor; + private TextEditorPresenter activeEditor; @Inject public OpenImplementationPresenter(JavaNavigationService javaNavigationService, @@ -94,11 +94,11 @@ public class OpenImplementationPresenter { * the active editor */ public void show(final EditorPartPresenter editorPartPresenter) { - if (!(editorPartPresenter instanceof EmbeddedTextEditorPresenter)) { - Log.error(getClass(), "Open Declaration support only EmbeddedTextEditorPresenter as editor"); + if (!(editorPartPresenter instanceof TextEditorPresenter)) { + Log.error(getClass(), "Open Declaration support only TextEditorPresenter as editor"); return; } - activeEditor = ((EmbeddedTextEditorPresenter)editorPartPresenter); + activeEditor = ((TextEditorPresenter)editorPartPresenter); final VirtualFile file = activeEditor.getEditorInput().getFile(); String projectPath = file.getProject().getProjectConfig().getPath(); @@ -121,9 +121,9 @@ public class OpenImplementationPresenter { } else if (overridingSize > 1) { openOneImplementation(implementationsDescriptor, noImplementationWidget, - (EmbeddedTextEditorPresenter)editorPartPresenter); + (TextEditorPresenter)editorPartPresenter); } else if (!isNullOrEmpty(implementationsDescriptor.getMemberName()) && overridingSize == 0) { - showNoImplementations(noImplementationWidget, (EmbeddedTextEditorPresenter)editorPartPresenter); + showNoImplementations(noImplementationWidget, (TextEditorPresenter)editorPartPresenter); } } }).catchError(new Operation() { @@ -159,7 +159,7 @@ public class OpenImplementationPresenter { }); } - private void showNoImplementations(NoImplementationWidget noImplementationWidget, EmbeddedTextEditorPresenter editorPartPresenter) { + private void showNoImplementations(NoImplementationWidget noImplementationWidget, TextEditorPresenter editorPartPresenter) { int offset = editorPartPresenter.getCursorOffset(); PositionConverter.PixelCoordinates coordinates = editorPartPresenter.getPositionConverter().offsetToPixel(offset); Type type = dtoFactory.createDto(Type.class); @@ -170,7 +170,7 @@ public class OpenImplementationPresenter { private void openOneImplementation(ImplementationsDescriptorDTO implementationsDescriptor, NoImplementationWidget implementationWidget, - EmbeddedTextEditorPresenter editorPartPresenter) { + TextEditorPresenter editorPartPresenter) { int offset = editorPartPresenter.getCursorOffset(); PositionConverter.PixelCoordinates coordinates = editorPartPresenter.getPositionConverter().offsetToPixel(offset); for (Type type : implementationsDescriptor.getImplementations()) { @@ -232,13 +232,13 @@ public class OpenImplementationPresenter { } private void setCursorPosition(final Region region) { - if (!(editorAgent.getActiveEditor() instanceof EmbeddedTextEditorPresenter)) { + if (!(editorAgent.getActiveEditor() instanceof TextEditorPresenter)) { return; } Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() { @Override public void execute() { - EmbeddedTextEditorPresenter editor = (EmbeddedTextEditorPresenter)editorAgent.getActiveEditor(); + TextEditorPresenter editor = (TextEditorPresenter)editorAgent.getActiveEditor(); editor.setFocus(); editor.getDocument().setSelectedRange(LinearRange.createWithStart(region.getOffset()).andLength(0), true); } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/paraminfo/ParametersHintsPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/paraminfo/ParametersHintsPresenter.java index fb2ff04f39..b34b3a1cd2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/paraminfo/ParametersHintsPresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/paraminfo/ParametersHintsPresenter.java @@ -21,9 +21,9 @@ import org.eclipse.che.ide.api.project.tree.VirtualFile; import org.eclipse.che.ide.ext.java.client.navigation.service.JavaNavigationService; import org.eclipse.che.ide.ext.java.client.projecttree.JavaSourceFolderUtil; import org.eclipse.che.ide.ext.java.shared.dto.model.MethodParameters; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.position.PositionConverter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.util.loging.Log; import java.util.List; @@ -52,7 +52,7 @@ public class ParametersHintsPresenter { * @param activeEditor * active editor which contains method or constructor for which parameters will be displayed */ - public void show(final EmbeddedTextEditorPresenter activeEditor) { + public void show(final TextEditorPresenter activeEditor) { final int offset = activeEditor.getCursorOffset(); if (!isCursorInRightPlace(activeEditor, offset)) { @@ -86,7 +86,7 @@ public class ParametersHintsPresenter { }); } - private boolean isCursorInRightPlace(EmbeddedTextEditorPresenter activeEditor, int offset) { + private boolean isCursorInRightPlace(TextEditorPresenter activeEditor, int offset) { Document document = activeEditor.getDocument(); int lineIndex = document.getLineAtOffset(offset); @@ -98,7 +98,7 @@ public class ParametersHintsPresenter { return contentRange.contains(")"); } - private int getLineStartOffset(EmbeddedTextEditorPresenter activeEditor, int offset) { + private int getLineStartOffset(TextEditorPresenter activeEditor, int offset) { Document document = activeEditor.getDocument(); int lineIndex = document.getLineAtOffset(offset); return document.getLineStart(lineIndex); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/newsourcefile/NewJavaSourceFilePresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/newsourcefile/NewJavaSourceFilePresenter.java index f97b07c75a..899e9dfa33 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/newsourcefile/NewJavaSourceFilePresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/newsourcefile/NewJavaSourceFilePresenter.java @@ -34,7 +34,7 @@ import org.eclipse.che.ide.project.node.FolderReferenceNode; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; import java.util.Arrays; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenter.java index a9fb6f9aac..399e645122 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenter.java @@ -21,15 +21,15 @@ import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; +import org.eclipse.che.ide.api.editor.texteditor.HandlesUndoRedo; +import org.eclipse.che.ide.api.editor.texteditor.UndoableEditor; import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.editor.JavaCodeAssistClient; import org.eclipse.che.ide.ext.java.client.projecttree.JavaSourceFolderUtil; import org.eclipse.che.ide.ext.java.shared.dto.ConflictImportDTO; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.StringUnmarshaller; import org.eclipse.che.ide.util.loging.Log; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/ProjectClasspathPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/ProjectClasspathPresenter.java index a6ef88dce2..1bd1e3da32 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/ProjectClasspathPresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/ProjectClasspathPresenter.java @@ -19,14 +19,13 @@ import org.eclipse.che.api.promises.client.PromiseError; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.notification.StatusNotification; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.project.classpath.service.ClasspathServiceClient; import org.eclipse.che.ide.ext.java.client.project.classpath.valueproviders.pages.ClasspathPagePresenter; import org.eclipse.che.ide.ext.java.shared.dto.classpath.ClasspathEntryDTO; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import java.util.HashMap; import java.util.HashSet; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaItemReferenceProcessor.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaItemReferenceProcessor.java index d646d3fd1f..656c74bd26 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaItemReferenceProcessor.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaItemReferenceProcessor.java @@ -23,7 +23,7 @@ import org.eclipse.che.ide.api.project.node.HasDataObject; import org.eclipse.che.ide.api.project.node.HasStorablePath; import org.eclipse.che.ide.project.node.resource.ItemReferenceProcessor; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenter.java index 63101b8329..73af62f95d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenter.java @@ -46,7 +46,7 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringSession; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ReorgDestination; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import java.util.ArrayList; import java.util.List; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenter.java index 33129de73a..f8e16c0220 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenter.java @@ -31,7 +31,7 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringChange; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringPreview; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringSession; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.OK; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRename.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRename.java index 2446db25e9..9e3148ebbe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRename.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRename.java @@ -22,7 +22,7 @@ import org.eclipse.che.ide.api.editor.EditorWithAutoSave; import org.eclipse.che.ide.api.event.FileEvent; import org.eclipse.che.ide.api.event.FileEventHandler; import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.text.Position; +import org.eclipse.che.ide.api.editor.text.Position; import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.projecttree.JavaSourceFolderUtil; @@ -39,17 +39,17 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.CreateRenameRefactori import org.eclipse.che.ide.ext.java.shared.dto.refactoring.LinkedRenameRefactoringApply; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameRefactoringSession; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.link.HasLinkedMode; -import org.eclipse.che.ide.jseditor.client.link.LinkedMode; -import org.eclipse.che.ide.jseditor.client.link.LinkedModel; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelData; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelGroup; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.link.HasLinkedMode; +import org.eclipse.che.ide.api.editor.link.LinkedMode; +import org.eclipse.che.ide.api.editor.link.LinkedModel; +import org.eclipse.che.ide.api.editor.link.LinkedModelData; +import org.eclipse.che.ide.api.editor.link.LinkedModelGroup; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import javax.validation.constraints.NotNull; import java.util.ArrayList; @@ -278,8 +278,8 @@ public class JavaRefactoringRename implements FileEventHandler { } private void undoChanges() { - if (linkedEditor instanceof EmbeddedTextEditorPresenter) { - ((EmbeddedTextEditorPresenter)linkedEditor).getUndoRedo().undo(); + if (linkedEditor instanceof TextEditorPresenter) { + ((TextEditorPresenter)linkedEditor).getUndoRedo().undo(); } } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/RenameRefactoringAction.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/RenameRefactoringAction.java index 7257f15337..c09d7ca449 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/RenameRefactoringAction.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/RenameRefactoringAction.java @@ -14,7 +14,6 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.ide.MimeType; import org.eclipse.che.ide.api.action.Action; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.app.AppContext; @@ -34,8 +33,7 @@ import org.eclipse.che.ide.ext.java.client.project.node.PackageNode; import org.eclipse.che.ide.ext.java.client.refactoring.RefactorInfo; import org.eclipse.che.ide.ext.java.client.refactoring.move.RefactoredItemType; import org.eclipse.che.ide.ext.java.client.refactoring.rename.wizard.RenamePresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; -import org.eclipse.che.ide.util.loging.Log; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import java.util.List; @@ -157,11 +155,9 @@ public class RenameRefactoringAction extends Action implements ActivePartChanged EditorPartPresenter editorPart = editorAgent.getActiveEditor(); if (editorPart != null && editorPart instanceof TextEditor) { VirtualFile virtualFile = editorPart.getEditorInput().getFile(); - String mediaType = fileTypeRegistry.getFileTypeByFile(virtualFile).getMimeTypes().get(0); + String fileExtension = fileTypeRegistry.getFileTypeByFile(virtualFile).getExtension(); - if (mediaType != null && ((mediaType.equals(MimeType.TEXT_X_JAVA) || - mediaType.equals(MimeType.TEXT_X_JAVA_SOURCE) || - mediaType.equals(MimeType.APPLICATION_JAVA_CLASS)))) { + if (fileExtension.equals("java") || fileExtension.equals("class")) { event.getPresentation().setEnabled(true); } else { event.getPresentation().setEnabled(false); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenter.java index c7af56fbc2..1e3b25361c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenter.java @@ -43,10 +43,10 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatusEntr import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameRefactoringSession; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameSettings; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ValidateNewName; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import java.util.List; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/FindUsagesPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/FindUsagesPresenter.java index aeef28c3de..a7da94cbe6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/FindUsagesPresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/FindUsagesPresenter.java @@ -32,7 +32,7 @@ import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.projecttree.JavaSourceFolderUtil; import org.eclipse.che.ide.ext.java.shared.dto.search.FindUsagesRequest; import org.eclipse.che.ide.ext.java.shared.dto.search.FindUsagesResponse; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.ide.rest.HTTPStatus; import org.eclipse.che.ide.util.loging.Log; import org.vectomatic.dom.svg.ui.SVGResource; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/node/MatchNode.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/node/MatchNode.java index 70b830b320..74e2b5685c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/node/MatchNode.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/node/MatchNode.java @@ -37,8 +37,8 @@ import org.eclipse.che.ide.ext.java.shared.dto.Region; import org.eclipse.che.ide.ext.java.shared.dto.model.ClassFile; import org.eclipse.che.ide.ext.java.shared.dto.model.CompilationUnit; import org.eclipse.che.ide.ext.java.shared.dto.search.Match; -import org.eclipse.che.ide.jseditor.client.text.LinearRange; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.text.LinearRange; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.project.node.FileReferenceNode; import org.eclipse.che.ide.resource.Path; @@ -201,8 +201,8 @@ public class MatchNode extends AbstractPresentationNode implements HasAction { } private void fileOpened(EditorPartPresenter editor) { - if (editor instanceof EmbeddedTextEditorPresenter) { - ((EmbeddedTextEditorPresenter)editor).getDocument().setSelectedRange( + if (editor instanceof TextEditorPresenter) { + ((TextEditorPresenter)editor).getDocument().setSelectedRange( LinearRange.createWithStart(match.getFileMatchRegion().getOffset()).andLength(match.getFileMatchRegion().getLength()), true); } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenter.java index c0f936e7f5..470fbc5b9b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenter.java @@ -80,7 +80,7 @@ public class JavaCompilerPreferencePresenter extends AbstractPreferencePagePrese @JavaCompilerPreferenceManager PreferencesManager preferencesManager, Provider notificationManagerProvider, EventBus eventBus) { - super(locale.compilerSetup(), CATEGORY, null); + super(locale.compilerSetup(), CATEGORY); this.view = view; this.propertyFactory = propertyFactory; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/AbstractDocument.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/AbstractDocument.java index fca075f14a..87235fb5e4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/AbstractDocument.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/AbstractDocument.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.BadPositionCategoryException; -import org.eclipse.che.ide.api.text.Position; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.TypedRegion; -import org.eclipse.che.ide.api.text.TypedRegionImpl; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +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.Region; +import org.eclipse.che.ide.api.editor.text.TypedRegion; +import org.eclipse.che.ide.api.editor.text.TypedRegionImpl; import org.eclipse.che.ide.runtime.Assert; import com.google.gwt.core.client.JavaScriptException; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/AbstractLineTracker.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/AbstractLineTracker.java index 2bb5b4d171..5ffe97f0f8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/AbstractLineTracker.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/AbstractLineTracker.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.Region; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.Region; import java.util.Iterator; import java.util.List; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DefaultPositionUpdater.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DefaultPositionUpdater.java index e604ead73a..2c9a984a8e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DefaultPositionUpdater.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DefaultPositionUpdater.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.BadPositionCategoryException; -import org.eclipse.che.ide.api.text.Position; +import org.eclipse.che.ide.api.editor.text.BadPositionCategoryException; +import org.eclipse.che.ide.api.editor.text.Position; /** * Default implementation of {@link PositionUpdater}. diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/Document.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/Document.java index 711f3c8577..f1d3993c4a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/Document.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/Document.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.BadPositionCategoryException; -import org.eclipse.che.ide.api.text.Position; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.TypedRegion; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +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.Region; +import org.eclipse.che.ide.api.editor.text.TypedRegion; /** diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DocumentPartitioner.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DocumentPartitioner.java index 1642d14eba..cedfffa3d3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DocumentPartitioner.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DocumentPartitioner.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.TypedRegion; +import org.eclipse.che.ide.api.editor.text.TypedRegion; /** * A document partitioner divides a document into a set of disjoint text partitions. Each partition has a content type, an offset, diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DocumentPartitioningChangedEvent.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DocumentPartitioningChangedEvent.java index ca51d7f601..db8e83b830 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DocumentPartitioningChangedEvent.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/DocumentPartitioningChangedEvent.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.RegionImpl; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.editor.text.RegionImpl; import org.eclipse.che.ide.runtime.Assert; import java.util.HashMap; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/FindReplaceDocumentAdapter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/FindReplaceDocumentAdapter.java index 735e5b1e5d..0b69cac9cf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/FindReplaceDocumentAdapter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/FindReplaceDocumentAdapter.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.RegionImpl; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.editor.text.RegionImpl; import org.eclipse.che.ide.runtime.Assert; import com.google.gwt.regexp.shared.MatchResult; import com.google.gwt.regexp.shared.RegExp; @@ -124,7 +124,7 @@ public class FindReplaceDocumentAdapter implements CharSequence { * @param operationCode * specifies what kind of operation is executed * @return the find or replace region or null if there was no match - * @throws org.eclipse.che.ide.api.text.BadLocationException + * @throws org.eclipse.che.ide.api.editor.text.BadLocationException * if startOffset is an invalid document offset * @throws IllegalStateException * if a REPLACE or REPLACE_FIND operation is not preceded by a successful FIND operation diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/Line.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/Line.java index ff86e92542..162c03cac1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/Line.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/Line.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.Region; +import org.eclipse.che.ide.api.editor.text.Region; /** * Describes a line as a particular number of characters beginning at a particular offset, consisting of a particular number of diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/LineTracker.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/LineTracker.java index f5aec3eff8..2fc390de27 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/LineTracker.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/LineTracker.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.Region; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.Region; /** * A line tracker maps character positions to line numbers and vice versa. Initially the line tracker is informed about its diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/ListLineTracker.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/ListLineTracker.java index 5228dd3158..4d789d6c0b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/ListLineTracker.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/ListLineTracker.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.RegionImpl; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.editor.text.RegionImpl; import org.eclipse.che.ide.ext.java.jdt.text.AbstractLineTracker.DelimiterInfo; import java.util.ArrayList; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/TextUtilities.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/TextUtilities.java index bdf80537c8..ad5516b46c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/TextUtilities.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/TextUtilities.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.TypedRegion; -import org.eclipse.che.ide.api.text.TypedRegionImpl; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.editor.text.TypedRegion; +import org.eclipse.che.ide.api.editor.text.TypedRegionImpl; import org.eclipse.che.ide.runtime.Assert; import org.eclipse.che.ide.util.loging.Log; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/TreeLineTracker.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/TreeLineTracker.java index dc5504c4b7..8d0834f014 100755 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/TreeLineTracker.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/TreeLineTracker.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.RegionImpl; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.editor.text.RegionImpl; import org.eclipse.che.ide.ext.java.jdt.text.AbstractLineTracker.DelimiterInfo; import org.eclipse.che.ide.runtime.Assert; @@ -1083,7 +1083,7 @@ abstract class TreeLineTracker implements LineTracker { * * @param offset * the illegal character or line offset that caused the exception - * @throws org.eclipse.che.ide.api.text.BadLocationException + * @throws org.eclipse.che.ide.api.editor.text.BadLocationException * always */ private void fail(int offset) throws BadLocationException { diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopySourceEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopySourceEdit.java index d164dde4d2..98c2a1295d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopySourceEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopySourceEdit.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; import java.util.ArrayList; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopyTargetEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopyTargetEdit.java index 78daa447b7..7355ef4438 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopyTargetEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopyTargetEdit.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; import java.util.List; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopyingRangeMarker.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopyingRangeMarker.java index 20e01b6956..897a3b755e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopyingRangeMarker.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/CopyingRangeMarker.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; /** diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/DeleteEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/DeleteEdit.java index c31d31d416..092d94cdd9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/DeleteEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/DeleteEdit.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; /** diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/EditDocument.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/EditDocument.java index 8a49f8344b..205f5daeca 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/EditDocument.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/EditDocument.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.BadPositionCategoryException; -import org.eclipse.che.ide.api.text.Position; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.TypedRegion; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +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.Region; +import org.eclipse.che.ide.api.editor.text.TypedRegion; import org.eclipse.che.ide.ext.java.jdt.text.BadPartitioningException; import org.eclipse.che.ide.ext.java.jdt.text.Document; import org.eclipse.che.ide.ext.java.jdt.text.DocumentListener; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/InsertEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/InsertEdit.java index 1e89ac46e9..641c458fa8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/InsertEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/InsertEdit.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; /** diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MoveSourceEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MoveSourceEdit.java index ddc7d47185..e52a36a35b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MoveSourceEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MoveSourceEdit.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.RegionImpl; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.editor.text.RegionImpl; import org.eclipse.che.ide.ext.java.jdt.text.Document; import java.util.ArrayList; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MoveTargetEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MoveTargetEdit.java index daed7aed2c..3a46e0941d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MoveTargetEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MoveTargetEdit.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; import java.util.ArrayList; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MultiTextEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MultiTextEdit.java index 7f3e340624..6307832fc3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MultiTextEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/MultiTextEdit.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.Region; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.Region; import org.eclipse.che.ide.ext.java.jdt.text.Document; import java.util.List; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/RangeMarker.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/RangeMarker.java index 9c768012c9..fe5eaf3c4a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/RangeMarker.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/RangeMarker.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; /** A range marker can be used to track positions when executing text edits. */ diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/ReplaceEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/ReplaceEdit.java index 00dc2ab074..21b7c74702 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/ReplaceEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/ReplaceEdit.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; /** Text edit to replace a range in a document with a different string. */ diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEdit.java index f025d210a6..61b9ceceeb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEdit.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; -import org.eclipse.che.ide.api.text.Region; -import org.eclipse.che.ide.api.text.RegionImpl; +import org.eclipse.che.ide.api.editor.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.Region; +import org.eclipse.che.ide.api.editor.text.RegionImpl; import org.eclipse.che.ide.ext.java.jdt.text.Document; import java.util.ArrayList; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEditGroup.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEditGroup.java index b1153e9cb5..0ee3a83292 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEditGroup.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEditGroup.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.Region; +import org.eclipse.che.ide.api.editor.text.Region; import java.util.ArrayList; import java.util.Arrays; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEditProcessor.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEditProcessor.java index 5371922c69..0fc96da4a7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEditProcessor.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/TextEditProcessor.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; import java.util.ArrayList; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/UndoCollector.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/UndoCollector.java index ea21e5b4fa..6f371a64b5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/UndoCollector.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/UndoCollector.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; import org.eclipse.che.ide.ext.java.jdt.text.DocumentEvent; import org.eclipse.che.ide.ext.java.jdt.text.DocumentListener; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/UndoEdit.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/UndoEdit.java index 24530b27f5..4293329b16 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/UndoEdit.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/edits/UndoEdit.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.java.jdt.text.edits; -import org.eclipse.che.ide.api.text.BadLocationException; +import org.eclipse.che.ide.api.editor.text.BadLocationException; import org.eclipse.che.ide.ext.java.jdt.text.Document; import java.util.ArrayList; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/rules/TokenScanner.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/rules/TokenScanner.java index 61b24ab360..5d8683c08a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/rules/TokenScanner.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/jdt/text/rules/TokenScanner.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.ext.java.jdt.text.rules; -import org.eclipse.che.ide.api.text.rules.Token; +import org.eclipse.che.ide.api.editor.text.rules.Token; import org.eclipse.che.ide.ext.java.jdt.text.Document; /** diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml index 48da40b39d..f491010084 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml @@ -22,7 +22,6 @@ - diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/action/OrganizeImportsActionTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/action/OrganizeImportsActionTest.java index 432df0a8ae..f2071ac350 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/action/OrganizeImportsActionTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/action/OrganizeImportsActionTest.java @@ -16,7 +16,7 @@ import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.organizeimports.OrganizeImportsPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -42,7 +42,7 @@ public class OrganizeImportsActionTest { private ActionEvent actionEvent; @Mock - private EmbeddedTextEditorPresenter editor; + private TextEditorPresenter editor; @Mock(answer = Answers.RETURNS_MOCKS) private JavaLocalizationConstant locale; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenterTest.java index 2d6dfca728..2511d9223e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenterTest.java @@ -27,9 +27,9 @@ import org.eclipse.che.ide.ext.java.client.project.node.JavaNodeManager; import org.eclipse.che.ide.ext.java.shared.dto.Region; import org.eclipse.che.ide.ext.java.shared.dto.model.CompilationUnit; import org.eclipse.che.ide.ext.java.shared.dto.model.Member; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.text.LinearRange; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.text.LinearRange; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.ui.loaders.request.LoaderFactory; import org.eclipse.che.ide.ui.loaders.request.MessageLoader; @@ -74,23 +74,23 @@ public class FileStructurePresenterTest { private JavaNodeManager javaNodeManager; @Mock - private EmbeddedTextEditorPresenter editorPartPresenter; + private TextEditorPresenter editorPartPresenter; @Mock - private EditorInput editorInput; + private EditorInput editorInput; @Mock - private VirtualFile virtualFile; + private VirtualFile virtualFile; @Mock - private HasProjectConfig hasProjectConfig; + private HasProjectConfig hasProjectConfig; @Mock - private ProjectConfigDto profileConfig; + private ProjectConfigDto profileConfig; @Mock - private CurrentProject currentProject; + private CurrentProject currentProject; @Mock - private Promise promice; + private Promise promice; @Mock - private Promise nodePromise; + private Promise nodePromise; @Mock - private CompilationUnit compilationUnit; + private CompilationUnit compilationUnit; @Mock private Member member; @Mock diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenterTest.java index 1445dda94d..cabada5c67 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenterTest.java @@ -29,10 +29,10 @@ import org.eclipse.che.ide.ext.java.client.navigation.service.JavaNavigationServ import org.eclipse.che.ide.ext.java.client.project.node.JavaNodeManager; import org.eclipse.che.ide.ext.java.shared.dto.ImplementationsDescriptorDTO; import org.eclipse.che.ide.ext.java.shared.dto.model.Type; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.popup.PopupResources; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.ui.popup.PopupResources; +import org.eclipse.che.ide.api.editor.position.PositionConverter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.junit.Before; import org.junit.Test; @@ -82,7 +82,7 @@ public class OpenImplementationPresenterTest { private JavaLocalizationConstant locale; @Mock - private EmbeddedTextEditorPresenter editorPartPresenter; + private TextEditorPresenter editorPartPresenter; @Mock private EditorInput editorInput; @Mock diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java index 0db02bf70b..ca2529a14e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java @@ -25,8 +25,8 @@ import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.editor.JavaCodeAssistClient; import org.eclipse.che.ide.ext.java.shared.dto.ConflictImportDTO; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/project/classpath/ProjectClasspathPresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/project/classpath/ProjectClasspathPresenterTest.java index 38e298e812..85c4e12a0d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/project/classpath/ProjectClasspathPresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/project/classpath/ProjectClasspathPresenterTest.java @@ -20,15 +20,14 @@ import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.notification.StatusNotification; import org.eclipse.che.ide.ext.java.client.JavaLocalizationConstant; import org.eclipse.che.ide.ext.java.client.project.classpath.service.ClasspathServiceClient; import org.eclipse.che.ide.ext.java.client.project.classpath.valueproviders.pages.ClasspathPagePresenter; import org.eclipse.che.ide.ext.java.shared.dto.classpath.ClasspathEntryDTO; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java index 1103618d9a..636e41fb14 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java @@ -40,7 +40,7 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringSession; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.ReorgDestination; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.junit.Before; import org.junit.Test; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenterTest.java index 2b7a1d8d74..514ebace81 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenterTest.java @@ -33,7 +33,7 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringChange; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringPreview; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringSession; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.junit.Before; import org.junit.Test; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java index 9328af0c41..321c0fc300 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java @@ -36,19 +36,19 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.LinkedRenameRefactori import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringResult; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatusEntry; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameRefactoringSession; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.link.HasLinkedMode; -import org.eclipse.che.ide.jseditor.client.link.LinkedMode; -import org.eclipse.che.ide.jseditor.client.link.LinkedModel; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.link.HasLinkedMode; +import org.eclipse.che.ide.api.editor.link.LinkedMode; +import org.eclipse.che.ide.api.editor.link.LinkedModel; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.InputCallback; -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 org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.InputDialog; +import org.eclipse.che.ide.api.dialogs.MessageDialog; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java index bb75f94156..8946c55dcf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java @@ -49,12 +49,12 @@ import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatusEntry; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameRefactoringSession; import org.eclipse.che.ide.ext.java.shared.dto.refactoring.RenameSettings; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import org.eclipse.che.ide.ui.loaders.request.LoaderFactory; import org.junit.Before; import org.junit.Test; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/org/eclipse/che/ide/ext/java/JavaTest.gwt.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/org/eclipse/che/ide/ext/java/JavaTest.gwt.xml index 5c95a97343..507aa6e19a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/org/eclipse/che/ide/ext/java/JavaTest.gwt.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/org/eclipse/che/ide/ext/java/JavaTest.gwt.xml @@ -22,7 +22,6 @@ - diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml index 1d3aef9669..97a0bb16be 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml @@ -105,10 +105,6 @@ org.eclipse.che.core che-core-ide-app - - org.eclipse.che.core - che-core-ide-jseditor - org.eclipse.che.core che-core-ide-ui diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenter.java index 3a98b8a76c..88a3309afa 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenter.java @@ -34,10 +34,10 @@ import org.eclipse.che.ide.extension.machine.client.command.CommandConfiguration import org.eclipse.che.ide.extension.machine.client.command.CommandManager; import org.eclipse.che.ide.extension.machine.client.command.CommandType; import org.eclipse.che.ide.extension.machine.client.command.CommandTypeRegistry; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.choice.ChoiceDialog; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ChoiceDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import org.eclipse.che.ide.util.loging.Log; import java.util.ArrayList; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/OutputsContainerPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/OutputsContainerPresenter.java index bca52c189c..e619e6014c 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/OutputsContainerPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/OutputsContainerPresenter.java @@ -27,8 +27,8 @@ import org.eclipse.che.ide.api.parts.HasView; import org.eclipse.che.ide.api.outputconsole.OutputConsole; import org.eclipse.che.ide.api.parts.base.BasePresenter; import org.eclipse.che.ide.extension.machine.client.MachineLocalizationConstant; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.vectomatic.dom.svg.ui.SVGResource; import javax.validation.constraints.NotNull; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorInput.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorInput.java index 873eb41125..38ad5acb53 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorInput.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorInput.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.machine.client.perspective.widgets.recipe.editor; -import com.google.gwt.resources.client.ImageResource; - import org.eclipse.che.ide.api.editor.EditorInput; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.project.tree.VirtualFile; @@ -34,12 +32,6 @@ public class RecipeEditorInput implements EditorInput { this.file = file; } - /** {@inheritDoc} */ - @Override - public String getContentDescription() { - return fileType.getContentDescription(); - } - /** {@inheritDoc} */ @NotNull @Override @@ -54,18 +46,11 @@ public class RecipeEditorInput implements EditorInput { return file.getDisplayName(); } - /** {@inheritDoc} */ - @NotNull - @Override - public ImageResource getImageResource() { - return fileType.getImage(); - } - /** {@inheritDoc} */ @NotNull @Override public SVGResource getSVGResource() { - return fileType.getSVGImage(); + return fileType.getImage(); } /** {@inheritDoc} */ diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorPanel.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorPanel.java index 3848a6c91e..ea5ee5b946 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorPanel.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorPanel.java @@ -20,20 +20,18 @@ import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.editor.OpenEditorCallbackImpl; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; -import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.parts.PartPresenter; import org.eclipse.che.ide.api.parts.PropertyListener; import org.eclipse.che.ide.api.project.tree.VirtualFile; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.api.texteditor.HasReadOnlyProperty; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; +import org.eclipse.che.ide.api.editor.texteditor.HandlesUndoRedo; +import org.eclipse.che.ide.api.editor.texteditor.HasReadOnlyProperty; +import org.eclipse.che.ide.api.editor.texteditor.UndoableEditor; import org.eclipse.che.ide.editor.orion.client.OrionEditorWidget; import org.eclipse.che.ide.editor.orion.client.OrionTextEditorFactory; import org.eclipse.che.ide.extension.machine.client.perspective.widgets.tab.content.TabPresenter; -import org.eclipse.che.ide.jseditor.client.editorconfig.DefaultTextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditor; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.editorconfig.DefaultTextEditorConfiguration; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import javax.validation.constraints.NotNull; import java.util.List; @@ -52,7 +50,6 @@ public class RecipeEditorPanel implements TabPresenter, RecipeEditorView.ActionD private final FileTypeRegistry fileTypeRegistry; private final RecipeDescriptor recipeDescriptor; private final OrionTextEditorFactory orionTextEditorFactory; - private final NotificationManager notificationManager; private EditorPartPresenter editor; private ActionDelegate delegate; @@ -64,11 +61,9 @@ public class RecipeEditorPanel implements TabPresenter, RecipeEditorView.ActionD public RecipeEditorPanel(RecipeFileFactory recipeFileFactory, FileTypeRegistry fileTypeRegistry, OrionTextEditorFactory orionTextEditorFactory, - NotificationManager notificationManager, RecipeEditorView view, @Assisted @NotNull RecipeDescriptor recipeDescriptor) { this.view = view; - this.notificationManager = notificationManager; this.recipeFileFactory = recipeFileFactory; this.orionTextEditorFactory = orionTextEditorFactory; this.fileTypeRegistry = fileTypeRegistry; @@ -172,9 +167,9 @@ public class RecipeEditorPanel implements TabPresenter, RecipeEditorView.ActionD editor.init(new RecipeEditorInput(fileType, file), new OpenEditorCallbackImpl()); } - private EmbeddedTextEditor getEditor() { - EmbeddedTextEditorPresenter editor = orionTextEditorFactory.createTextEditor(); - editor.initialize(new DefaultTextEditorConfiguration(), notificationManager); + private TextEditor getEditor() { + TextEditorPresenter editor = orionTextEditorFactory.createTextEditor(); + editor.initialize(new DefaultTextEditorConfiguration()); return editor; } @@ -270,4 +265,4 @@ public class RecipeEditorPanel implements TabPresenter, RecipeEditorView.ActionD /** Selects firs created recipe. */ void selectRecipe(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenter.java index add50087cf..54bd16d42b 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenter.java @@ -50,8 +50,8 @@ import org.eclipse.che.ide.extension.machine.client.outputspanel.console.Default import org.eclipse.che.ide.extension.machine.client.perspective.terminal.TerminalPresenter; import org.eclipse.che.ide.extension.machine.client.processes.event.ProcessFinishedEvent; import org.eclipse.che.ide.extension.machine.client.processes.event.ProcessFinishedHandler; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.util.loging.Log; import org.vectomatic.dom.svg.ui.SVGResource; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/targets/TargetsPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/targets/TargetsPresenter.java index 72b9c1451a..f9a3007bf4 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/targets/TargetsPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/targets/TargetsPresenter.java @@ -39,9 +39,9 @@ import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.extension.machine.client.MachineLocalizationConstant; import org.eclipse.che.ide.extension.machine.client.machine.MachineStateEvent; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.util.loging.Log; import org.eclipse.che.ide.websocket.MessageBusProvider; import org.eclipse.che.ide.websocket.rest.SubscriptionHandler; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineActionTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineActionTest.java index 72029fb587..9b25ad8764 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineActionTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineActionTest.java @@ -15,7 +15,7 @@ import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.extension.machine.client.MachineLocalizationConstant; import org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine.panel.MachinePanelPresenter; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenterTest.java index 6ff21b25f4..c6b35756d8 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenterTest.java @@ -24,7 +24,7 @@ import org.eclipse.che.ide.extension.machine.client.command.CommandConfiguration import org.eclipse.che.ide.extension.machine.client.command.CommandManager; import org.eclipse.che.ide.extension.machine.client.command.CommandType; import org.eclipse.che.ide.extension.machine.client.command.CommandTypeRegistry; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenterTest.java index 69227b1947..6dd838a67b 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenterTest.java @@ -35,7 +35,7 @@ import org.eclipse.che.ide.extension.machine.client.inject.factories.WidgetsFact import org.eclipse.che.ide.extension.machine.client.machine.Machine; import org.eclipse.che.ide.extension.machine.client.machine.MachineStateEvent; import org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine.appliance.MachineAppliancePresenter; -import org.eclipse.che.ide.ui.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.InputCallback; import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedEvent; import org.junit.Before; import org.junit.Test; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorInputTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorInputTest.java index 27dffb718d..2f7055622f 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorInputTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorInputTest.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.machine.client.perspective.widgets.recipe.editor; -import com.google.gwt.resources.client.ImageResource; import com.google.gwtmockito.GwtMockitoTestRunner; import org.eclipse.che.ide.api.filetypes.FileType; @@ -42,8 +41,6 @@ public class RecipeEditorInputTest { @Mock private VirtualFile file; - @Mock - private ImageResource image; @Mock private SVGResource svgImage; @@ -52,17 +49,8 @@ public class RecipeEditorInputTest { @Before public void setUp() { - when(fileType.getContentDescription()).thenReturn(TEXT); when(file.getDisplayName()).thenReturn(TEXT); - when(fileType.getImage()).thenReturn(image); - when(fileType.getSVGImage()).thenReturn(svgImage); - } - - @Test - public void contentDescriptionShouldBeReturned() { - assertThat(recipeEditorInput.getContentDescription(), is(TEXT)); - - verify(fileType).getContentDescription(); + when(fileType.getImage()).thenReturn(svgImage); } @Test @@ -77,18 +65,11 @@ public class RecipeEditorInputTest { verify(file).getDisplayName(); } - @Test - public void imageResourcesShouldBeReturned() { - assertThat(recipeEditorInput.getImageResource(), is(image)); - - verify(fileType).getImage(); - } - @Test public void svgResourcesShouldBeReturned() { assertThat(recipeEditorInput.getSVGResource(), is(svgImage)); - verify(fileType).getSVGImage(); + verify(fileType).getImage(); } @Test diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorPanelTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorPanelTest.java index 4bb5535b42..176d41311f 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorPanelTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeEditorPanelTest.java @@ -15,12 +15,11 @@ import com.google.gwtmockito.GwtMockitoTestRunner; import org.eclipse.che.api.machine.shared.dto.recipe.RecipeDescriptor; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.filetypes.FileTypeRegistry; -import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.project.tree.VirtualFile; import org.eclipse.che.ide.editor.orion.client.OrionEditorWidget; import org.eclipse.che.ide.editor.orion.client.OrionTextEditorFactory; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,15 +53,13 @@ public class RecipeEditorPanelTest { private RecipeDescriptor recipeDescriptor; @Mock private OrionTextEditorFactory orionTextEditorFactory; - @Mock - private NotificationManager notificationManager; @Mock - private VirtualFile recipeFile; + private VirtualFile recipeFile; @Mock - private RecipeEditorPanel.ActionDelegate delegate; + private RecipeEditorPanel.ActionDelegate delegate; @Mock - private EmbeddedTextEditorPresenter editor; + private TextEditorPresenter editor; private RecipeEditorPanel presenter; @@ -75,7 +72,6 @@ public class RecipeEditorPanelTest { presenter = new RecipeEditorPanel(recipeFileFactory, fileTypeRegistry, orionTextEditorFactory, - notificationManager, view, recipeDescriptor); diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenterTest.java index 2dea70c5ee..9827d67d5a 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenterTest.java @@ -46,8 +46,8 @@ import org.eclipse.che.ide.extension.machine.client.outputspanel.console.Command import org.eclipse.che.ide.extension.machine.client.outputspanel.console.CommandOutputConsole; import org.eclipse.che.ide.extension.machine.client.perspective.terminal.TerminalPresenter; import org.eclipse.che.ide.extension.machine.client.processes.event.ProcessFinishedEvent; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/manage/SshKeyManagerPresenter.java b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/manage/SshKeyManagerPresenter.java index 7d6083afd8..58b11950b7 100644 --- a/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/manage/SshKeyManagerPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/manage/SshKeyManagerPresenter.java @@ -26,10 +26,10 @@ import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.preferences.AbstractPreferencePagePresenter; import org.eclipse.che.ide.ext.ssh.client.SshLocalizationConstant; import org.eclipse.che.ide.ext.ssh.client.upload.UploadSshKeyPresenter; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.InputCallback; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.InputCallback; import javax.validation.constraints.NotNull; import java.util.List; @@ -61,7 +61,7 @@ public class SshKeyManagerPresenter extends AbstractPreferencePagePresenter impl UploadSshKeyPresenter uploadSshKeyPresenter, NotificationManager notificationManager, DialogFactory dialogFactory) { - super(constant.sshManagerTitle(), constant.sshManagerCategory(), null); + super(constant.sshManagerTitle(), constant.sshManagerCategory()); this.view = view; this.dialogFactory = dialogFactory; diff --git a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml index 71319b9dfd..7f63477d9d 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml @@ -84,10 +84,6 @@ org.eclipse.che.core che-core-ide-app - - org.eclipse.che.core - che-core-ide-jseditor - org.eclipse.che.core che-core-ide-ui diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/MavenExtension.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/MavenExtension.java index 4bb6f43a27..241ee2a66a 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/MavenExtension.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/MavenExtension.java @@ -91,7 +91,10 @@ public class MavenExtension { } @Inject - private void registerFileType(FileTypeRegistry fileTypeRegistry, MavenResources mavenResources, EditorRegistry editorRegistry, PomEditorProvider editorProvider) { + private void registerFileType(FileTypeRegistry fileTypeRegistry, + MavenResources mavenResources, + EditorRegistry editorRegistry, + PomEditorProvider editorProvider) { FileType pomFile = new FileType(mavenResources.maven(), "pom.xml"); fileTypeRegistry.registerFileType(pomFile); editorRegistry.register(pomFile, editorProvider); diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/comunnication/PomEditorReconciler.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/comunnication/PomEditorReconciler.java index 6e06013a06..b24d50d464 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/comunnication/PomEditorReconciler.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/comunnication/PomEditorReconciler.java @@ -16,16 +16,16 @@ import com.google.inject.Singleton; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorPartPresenter; +import org.eclipse.che.ide.api.editor.reconciler.Reconciler; +import org.eclipse.che.ide.api.editor.reconciler.ReconcilingStrategy; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; import org.eclipse.che.plugin.maven.client.editor.PomReconsilingStrategy; -import org.eclipse.che.ide.jseditor.client.reconciler.Reconciler; -import org.eclipse.che.ide.jseditor.client.reconciler.ReconcilingStrategy; -import org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor; import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner.DEFAULT_CONTENT_TYPE; +import static org.eclipse.che.ide.api.editor.partition.DocumentPartitioner.DEFAULT_CONTENT_TYPE; /** * @author Evgen Vidolob @@ -50,8 +50,8 @@ public class PomEditorReconciler { for (EditorPartPresenter openedEditor : openedEditors) { String path = openedEditor.getEditorInput().getFile().getPath(); if (pomPaths.contains(path)) { - if (openedEditor instanceof ConfigurableTextEditor) { - final Reconciler reconciler = ((ConfigurableTextEditor)openedEditor).getConfiguration().getReconciler(); + if (openedEditor instanceof TextEditor) { + final Reconciler reconciler = ((TextEditor)openedEditor).getConfiguration().getReconciler(); if (reconciler != null) { final ReconcilingStrategy strategy = reconciler.getReconcilingStrategy(DEFAULT_CONTENT_TYPE); if (strategy instanceof PomReconsilingStrategy) { diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/ClassFileSourcesDownloader.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/ClassFileSourcesDownloader.java index fa33c494e9..e6ccc452d9 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/ClassFileSourcesDownloader.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/ClassFileSourcesDownloader.java @@ -32,13 +32,13 @@ import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.notification.StatusNotification; import org.eclipse.che.ide.api.project.tree.VirtualFile; import org.eclipse.che.ide.ext.java.client.project.node.jar.JarFileNode; +import org.eclipse.che.ide.api.editor.texteditor.HasNotificationPanel; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPartView; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; +import org.eclipse.che.ide.util.dom.Elements; import org.eclipse.che.plugin.maven.client.MavenLocalizationConstant; import org.eclipse.che.plugin.maven.client.MavenResources; import org.eclipse.che.plugin.maven.client.service.MavenServerServiceClient; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPartView; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.HasNotificationPanel; -import org.eclipse.che.ide.util.dom.Elements; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.EMERGE_MODE; @@ -78,9 +78,9 @@ public class ClassFileSourcesDownloader implements EditorOpenedEventHandler { if (file instanceof JarFileNode) { final JarFileNode jarFileNode = (JarFileNode)file; if (jarFileNode.isContentGenerated()) { - if (editor instanceof EmbeddedTextEditorPresenter) { - final EmbeddedTextEditorPresenter presenter = (EmbeddedTextEditorPresenter)editor; - EmbeddedTextEditorPartView view = presenter.getView(); + if (editor instanceof TextEditorPresenter) { + final TextEditorPresenter presenter = (TextEditorPresenter)editor; + TextEditorPartView view = presenter.getView(); final DivElement divElement = Elements.createDivElement(); divElement.setClassName(resources.css().editorInfoPanel()); Text textNode = Elements.createTextNode(constant.mavenClassDecompiled()); diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorConfiguration.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorConfiguration.java index a5133ba032..10478156d6 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorConfiguration.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorConfiguration.java @@ -15,15 +15,15 @@ import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; import org.eclipse.che.ide.ext.java.client.editor.JavaAnnotationModelFactory; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel; -import org.eclipse.che.ide.jseditor.client.editorconfig.AutoSaveTextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.partition.DocumentPositionMap; -import org.eclipse.che.ide.jseditor.client.reconciler.Reconciler; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModel; +import org.eclipse.che.ide.api.editor.editorconfig.AutoSaveTextEditorConfiguration; +import org.eclipse.che.ide.api.editor.partition.DocumentPositionMap; +import org.eclipse.che.ide.api.editor.reconciler.Reconciler; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import javax.validation.constraints.NotNull; -import static org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner.DEFAULT_CONTENT_TYPE; +import static org.eclipse.che.ide.api.editor.partition.DocumentPartitioner.DEFAULT_CONTENT_TYPE; /** * @author Evgen Vidolob @@ -36,7 +36,7 @@ public class PomEditorConfiguration extends AutoSaveTextEditorConfiguration { public PomEditorConfiguration(Provider docPositionMapProvider, JavaAnnotationModelFactory javaAnnotationModelFactory, PomReconsilingStrategyFactory reconsilingStrategyFactory, - @Assisted @NotNull final EmbeddedTextEditorPresenter editor) { + @Assisted @NotNull final TextEditorPresenter editor) { annotationModel = javaAnnotationModelFactory.create(docPositionMapProvider.get()); PomReconsilingStrategy reconsilingStrategy = reconsilingStrategyFactory.create(annotationModel, editor); Reconciler reconciler = getReconciler(); diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorConfigurationFactory.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorConfigurationFactory.java index fed540ed17..dab8f9f4b2 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorConfigurationFactory.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorConfigurationFactory.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.che.plugin.maven.client.editor; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; /** * @author Evgen Vidolob */ public interface PomEditorConfigurationFactory { - PomEditorConfiguration create(EmbeddedTextEditorPresenter editor); + PomEditorConfiguration create(TextEditorPresenter editor); } diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorProvider.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorProvider.java index de7406b526..a73a0b77db 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorProvider.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomEditorProvider.java @@ -13,32 +13,23 @@ package org.eclipse.che.plugin.maven.client.editor; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.editor.EditorProvider; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.jseditor.client.defaulteditor.DefaultEditorProvider; -import org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.defaulteditor.AbstractTextEditorProvider; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; /** * Creates editor for pom.xml file * * @author Evgen Vidolob + * @author Artem Zatsarynnyi */ @Singleton -public class PomEditorProvider implements EditorProvider { +public class PomEditorProvider extends AbstractTextEditorProvider { - - private final DefaultEditorProvider editorProvider; - private final NotificationManager notificationManager; private final PomEditorConfigurationFactory configurationFactory; @Inject - public PomEditorProvider(DefaultEditorProvider editorProvider, - NotificationManager notificationManager, - PomEditorConfigurationFactory configurationFactory) { - this.editorProvider = editorProvider; - this.notificationManager = notificationManager; + public PomEditorProvider(PomEditorConfigurationFactory configurationFactory) { this.configurationFactory = configurationFactory; } @@ -53,10 +44,13 @@ public class PomEditorProvider implements EditorProvider { } @Override - public EditorPartPresenter getEditor() { - ConfigurableTextEditor editor = editorProvider.getEditor(); - PomEditorConfiguration configuration = configurationFactory.create((EmbeddedTextEditorPresenter)editor); - editor.initialize(configuration, notificationManager); + public TextEditor getEditor() { + TextEditor editor = super.getEditor(); + if (editor instanceof TextEditorPresenter) { + PomEditorConfiguration configuration = configurationFactory.create((TextEditorPresenter)editor); + editor.initialize(configuration); + } + return editor; } } diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomReconsilingStrategy.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomReconsilingStrategy.java index 44a8997cd5..0086dfbf80 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomReconsilingStrategy.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomReconsilingStrategy.java @@ -17,16 +17,16 @@ import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.ide.api.editor.EditorWithErrors; -import org.eclipse.che.ide.api.text.Region; +import org.eclipse.che.ide.api.editor.text.Region; import org.eclipse.che.ide.ext.java.client.editor.ProblemRequester; import org.eclipse.che.ide.ext.java.shared.dto.Problem; -import org.eclipse.che.plugin.maven.client.service.MavenServerServiceClient; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.reconciler.DirtyRegion; -import org.eclipse.che.ide.jseditor.client.reconciler.ReconcilingStrategy; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModel; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.reconciler.DirtyRegion; +import org.eclipse.che.ide.api.editor.reconciler.ReconcilingStrategy; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; import org.eclipse.che.ide.util.loging.Log; +import org.eclipse.che.plugin.maven.client.service.MavenServerServiceClient; import javax.validation.constraints.NotNull; import java.util.List; @@ -39,7 +39,7 @@ import java.util.List; public class PomReconsilingStrategy implements ReconcilingStrategy { private final AnnotationModel annotationModel; - private final EmbeddedTextEditorPresenter + private final TextEditorPresenter editor; private final MavenServerServiceClient client; private String pomPath; @@ -47,7 +47,7 @@ public class PomReconsilingStrategy implements ReconcilingStrategy { @Inject public PomReconsilingStrategy(@Assisted AnnotationModel annotationModel, - @Assisted @NotNull final EmbeddedTextEditorPresenter editor, + @Assisted @NotNull final TextEditorPresenter editor, MavenServerServiceClient client) { this.annotationModel = annotationModel; this.editor = editor; diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomReconsilingStrategyFactory.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomReconsilingStrategyFactory.java index 02a719d486..02bb5e6333 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomReconsilingStrategyFactory.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/editor/PomReconsilingStrategyFactory.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.che.plugin.maven.client.editor; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModel; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; /** * Factory class for creating PomReconsiligStrategy @@ -20,5 +20,5 @@ import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresente */ public interface PomReconsilingStrategyFactory { - PomReconsilingStrategy create(AnnotationModel annotationModel, EmbeddedTextEditorPresenter editor); + PomReconsilingStrategy create(AnnotationModel annotationModel, TextEditorPresenter editor); } diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/module/CreateMavenModulePresenter.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/module/CreateMavenModulePresenter.java index 53eee6a68e..96ddee01dd 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/module/CreateMavenModulePresenter.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/module/CreateMavenModulePresenter.java @@ -30,7 +30,7 @@ import org.eclipse.che.ide.project.node.ModuleNode; import org.eclipse.che.ide.project.node.ProjectNode; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.util.NameUtils; import org.eclipse.che.ide.util.loging.Log; diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenter.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenter.java index c7b838f0ae..4128e18a80 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenter.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenter.java @@ -24,7 +24,7 @@ import org.eclipse.che.plugin.maven.client.MavenArchetype; import org.eclipse.che.plugin.maven.client.MavenExtension; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.util.loging.Log; import javax.validation.constraints.NotNull; diff --git a/plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml b/plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml index 2a818520ad..fb79996e28 100644 --- a/plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml +++ b/plugins/plugin-orion/che-plugin-orion-compare/src/main/resources/org/eclipse/che/ide/orion/OrionCompare.gwt.xml @@ -14,6 +14,7 @@ - + + - \ No newline at end of file + diff --git a/plugins/plugin-orion/che-plugin-orion-editor/pom.xml b/plugins/plugin-orion/che-plugin-orion-editor/pom.xml index a57acd09a2..2066cb3330 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/pom.xml +++ b/plugins/plugin-orion/che-plugin-orion-editor/pom.xml @@ -26,6 +26,8 @@ false 2014-2015 ${basedir}/src/main/patches + http://requirejs.org/docs/release/${requirejs.upstream.version}/comments/ + 2.1.15 @@ -72,10 +74,6 @@ org.eclipse.che.core che-core-ide-app - - org.eclipse.che.core - che-core-ide-jseditor - org.eclipse.che.core che-core-ide-ui @@ -98,6 +96,9 @@ src/main/resources + + target/requirejs-${requirejs.upstream.version} + @@ -127,6 +128,24 @@ + + org.codehaus.mojo + wagon-maven-plugin + 1.0-beta-4 + + + generate-resources + + download-single + + + ${requirejs.upstream.url} + require.js + ${project.build.directory}/requirejs-${requirejs.upstream.version}/org/eclipse/che/ide/editor/orion/public/require.js + + + + com.mycila license-maven-plugin diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/ContentAssistWidget.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/ContentAssistWidget.java index 2d0735c0f0..277af82ede 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/ContentAssistWidget.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/ContentAssistWidget.java @@ -32,18 +32,18 @@ import com.google.gwt.user.client.ui.Widget; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; -import org.eclipse.che.ide.api.texteditor.UndoableEditor; +import org.eclipse.che.ide.api.editor.texteditor.HandlesUndoRedo; +import org.eclipse.che.ide.api.editor.texteditor.UndoableEditor; import org.eclipse.che.ide.editor.orion.client.jso.OrionKeyModeOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionModelChangedEventOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionPixelPositionOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionTextViewOverlay; -import org.eclipse.che.ide.jseditor.client.codeassist.Completion; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposal; -import org.eclipse.che.ide.jseditor.client.codeassist.CompletionProposalExtension; -import org.eclipse.che.ide.jseditor.client.events.CompletionRequestEvent; -import org.eclipse.che.ide.jseditor.client.popup.PopupResources; -import org.eclipse.che.ide.jseditor.client.text.LinearRange; +import org.eclipse.che.ide.api.editor.codeassist.Completion; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposal; +import org.eclipse.che.ide.api.editor.codeassist.CompletionProposalExtension; +import org.eclipse.che.ide.api.editor.events.CompletionRequestEvent; +import org.eclipse.che.ide.ui.popup.PopupResources; +import org.eclipse.che.ide.api.editor.text.LinearRange; import org.eclipse.che.ide.util.dom.Elements; import org.eclipse.che.ide.util.loging.Log; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/KeyMode.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/KeyMode.java index af32679d6f..92eb866c44 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/KeyMode.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/KeyMode.java @@ -10,28 +10,25 @@ *******************************************************************************/ package org.eclipse.che.ide.editor.orion.client; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; import com.google.gwt.core.shared.GWT; +import org.eclipse.che.ide.api.editor.keymap.Keymap; + /** * Keymaps supported by Orion. - * + * * @author "Mickaël Leduque" */ public class KeyMode { - public static Keymap DEFAULT; public static Keymap EMACS; public static Keymap VI; - public final static void init() { KeymodeDisplayConstants constants = GWT.create(KeymodeDisplayConstants.class); - EditorType orionEditor = EditorType.fromKey(OrionEditorExtension.ORION_EDITOR_KEY); - DEFAULT = Keymap.newKeymap("orion_default", constants.defaultKeymap(), orionEditor); - EMACS = Keymap.newKeymap("Orion_emacs", constants.emacs(), orionEditor); - VI = Keymap.newKeymap("Orion_vim", constants.vi(), orionEditor); + DEFAULT = Keymap.newKeymap("orion_default", constants.defaultKeymap()); + EMACS = Keymap.newKeymap("Orion_emacs", constants.emacs()); + VI = Keymap.newKeymap("Orion_vim", constants.vi()); } } diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/KeyModeInstances.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/KeyModeInstances.java index 384e0a8135..98843bb0f0 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/KeyModeInstances.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/KeyModeInstances.java @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.che.ide.editor.orion.client.jso.OrionKeyModeOverlay; -import org.eclipse.che.ide.jseditor.client.keymap.Keymap; +import org.eclipse.che.ide.api.editor.keymap.Keymap; /** * An instance repository for keymode instances. diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionBreakpointRuler.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionBreakpointRuler.java index 58590b77db..818dff935b 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionBreakpointRuler.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionBreakpointRuler.java @@ -19,8 +19,8 @@ import org.eclipse.che.ide.editor.orion.client.jso.OrionEditorOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionExtRulerOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionStyleOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionTextModelOverlay; -import org.eclipse.che.ide.jseditor.client.gutter.Gutter; -import org.eclipse.che.ide.jseditor.client.gutter.Gutters; +import org.eclipse.che.ide.api.editor.gutter.Gutter; +import org.eclipse.che.ide.api.editor.gutter.Gutters; import org.eclipse.che.ide.util.dom.Elements; /** diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionDocument.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionDocument.java index 47b78f527b..7ecf24af33 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionDocument.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionDocument.java @@ -18,22 +18,22 @@ import org.eclipse.che.ide.editor.orion.client.jso.OrionPixelPositionOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionSelectionOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionTextModelOverlay.EventHandler; import org.eclipse.che.ide.editor.orion.client.jso.OrionTextViewOverlay; -import org.eclipse.che.ide.jseditor.client.document.AbstractEmbeddedDocument; -import org.eclipse.che.ide.jseditor.client.document.Document; -import org.eclipse.che.ide.jseditor.client.events.CursorActivityHandler; -import org.eclipse.che.ide.jseditor.client.events.DocumentChangeEvent; -import org.eclipse.che.ide.jseditor.client.events.HasCursorActivityHandlers; -import org.eclipse.che.ide.jseditor.client.position.PositionConverter; -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.document.AbstractDocument; +import org.eclipse.che.ide.api.editor.document.Document; +import org.eclipse.che.ide.api.editor.events.CursorActivityHandler; +import org.eclipse.che.ide.api.editor.events.DocumentChangeEvent; +import org.eclipse.che.ide.api.editor.events.HasCursorActivityHandlers; +import org.eclipse.che.ide.api.editor.position.PositionConverter; +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; /** * The implementation of {@link Document} for Orion. * * @author "Mickaël Leduque" */ -public class OrionDocument extends AbstractEmbeddedDocument { +public class OrionDocument extends AbstractDocument { /** The maximum number of lines that may be visible at the top of the text view after setting selection range. */ private final static int MARGIN_TOP = 15; @@ -46,7 +46,6 @@ public class OrionDocument extends AbstractEmbeddedDocument { public OrionDocument(OrionTextViewOverlay textViewOverlay, HasCursorActivityHandlers hasCursorActivityHandlers, OrionEditorOverlay editorOverlay) { - this.textViewOverlay = textViewOverlay; this.hasCursorActivityHandlers = hasCursorActivityHandlers; this.editorOverlay = editorOverlay; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorBuilder.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorBuilder.java new file mode 100644 index 0000000000..2c319a7174 --- /dev/null +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorBuilder.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2014-2015 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.editor.orion.client; + +import com.google.inject.Inject; + +import org.eclipse.che.ide.api.editor.defaulteditor.EditorBuilder; +import org.eclipse.che.ide.api.editor.editorconfig.AutoSaveTextEditorConfiguration; +import org.eclipse.che.ide.api.editor.texteditor.TextEditor; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; + +/** + * Builder for Orion editor. + * + * @author Artem Zatsarynnyi + */ +public class OrionEditorBuilder implements EditorBuilder { + + private final OrionTextEditorFactory orionTextEditorFactory; + + @Inject + public OrionEditorBuilder(OrionTextEditorFactory orionTextEditorFactory) { + this.orionTextEditorFactory = orionTextEditorFactory; + } + + @Override + public TextEditor buildEditor() { + final TextEditorPresenter editor = orionTextEditorFactory.createTextEditor(); + editor.initialize(new AutoSaveTextEditorConfiguration()); + return editor; + } +} diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorExtension.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorExtension.java index 0cfa5ff2c7..0e3129167f 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorExtension.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorExtension.java @@ -26,16 +26,10 @@ import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.notification.StatusNotification; import org.eclipse.che.ide.editor.orion.client.jso.OrionKeyBindingModule; import org.eclipse.che.ide.editor.orion.client.jso.OrionTextThemeOverlay; -import org.eclipse.che.ide.jseditor.client.defaulteditor.EditorBuilder; -import org.eclipse.che.ide.jseditor.client.editorconfig.AutoSaveTextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.editortype.EditorType; -import org.eclipse.che.ide.jseditor.client.editortype.EditorTypeRegistry; -import org.eclipse.che.ide.jseditor.client.requirejs.RequireJsLoader; -import org.eclipse.che.ide.jseditor.client.requirejs.RequirejsErrorHandler.RequireError; -import org.eclipse.che.ide.jseditor.client.texteditor.AbstractEditorModule.EditorInitializer; -import org.eclipse.che.ide.jseditor.client.texteditor.AbstractEditorModule.InitializerCallback; -import org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; +import org.eclipse.che.ide.requirejs.RequireJsLoader; +import org.eclipse.che.ide.requirejs.RequirejsErrorHandler.RequireError; +import org.eclipse.che.ide.api.editor.texteditor.AbstractEditorModule.EditorInitializer; +import org.eclipse.che.ide.api.editor.texteditor.AbstractEditorModule.InitializerCallback; import org.eclipse.che.ide.util.loging.Log; import javax.inject.Inject; @@ -51,31 +45,21 @@ public class OrionEditorExtension implements Provider{ /** The logger. */ private static final Logger LOG = Logger.getLogger(OrionEditorExtension.class.getSimpleName()); - /** The editor type key. */ - public static final String ORION_EDITOR_KEY = "orion"; - private final NotificationManager notificationManager; - private final EditorTypeRegistry editorTypeRegistry; private final RequireJsLoader requireJsLoader; - private final OrionTextEditorFactory orionTextEditorFactory; private final OrionResource orionResource; private boolean initFailedWarnedOnce = false; private OrionKeyBindingModule keyBindingModule; - @Inject - public OrionEditorExtension(final EditorTypeRegistry editorTypeRegistry, - final NotificationManager notificationManager, + public OrionEditorExtension(final NotificationManager notificationManager, final RequireJsLoader requireJsLoader, final OrionEditorModule editorModule, - final OrionTextEditorFactory orionTextEditorFactory, final OrionResource orionResource) { this.notificationManager = notificationManager; - this.editorTypeRegistry = editorTypeRegistry; this.requireJsLoader = requireJsLoader; - this.orionTextEditorFactory = orionTextEditorFactory; this.orionResource = orionResource; editorModule.setEditorInitializer(new EditorInitializer() { @@ -96,8 +80,6 @@ public class OrionEditorExtension implements Provider{ } }); - // must not be delayed - registerEditor(); KeyMode.init(); } @@ -181,19 +163,6 @@ public class OrionEditorExtension implements Provider{ callback.onSuccess(); } - private void registerEditor() { - LOG.fine("Registering Orion editor type."); - editorTypeRegistry.registerEditorType(EditorType.fromKey(ORION_EDITOR_KEY), "Orion", new EditorBuilder() { - - @Override - public ConfigurableTextEditor buildEditor() { - final EmbeddedTextEditorPresenter editor = orionTextEditorFactory.createTextEditor(); - editor.initialize(new AutoSaveTextEditorConfiguration(), notificationManager); - return editor; - } - }); - } - private void defineDefaultTheme() { // The codenvy theme uses both an orion css file and a CssResource orionResource.editorStyle().ensureInjected(); diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorModule.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorModule.java index 852e5250db..fe196d9dbf 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorModule.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorModule.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.editor.orion.client; import javax.inject.Singleton; -import org.eclipse.che.ide.jseditor.client.texteditor.AbstractEditorModule; +import org.eclipse.che.ide.api.editor.texteditor.AbstractEditorModule; /** * {@link EditorModule} for the orion editor. diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java index d1210b4388..1b9f73f727 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java @@ -14,47 +14,48 @@ import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; import com.google.web.bindery.event.shared.EventBus; +import org.eclipse.che.ide.api.editor.EditorLocalizationConstants; +import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.parts.WorkspaceAgent; -import org.eclipse.che.ide.debug.BreakpointManager; +import org.eclipse.che.ide.api.debug.BreakpointManager; import org.eclipse.che.ide.editor.orion.client.jso.OrionLinkedModelDataOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionLinkedModelGroupOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionLinkedModelOverlay; -import org.eclipse.che.ide.jseditor.client.JsEditorConstants; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModel; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModelEvent; -import org.eclipse.che.ide.jseditor.client.annotation.AnnotationModelHandler; -import org.eclipse.che.ide.jseditor.client.annotation.ClearAnnotationModelEvent; -import org.eclipse.che.ide.jseditor.client.annotation.ClearAnnotationModelHandler; -import org.eclipse.che.ide.jseditor.client.annotation.HasAnnotationRendering; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistantFactory; -import org.eclipse.che.ide.jseditor.client.codeassist.HasCompletionInformation; -import org.eclipse.che.ide.jseditor.client.debug.BreakpointRendererFactory; -import org.eclipse.che.ide.jseditor.client.document.DocumentHandle; -import org.eclipse.che.ide.jseditor.client.document.DocumentStorage; -import org.eclipse.che.ide.jseditor.client.filetype.FileTypeIdentifier; -import org.eclipse.che.ide.jseditor.client.gutter.Gutter; -import org.eclipse.che.ide.jseditor.client.gutter.HasGutter; -import org.eclipse.che.ide.jseditor.client.link.HasLinkedMode; -import org.eclipse.che.ide.jseditor.client.link.LinkedMode; -import org.eclipse.che.ide.jseditor.client.link.LinkedModel; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelData; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelGroup; -import org.eclipse.che.ide.jseditor.client.quickfix.QuickAssistantFactory; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorModule; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorWidget; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorWidgetFactory; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPartView; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModel; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModelEvent; +import org.eclipse.che.ide.api.editor.annotation.AnnotationModelHandler; +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.codeassist.CodeAssistantFactory; +import org.eclipse.che.ide.api.editor.codeassist.HasCompletionInformation; +import org.eclipse.che.ide.api.debug.BreakpointRendererFactory; +import org.eclipse.che.ide.api.editor.document.DocumentHandle; +import org.eclipse.che.ide.api.editor.document.DocumentStorage; +import org.eclipse.che.ide.api.editor.filetype.FileTypeIdentifier; +import org.eclipse.che.ide.api.editor.gutter.Gutter; +import org.eclipse.che.ide.api.editor.gutter.HasGutter; +import org.eclipse.che.ide.api.editor.link.HasLinkedMode; +import org.eclipse.che.ide.api.editor.link.LinkedMode; +import org.eclipse.che.ide.api.editor.link.LinkedModel; +import org.eclipse.che.ide.api.editor.link.LinkedModelData; +import org.eclipse.che.ide.api.editor.link.LinkedModelGroup; +import org.eclipse.che.ide.api.editor.quickfix.QuickAssistantFactory; +import org.eclipse.che.ide.api.editor.texteditor.EditorModule; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidget; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidgetFactory; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPartView; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; +import org.eclipse.che.ide.api.dialogs.DialogFactory; /** - * {@link EmbeddedTextEditorPresenter} using orion. + * {@link TextEditorPresenter} using orion. * This class is only defined to allow the Gin binding to be performed. */ -public class OrionEditorPresenter extends EmbeddedTextEditorPresenter implements HasAnnotationRendering, - HasLinkedMode, - HasCompletionInformation, - HasGutter { +public class OrionEditorPresenter extends TextEditorPresenter implements HasAnnotationRendering, + HasLinkedMode, + HasCompletionInformation, + HasGutter { private final AnnotationRendering rendering = new AnnotationRendering(); @@ -64,14 +65,15 @@ public class OrionEditorPresenter extends EmbeddedTextEditorPresenter editorWigetFactory, final EditorModule editorModule, - final EmbeddedTextEditorPartView editorView, + final TextEditorPartView editorView, final EventBus eventBus, final FileTypeIdentifier fileTypeIdentifier, final QuickAssistantFactory quickAssistantFactory, - final WorkspaceAgent workspaceAgent) { + final WorkspaceAgent workspaceAgent, + final NotificationManager notificationManager) { super(codeAssistantFactory, breakpointManager, breakpointRendererFactory, @@ -84,7 +86,8 @@ public class OrionEditorPresenter extends EmbeddedTextEditorPresenter keyBindingModuleProvider, final ContentAssistWidgetFactory contentAssistWidgetFactory, final DialogFactory dialogFactory, + final PreferencesManager preferencesManager, @Assisted final List editorModes, @Assisted final WidgetInitializedCallback widgetInitializedCallback) { this.keyBindingModuleProvider = keyBindingModuleProvider; @@ -182,9 +182,9 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang this.keyModeInstances = keyModeInstances; this.eventBus = eventBus; this.dialogFactory = dialogFactory; + this.preferencesManager = preferencesManager; initWidget(UIBINDER.createAndBindUi(this)); - this.keymapPrefReader = keymapPrefReader; this.editorPropertiesManager = editorPropertiesManager; this.codeEditWidgetModule = moduleHolder.getModule("CodeEditWidget").cast(); @@ -303,7 +303,7 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang } @Override - public org.eclipse.che.ide.jseditor.client.document.Document getDocument() { + public org.eclipse.che.ide.api.editor.document.Document getDocument() { if (this.embeddedDocument == null) { this.embeddedDocument = new OrionDocument(this.editorOverlay.getTextView(), this, editorOverlay); } @@ -354,7 +354,7 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang if (!changeHandlerAdded) { changeHandlerAdded = true; final OrionTextViewOverlay textView = this.editorOverlay.getTextView(); - textView.addEventListener(OrionEventContants.MODEL_CHANGED_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { + textView.addEventListener(OrionEventConstants.MODEL_CHANGED_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { @Override public void onEvent() { @@ -374,7 +374,7 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang if (!cursorHandlerAdded) { cursorHandlerAdded = true; final OrionTextViewOverlay textView = this.editorOverlay.getTextView(); - textView.addEventListener(OrionEventContants.SELECTION_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { + textView.addEventListener(OrionEventConstants.SELECTION_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { @Override public void onEvent() { @@ -394,7 +394,7 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang if (!focusHandlerAdded) { focusHandlerAdded = true; final OrionTextViewOverlay textView = this.editorOverlay.getTextView(); - textView.addEventListener(OrionEventContants.FOCUS_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { + textView.addEventListener(OrionEventConstants.FOCUS_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { @Override public void onEvent() { @@ -414,7 +414,7 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang if (!blurHandlerAdded) { blurHandlerAdded = true; final OrionTextViewOverlay textView = this.editorOverlay.getTextView(); - textView.addEventListener(OrionEventContants.BLUR_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { + textView.addEventListener(OrionEventConstants.BLUR_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { @Override public void onEvent() { @@ -434,7 +434,7 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang if (!scrollHandlerAdded) { scrollHandlerAdded = true; final OrionTextViewOverlay textView = this.editorOverlay.getTextView(); - textView.addEventListener(OrionEventContants.SCROLL_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { + textView.addEventListener(OrionEventConstants.SCROLL_EVENT, new OrionTextViewOverlay.EventHandlerNoParameter() { @Override public void onEvent() { @@ -450,7 +450,8 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang } private void setupKeymode() { - final String propertyValue = this.keymapPrefReader.readPref(OrionEditorExtension.ORION_EDITOR_KEY); + final String propertyValue = preferencesManager.getValue(KeyMapsPreferencePresenter.KEYMAP_PREF_KEY); + Keymap keymap; try { keymap = Keymap.fromKey(propertyValue); @@ -461,11 +462,6 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang selectKeyMode(keymap); } - @Override - public EditorType getEditorType() { - return EditorType.getInstance(OrionEditorExtension.ORION_EDITOR_KEY); - } - @Override public Keymap getKeymap() { return this.keymap; @@ -512,36 +508,36 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang } @Override - public void addKeybinding(final Keybinding keybinding) { - addKeybinding(keybinding, ""); + public void addKeyBinding(final KeyBinding keyBinding) { + addKeyBinding(keyBinding, ""); } @Override - public void addKeybinding(final Keybinding keybinding, String actionDescription) { + public void addKeyBinding(final KeyBinding keyBinding, String actionDescription) { OrionKeyStrokeOverlay strokeOverlay; if (UserAgent.isMac()) { - strokeOverlay = OrionKeyStrokeOverlay.create(keybinding.getKeyCode(), - keybinding.isCmd(), - keybinding.isShift(), - keybinding.isAlt(), - keybinding.isControl(), + strokeOverlay = OrionKeyStrokeOverlay.create(keyBinding.getKeyCode(), + keyBinding.isCmd(), + keyBinding.isShift(), + keyBinding.isAlt(), + keyBinding.isControl(), "keydown", keyBindingModuleProvider.get()); } else { - strokeOverlay = OrionKeyStrokeOverlay.create(keybinding.getKeyCode(), - keybinding.isControl(), - keybinding.isShift(), - keybinding.isAlt(), + strokeOverlay = OrionKeyStrokeOverlay.create(keyBinding.getKeyCode(), + keyBinding.isControl(), + keyBinding.isShift(), + keyBinding.isAlt(), false, "keydown", keyBindingModuleProvider.get()); } - String actionId = "che-action-" + keybinding.getAction().toString(); + String actionId = "che-action-" + keyBinding.getAction().toString(); editorOverlay.getTextView().setKeyBinding(strokeOverlay, actionId); editorOverlay.getTextView().setAction(actionId, new Action() { @Override public void onAction() { - keybinding.getAction().action(); + keyBinding.getAction().action(); } }, actionDescription); } @@ -623,7 +619,7 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang public HandlerRegistration addGutterClickHandler(final GutterClickHandler handler) { if (!gutterClickHandlerAdded) { gutterClickHandlerAdded = true; - orionLineNumberRuler.addEventListener(OrionEventContants.RULER_CLICK_EVENT, + orionLineNumberRuler.addEventListener(OrionEventConstants.RULER_CLICK_EVENT, new OrionExtRulerOverlay.EventHandler() { @Override public void onEvent(OrionRulerClickEventOverlay parameter) { @@ -810,7 +806,7 @@ public class OrionEditorWidget extends CompositeEditorWidget implements HasChang /** * Custom callback to pass given value to native javascript function. */ - private class InputCallback implements org.eclipse.che.ide.ui.dialogs.InputCallback { + private class InputCallback implements org.eclipse.che.ide.api.dialogs.InputCallback { private JavaScriptObject callback; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEventContants.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEventConstants.java similarity index 96% rename from plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEventContants.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEventConstants.java index 5e30aef567..8f89a4045c 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEventContants.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEventConstants.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.editor.orion.client; -public interface OrionEventContants { +public interface OrionEventConstants { /* not complete atm */ String MODEL_CHANGED_EVENT = "ModelChanged"; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionLineStyler.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionLineStyler.java index f31b8a6f04..f8ae8aa9a4 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionLineStyler.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionLineStyler.java @@ -16,7 +16,7 @@ import org.eclipse.che.ide.editor.orion.client.jso.OrionAnnotationOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionAttributesOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionEditorOverlay; import org.eclipse.che.ide.editor.orion.client.jso.OrionStyleOverlay; -import org.eclipse.che.ide.jseditor.client.texteditor.LineStyler; +import org.eclipse.che.ide.api.editor.texteditor.LineStyler; /** * Implementation of {@link LineStyler} for orion. diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionTextEditorFactory.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionTextEditorFactory.java index 9ea2370cef..078beb9b56 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionTextEditorFactory.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionTextEditorFactory.java @@ -12,10 +12,10 @@ package org.eclipse.che.ide.editor.orion.client; import javax.inject.Inject; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorWidget; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorWidgetFactory; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenterFactory; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidget; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidgetFactory; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenterFactory; /** Editor presenter factory that produces orion-based editors. */ public class OrionTextEditorFactory { @@ -24,11 +24,11 @@ public class OrionTextEditorFactory { @Inject private EditorWidgetFactory editorWidgetFactory; - /** The base {@link EmbeddedTextEditorPresenter} factory. */ + /** The base {@link TextEditorPresenter} factory. */ @Inject - private EmbeddedTextEditorPresenterFactory presenterFactory; + private TextEditorPresenterFactory presenterFactory; - public EmbeddedTextEditorPresenter createTextEditor() { + public TextEditorPresenter createTextEditor() { return this.presenterFactory.createTextEditor(this.editorWidgetFactory); } } diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionUndoRedo.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionUndoRedo.java index 52d0eca053..46ae750cf3 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionUndoRedo.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionUndoRedo.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.editor.orion.client; import com.google.gwt.core.client.JavaScriptObject; -import org.eclipse.che.ide.api.texteditor.HandlesUndoRedo; +import org.eclipse.che.ide.api.editor.texteditor.HandlesUndoRedo; import org.eclipse.che.ide.editor.orion.client.jso.OrionUndoStackOverlay; /** diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasScrollHandlers.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/events/HasScrollHandlers.java similarity index 93% rename from plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasScrollHandlers.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/events/HasScrollHandlers.java index 4a981d5793..39d001cc4a 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/jseditor/client/events/HasScrollHandlers.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/events/HasScrollHandlers.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.editor.orion.client.events; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.event.shared.HasHandlers; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ScrollEvent.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/events/ScrollEvent.java similarity index 94% rename from plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ScrollEvent.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/events/ScrollEvent.java index d182563941..20323c565c 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ScrollEvent.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/events/ScrollEvent.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.editor.orion.client.events; import com.google.gwt.event.shared.GwtEvent; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ScrollHandler.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/events/ScrollHandler.java similarity index 93% rename from plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ScrollHandler.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/events/ScrollHandler.java index 332f43cd72..4bd9a3fc54 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/jseditor/client/events/ScrollHandler.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/events/ScrollHandler.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.editor.orion.client.events; import com.google.gwt.event.shared.EventHandler; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/inject/OrionEditorGinModule.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/inject/OrionEditorGinModule.java index 4b9bfd3ed3..10d5b4ddd7 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/inject/OrionEditorGinModule.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/inject/OrionEditorGinModule.java @@ -10,32 +10,25 @@ *******************************************************************************/ package org.eclipse.che.ide.editor.orion.client.inject; - import com.google.gwt.inject.client.AbstractGinModule; import com.google.gwt.inject.client.assistedinject.GinFactoryModuleBuilder; -import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; import org.eclipse.che.ide.api.extension.ExtensionGinModule; -import org.eclipse.che.ide.api.notification.NotificationManager; 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.OrionEditorExtension; import org.eclipse.che.ide.editor.orion.client.OrionEditorModule; import org.eclipse.che.ide.editor.orion.client.OrionEditorPresenter; import org.eclipse.che.ide.editor.orion.client.OrionEditorWidget; -import org.eclipse.che.ide.editor.orion.client.OrionTextEditorFactory; import org.eclipse.che.ide.editor.orion.client.jso.OrionKeyBindingModule; -import org.eclipse.che.ide.jseditor.client.JsEditorExtension; -import org.eclipse.che.ide.jseditor.client.defaulteditor.EditorBuilder; -import org.eclipse.che.ide.jseditor.client.editorconfig.AutoSaveTextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorModule; -import org.eclipse.che.ide.jseditor.client.texteditor.EditorWidgetFactory; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenterFactory; - -import javax.inject.Named; +import org.eclipse.che.ide.api.editor.defaulteditor.EditorBuilder; +import org.eclipse.che.ide.api.editor.texteditor.EditorModule; +import org.eclipse.che.ide.api.editor.texteditor.EditorWidgetFactory; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenter; +import org.eclipse.che.ide.api.editor.texteditor.TextEditorPresenterFactory; +import org.eclipse.che.ide.requirejs.ModuleHolder; @ExtensionGinModule public class OrionEditorGinModule extends AbstractGinModule { @@ -49,31 +42,13 @@ public class OrionEditorGinModule extends AbstractGinModule { install(new GinFactoryModuleBuilder().build(ContentAssistWidgetFactory.class)); install(new GinFactoryModuleBuilder() - .implement(new TypeLiteral>() { + .implement(new TypeLiteral>() { }, OrionEditorPresenter.class) - .build(new TypeLiteral>() { + .build(new TypeLiteral>() { })); - } - @Provides - @Singleton - @Named(JsEditorExtension.EMBEDDED_EDITOR_BUILDER) - protected EditorBuilder embeddedEditor(final OrionTextEditorFactory orionTextEditorFactory, - final NotificationManager notificationManager) { - return new EditorBuilder() { - @Override - public ConfigurableTextEditor buildEditor() { - final EmbeddedTextEditorPresenter editor = orionTextEditorFactory.createTextEditor(); - editor.initialize(new AutoSaveTextEditorConfiguration(), notificationManager); - return editor; - } - }; - } + bind(EditorBuilder.class).to(OrionEditorBuilder.class); - @Provides - @Singleton - @Named(JsEditorExtension.DEFAULT_EDITOR_TYPE_INJECT_NAME) - protected String defaultEditorTypeKey() { - return OrionEditorExtension.ORION_EDITOR_KEY; + bind(ModuleHolder.class).in(Singleton.class); } } diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModeOverlay.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModeOverlay.java index 891665a5f0..d4f4dcd3a1 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModeOverlay.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModeOverlay.java @@ -13,8 +13,8 @@ package org.eclipse.che.ide.editor.orion.client.jso; import com.google.gwt.core.client.JavaScriptObject; -import org.eclipse.che.ide.jseditor.client.link.LinkedMode; -import org.eclipse.che.ide.jseditor.client.link.LinkedModel; +import org.eclipse.che.ide.api.editor.link.LinkedMode; +import org.eclipse.che.ide.api.editor.link.LinkedModel; /** * @author Evgen Vidolob @@ -106,7 +106,7 @@ public class OrionLinkedModeOverlay extends JavaScriptObject implements LinkedMo this._annotationModel.addEventListener("Changed", annotationListener, true); this.annotationListener = annotationListener; var func = function (param) { - listener.@org.eclipse.che.ide.jseditor.client.link.LinkedMode.LinkedModeListener::onLinkedModeExited(*)(param.isSuccessful, + listener.@org.eclipse.che.ide.api.editor.link.LinkedMode.LinkedModeListener::onLinkedModeExited(*)(param.isSuccessful, start, end); }; $wnd.che_handels[listener] = func; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelDataOverlay.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelDataOverlay.java index d5521ccbe1..f8c60b941f 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelDataOverlay.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelDataOverlay.java @@ -14,7 +14,7 @@ package org.eclipse.che.ide.editor.orion.client.jso; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelData; +import org.eclipse.che.ide.api.editor.link.LinkedModelData; import java.util.List; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelGroupOverlay.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelGroupOverlay.java index bc3d4cdd15..9b9749307d 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelGroupOverlay.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelGroupOverlay.java @@ -14,9 +14,9 @@ package org.eclipse.che.ide.editor.orion.client.jso; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArray; -import org.eclipse.che.ide.api.text.Position; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelData; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelGroup; +import org.eclipse.che.ide.api.editor.text.Position; +import org.eclipse.che.ide.api.editor.link.LinkedModelData; +import org.eclipse.che.ide.api.editor.link.LinkedModelGroup; import java.util.List; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelOverlay.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelOverlay.java index 199d81c785..299ba126dd 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelOverlay.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/OrionLinkedModelOverlay.java @@ -14,8 +14,8 @@ package org.eclipse.che.ide.editor.orion.client.jso; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArray; -import org.eclipse.che.ide.jseditor.client.link.LinkedModel; -import org.eclipse.che.ide.jseditor.client.link.LinkedModelGroup; +import org.eclipse.che.ide.api.editor.link.LinkedModel; +import org.eclipse.che.ide.api.editor.link.LinkedModelGroup; import java.util.List; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/ModuleHolder.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/ModuleHolder.java similarity index 91% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/ModuleHolder.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/ModuleHolder.java index e4efd3f31d..9541ebc6df 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/ModuleHolder.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/ModuleHolder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs; +package org.eclipse.che.ide.requirejs; import com.google.gwt.core.client.JavaScriptObject; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequireJsLoader.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequireJsLoader.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequireJsLoader.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequireJsLoader.java index 0a125cf07c..74d07dd252 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequireJsLoader.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequireJsLoader.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,11 +8,11 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs; +package org.eclipse.che.ide.requirejs; import javax.inject.Inject; -import org.eclipse.che.ide.jseditor.client.requirejs.config.RequirejsConfig; +import org.eclipse.che.ide.requirejs.config.RequirejsConfig; import org.eclipse.che.ide.util.loging.Log; import com.google.gwt.core.client.Callback; import com.google.gwt.core.client.GWT; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/Requirejs.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/Requirejs.java similarity index 79% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/Requirejs.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/Requirejs.java index 407bd9be55..8d06fd673e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/Requirejs.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/Requirejs.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs; +package org.eclipse.che.ide.requirejs; -import org.eclipse.che.ide.jseditor.client.requirejs.config.RequirejsConfig; +import org.eclipse.che.ide.requirejs.config.RequirejsConfig; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; @@ -47,11 +47,11 @@ public class Requirejs extends JavaScriptObject { args.forEach(function(module) { param.push(module); }); - callback.@org.eclipse.che.ide.jseditor.client.requirejs.RequirejsCallback::onReady(Lcom/google/gwt/core/client/JsArray;)(param); + callback.@org.eclipse.che.ide.requirejs.RequirejsCallback::onReady(Lcom/google/gwt/core/client/JsArray;)(param); }; var realErrHandler = function(err) { if (errorHandler) { - errorHandler.@org.eclipse.che.ide.jseditor.client.requirejs.RequirejsErrorHandler::onError(Lorg/eclipse/che/ide/jseditor/client/requirejs/RequirejsErrorHandler$RequireError;)(err); + errorHandler.@org.eclipse.che.ide.requirejs.RequirejsErrorHandler::onError(Lorg/eclipse/che/ide/requirejs/RequirejsErrorHandler$RequireError;)(err); } else { $wnd.require.onError(err); } @@ -86,7 +86,7 @@ public class Requirejs extends JavaScriptObject { public final native void setOnError(RequirejsErrorHandler handler) /*-{ this.onError = function(err) { - handler.@org.eclipse.che.ide.jseditor.client.requirejs.RequirejsErrorHandler::onError(Lorg/eclipse/che/ide/jseditor/client/requirejs/RequirejsErrorHandler$RequireError;)(err); + handler.@org.eclipse.che.ide.requirejs.RequirejsErrorHandler::onError(Lorg/eclipse/che/ide/requirejs/RequirejsErrorHandler$RequireError;)(err); }; }-*/; } \ No newline at end of file diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequirejsCallback.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequirejsCallback.java similarity index 89% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequirejsCallback.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequirejsCallback.java index af196fc99b..7a6f202171 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequirejsCallback.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequirejsCallback.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs; +package org.eclipse.che.ide.requirejs; import com.google.gwt.core.client.JsArray; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequirejsErrorHandler.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequirejsErrorHandler.java similarity index 88% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequirejsErrorHandler.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequirejsErrorHandler.java index 4f313bc0db..ab9fd1956c 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequirejsErrorHandler.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequirejsErrorHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs; +package org.eclipse.che.ide.requirejs; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; @@ -28,7 +28,7 @@ public interface RequirejsErrorHandler { */ void onError(RequireError error); - public static class RequireError extends JavaScriptObject { + class RequireError extends JavaScriptObject { protected RequireError() { } diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequirejsModule.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequirejsModule.java similarity index 89% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequirejsModule.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequirejsModule.java index e0cfa61580..f48ff178bc 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/RequirejsModule.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/RequirejsModule.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs; +package org.eclipse.che.ide.requirejs; import com.google.gwt.core.client.JavaScriptObject; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/AssocitativeJsObject.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/AssocitativeJsObject.java similarity index 90% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/AssocitativeJsObject.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/AssocitativeJsObject.java index bcfded108e..4abe2b74fd 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/AssocitativeJsObject.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/AssocitativeJsObject.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/BundlesConfigProperty.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/BundlesConfigProperty.java similarity index 92% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/BundlesConfigProperty.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/BundlesConfigProperty.java index 2d5bce24c8..ec72230514 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/BundlesConfigProperty.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/BundlesConfigProperty.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ConfigConfigProperty.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ConfigConfigProperty.java similarity index 91% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ConfigConfigProperty.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ConfigConfigProperty.java index 07ef6e367f..ccd0dff982 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ConfigConfigProperty.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ConfigConfigProperty.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ConfigItem.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ConfigItem.java similarity index 87% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ConfigItem.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ConfigItem.java index c236d05d54..778bf1b97e 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ConfigItem.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ConfigItem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; import com.google.gwt.core.client.JavaScriptObject; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/MapConfigProperty.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/MapConfigProperty.java similarity index 91% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/MapConfigProperty.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/MapConfigProperty.java index 0334603cf4..57e5804991 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/MapConfigProperty.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/MapConfigProperty.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/MapItem.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/MapItem.java similarity index 86% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/MapItem.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/MapItem.java index 1c86f82d9f..d3273580de 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/MapItem.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/MapItem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; public class MapItem extends AssocitativeJsObject { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/PathsConfigProperty.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/PathsConfigProperty.java similarity index 87% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/PathsConfigProperty.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/PathsConfigProperty.java index 87119f3428..6ea627f842 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/PathsConfigProperty.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/PathsConfigProperty.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; public class PathsConfigProperty extends AssocitativeJsObject { diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/RequirejsConfig.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/RequirejsConfig.java similarity index 97% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/RequirejsConfig.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/RequirejsConfig.java index d761e4af82..79fd90bc30 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/RequirejsConfig.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/RequirejsConfig.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ShimConfigProperty.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ShimConfigProperty.java similarity index 91% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ShimConfigProperty.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ShimConfigProperty.java index 09f36d81ba..d5b95b69ab 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ShimConfigProperty.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ShimConfigProperty.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; diff --git a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ShimItem.java b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ShimItem.java similarity index 86% rename from core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ShimItem.java rename to plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ShimItem.java index 52fcf28b6f..cac04e5712 100644 --- a/core/ide/che-core-ide-jseditor/src/main/java/org/eclipse/che/ide/jseditor/client/requirejs/config/ShimItem.java +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/java/org/eclipse/che/ide/requirejs/config/ShimItem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. + * Copyright (c) 2014-2015 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 @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.ide.jseditor.client.requirejs.config; +package org.eclipse.che.ide.requirejs.config; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; @@ -44,7 +44,7 @@ public class ShimItem extends JavaScriptObject { public final native void setInit(InitFunction init) /*-{ this.init = function (param) { - init.@org.eclipse.che.ide.jseditor.client.requirejs.config.ShimItem.InitFunction::init()(param); + init.@org.eclipse.che.ide.requirejs.config.ShimItem.InitFunction::init()(param); }; }-*/; diff --git a/plugins/plugin-orion/che-plugin-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml b/plugins/plugin-orion/che-plugin-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml index 6ad3b9a95b..cd1b77871c 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml +++ b/plugins/plugin-orion/che-plugin-orion-editor/src/main/resources/org/eclipse/che/ide/editor/orion/OrionEditor.gwt.xml @@ -14,5 +14,5 @@ - + diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml index f64ddbe447..e0445d3a87 100644 --- a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml @@ -30,10 +30,6 @@ com.google.inject guice - - javax.inject - javax.inject - javax.validation validation-api @@ -50,10 +46,6 @@ org.eclipse.che.core che-core-ide-app - - org.eclipse.che.core - che-core-ide-jseditor - org.eclipse.che.plugin che-plugin-python-lang-shared diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/PythonJsEditorExtension.java b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/PythonJsEditorExtension.java deleted file mode 100644 index b988c9d75b..0000000000 --- a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/PythonJsEditorExtension.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * 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.plugin.python.ide; - -import com.google.inject.name.Named; - -import org.eclipse.che.ide.api.editor.EditorRegistry; -import org.eclipse.che.ide.api.extension.Extension; -import org.eclipse.che.ide.api.filetypes.FileType; -import org.eclipse.che.plugin.python.ide.editor.PythonEditorProvider; - -import javax.inject.Inject; - -/** @author Valeriy Svydenko */ -@Extension(title = "Python JS Editor") -public class PythonJsEditorExtension { - - @Inject - public PythonJsEditorExtension(final EditorRegistry editorRegistry, - final @Named("PythonFileType") FileType pythonFile, - final PythonEditorProvider pythonEditorProvider) { - editorRegistry.registerDefaultEditor(pythonFile, pythonEditorProvider); - } - -} diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/editor/PythonEditorProvider.java b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/editor/PythonEditorProvider.java deleted file mode 100644 index 716d9471d0..0000000000 --- a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/editor/PythonEditorProvider.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * 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.plugin.python.ide.editor; - -import org.eclipse.che.ide.api.editor.EditorPartPresenter; -import org.eclipse.che.ide.api.editor.EditorProvider; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.jseditor.client.defaulteditor.DefaultEditorProvider; -import org.eclipse.che.ide.jseditor.client.editorconfig.AutoSaveTextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.texteditor.EmbeddedTextEditorPresenter; - -import javax.inject.Inject; - - -/** - * EditorProvider that provides a text editor configured for Python source files. - * - * @author Valeriy Svydenko - */ -public class PythonEditorProvider implements EditorProvider { - private final DefaultEditorProvider editorProvider; - private final NotificationManager notificationManager; - - @Inject - public PythonEditorProvider(final DefaultEditorProvider editorProvider, - final NotificationManager notificationManager) { - this.editorProvider = editorProvider; - this.notificationManager = notificationManager; - } - - @Override - public String getId() { - return "PythonEditor"; - } - - @Override - public String getDescription() { - return "Python Editor"; - } - - @Override - public EditorPartPresenter getEditor() { - final EditorPartPresenter textEditor = editorProvider.getEditor(); - if (textEditor instanceof EmbeddedTextEditorPresenter) { - EmbeddedTextEditorPresenter editor = (EmbeddedTextEditorPresenter)textEditor; - editor.initialize(new AutoSaveTextEditorConfiguration(), notificationManager); - } - return textEditor; - } - -} diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/inject/PythonGinModule.java b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/inject/PythonGinModule.java index 2fe22fa5e1..c2a05d2fa9 100644 --- a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/inject/PythonGinModule.java +++ b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/java/org/eclipse/che/plugin/python/ide/inject/PythonGinModule.java @@ -16,7 +16,6 @@ import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.name.Named; -import org.eclipse.che.ide.MimeType; import org.eclipse.che.ide.api.extension.ExtensionGinModule; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.api.project.type.wizard.ProjectWizardRegistrar; @@ -40,7 +39,7 @@ public class PythonGinModule extends AbstractGinModule { @Singleton @Named("PythonFileType") protected FileType providePythonFile() { - return new FileType("Python", PythonResources.INSTANCE.pythonFile(), MimeType.TEXT_X_PYTHON, PYTHON_EXT); + return new FileType(PythonResources.INSTANCE.pythonFile(), PYTHON_EXT); } } diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml index ebabb50146..fa05245236 100644 --- a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml +++ b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml @@ -22,7 +22,6 @@ - diff --git a/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml index 21c4028e2d..82a0be6ba3 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml @@ -61,10 +61,6 @@ org.eclipse.che.core che-core-ide-app - - org.eclipse.che.core - che-core-ide-ui - javax.servlet javax.servlet-api diff --git a/plugins/plugin-sdk/che-plugin-sdk-env-local/src/main/java/org/eclipse/che/env/local/client/CheConnectionClosedInformer.java b/plugins/plugin-sdk/che-plugin-sdk-env-local/src/main/java/org/eclipse/che/env/local/client/CheConnectionClosedInformer.java index a868bbe1d3..4662af4f8e 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-env-local/src/main/java/org/eclipse/che/env/local/client/CheConnectionClosedInformer.java +++ b/plugins/plugin-sdk/che-plugin-sdk-env-local/src/main/java/org/eclipse/che/env/local/client/CheConnectionClosedInformer.java @@ -13,7 +13,7 @@ package org.eclipse.che.env.local.client; import com.google.inject.Inject; import org.eclipse.che.ide.api.ConnectionClosedInformer; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.websocket.events.WebSocketClosedEvent; import static org.eclipse.che.ide.websocket.events.WebSocketClosedEvent.CLOSE_ABNORMAL; diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/threechoices/ChoiceDialogFactory.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/threechoices/ChoiceDialogFactory.java index 5dfe97e738..7914bba80c 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/threechoices/ChoiceDialogFactory.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/threechoices/ChoiceDialogFactory.java @@ -13,8 +13,8 @@ package org.eclipse.che.plugin.svn.ide.common.threechoices; import javax.validation.constraints.NotNull; import org.eclipse.che.commons.annotation.Nullable; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import com.google.gwt.user.client.ui.IsWidget; import com.google.inject.assistedinject.Assisted; diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/threechoices/ChoiceDialogPresenter.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/threechoices/ChoiceDialogPresenter.java index 8114fe2440..6c68e53d95 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/threechoices/ChoiceDialogPresenter.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/threechoices/ChoiceDialogPresenter.java @@ -13,7 +13,7 @@ package org.eclipse.che.plugin.svn.ide.common.threechoices; import javax.validation.constraints.NotNull; import org.eclipse.che.commons.annotation.Nullable; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.IsWidget; import com.google.inject.assistedinject.Assisted; diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/lockunlock/LockUnlockPresenter.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/lockunlock/LockUnlockPresenter.java index cc4834f651..17470f41bd 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/lockunlock/LockUnlockPresenter.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/lockunlock/LockUnlockPresenter.java @@ -19,8 +19,8 @@ import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.plugin.svn.ide.SubversionClientService; import org.eclipse.che.plugin.svn.ide.SubversionExtensionLocalizationConstants; import org.eclipse.che.plugin.svn.ide.action.UnlockAction; diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/resolve/ResolvePresenter.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/resolve/ResolvePresenter.java index 14aa7bda63..04cc4eaaf6 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/resolve/ResolvePresenter.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/resolve/ResolvePresenter.java @@ -19,8 +19,8 @@ import org.eclipse.che.ide.api.app.CurrentProject; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.extension.machine.client.processes.ConsolesPanelPresenter; import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.plugin.svn.ide.SubversionClientService; import org.eclipse.che.plugin.svn.ide.SubversionExtensionLocalizationConstants; import org.eclipse.che.plugin.svn.ide.common.StatusColors; diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/revert/RevertPresenter.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/revert/RevertPresenter.java index e6a5ffd808..5683029eed 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/revert/RevertPresenter.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/revert/RevertPresenter.java @@ -20,10 +20,10 @@ import org.eclipse.che.ide.extension.machine.client.processes.ConsolesPanelPrese import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; import org.eclipse.che.ide.rest.AsyncRequestCallback; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; -import org.eclipse.che.ide.ui.dialogs.CancelCallback; -import org.eclipse.che.ide.ui.dialogs.ConfirmCallback; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; -import org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialog; +import org.eclipse.che.ide.api.dialogs.CancelCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import org.eclipse.che.plugin.svn.ide.SubversionClientService; import org.eclipse.che.plugin.svn.ide.SubversionExtensionLocalizationConstants; import org.eclipse.che.plugin.svn.ide.common.StatusColors; diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/test/java/org/eclipse/che/plugin/svn/ide/export/ExportPresenterTest.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/test/java/org/eclipse/che/plugin/svn/ide/export/ExportPresenterTest.java index 306c8487b6..bc049c601f 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/test/java/org/eclipse/che/plugin/svn/ide/export/ExportPresenterTest.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/test/java/org/eclipse/che/plugin/svn/ide/export/ExportPresenterTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.plugin.svn.ide.export; import org.eclipse.che.ide.api.project.node.HasStorablePath; import org.eclipse.che.plugin.svn.ide.common.BaseSubversionPresenterTest; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; +import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.junit.Test; import org.mockito.Mock; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml index 0f1d65469c..ec649bdd10 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml @@ -67,11 +67,6 @@ che-core-ide-app provided - - org.eclipse.che.core - che-core-ide-jseditor - provided - org.vectomatic lib-gwt-svg @@ -101,7 +96,6 @@ **/*.svg - **/*.png diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java index 6a70eb2c84..14ee004fdf 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/AutoEditStrategyFactory.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.web.html.editor; -import org.eclipse.che.ide.jseditor.client.changeintercept.TextChangeInterceptor; +import org.eclipse.che.ide.api.editor.changeintercept.TextChangeInterceptor; /** * Allows to define a new AutoEditStrategy based on text editor and content type. diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java index ecbc00a186..c882c7fd5a 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/DefaultCodeAssistProcessor.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.web.html.editor; -import org.eclipse.che.ide.jseditor.client.codeassist.DefaultChainedCodeAssistProcessor; +import org.eclipse.che.ide.api.editor.codeassist.DefaultChainedCodeAssistProcessor; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java index 0243679660..8777245a89 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HTMLCodeAssistProcessor.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.web.html.editor; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; /** diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java index 23b992130f..fe9357f5e6 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorConfiguration.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.web.html.editor; -import org.eclipse.che.ide.jseditor.client.changeintercept.ChangeInterceptorProvider; -import org.eclipse.che.ide.jseditor.client.changeintercept.TextChangeInterceptor; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor; -import org.eclipse.che.ide.jseditor.client.editorconfig.AutoSaveTextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner; +import org.eclipse.che.ide.api.editor.changeintercept.ChangeInterceptorProvider; +import org.eclipse.che.ide.api.editor.changeintercept.TextChangeInterceptor; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; +import org.eclipse.che.ide.api.editor.editorconfig.AutoSaveTextEditorConfiguration; +import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java index da74d208d1..a6602d8c79 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/html/editor/HtmlEditorProvider.java @@ -12,27 +12,19 @@ package org.eclipse.che.ide.ext.web.html.editor; import com.google.inject.Inject; -import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.editor.EditorProvider; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.jseditor.client.defaulteditor.DefaultEditorProvider; -import org.eclipse.che.ide.jseditor.client.texteditor.ConfigurableTextEditor; +import org.eclipse.che.ide.api.editor.defaulteditor.AbstractTextEditorProvider; +import org.eclipse.che.ide.api.editor.editorconfig.TextEditorConfiguration; /** * {@link EditorProvider} for HTML files. */ -public class HtmlEditorProvider implements EditorProvider { - private final DefaultEditorProvider editorProvider; - private final NotificationManager notificationManager; - private final HTMLEditorConfigurationProvider htmlEditorConfigurationProvider; +public class HtmlEditorProvider extends AbstractTextEditorProvider { + private final HTMLEditorConfigurationProvider configurationProvider; @Inject - public HtmlEditorProvider(final DefaultEditorProvider editorProvider, - final NotificationManager notificationManager, - final HTMLEditorConfigurationProvider htmlEditorConfigurationProvider) { - this.editorProvider = editorProvider; - this.notificationManager = notificationManager; - this.htmlEditorConfigurationProvider = htmlEditorConfigurationProvider; + public HtmlEditorProvider(HTMLEditorConfigurationProvider htmlEditorConfigurationProvider) { + this.configurationProvider = htmlEditorConfigurationProvider; } @Override @@ -46,10 +38,7 @@ public class HtmlEditorProvider implements EditorProvider { } @Override - public EditorPartPresenter getEditor() { - ConfigurableTextEditor textEditor = editorProvider.getEditor(); - HtmlEditorConfiguration configuration = this.htmlEditorConfigurationProvider.get(); - textEditor.initialize(configuration, notificationManager); - return textEditor; + protected TextEditorConfiguration getEditorConfiguration() { + return configurationProvider.get(); } } diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java index 781d6626c8..27c501657a 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/inject/WebModule.java @@ -15,13 +15,10 @@ import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.name.Named; -import org.eclipse.che.ide.MimeType; import org.eclipse.che.ide.api.extension.ExtensionGinModule; import org.eclipse.che.ide.api.filetypes.FileType; import org.eclipse.che.ide.ext.web.WebExtensionResource; -import java.util.Arrays; - /** * Adds custom binding for Editors. * @@ -38,55 +35,55 @@ public class WebModule extends AbstractGinModule { @Singleton @Named("CSSFileType") protected FileType provideCSSFile(WebExtensionResource res) { - return new FileType("CSS file", res.cssFile(), MimeType.TEXT_CSS, "css"); + return new FileType(res.cssFile(), "css"); } @Provides @Singleton @Named("LESSFileType") protected FileType provideLESSFile(WebExtensionResource res) { - return new FileType("Leaner CSS file", res.lessFile(), MimeType.TEXT_CSS, "less"); + return new FileType(res.lessFile(), "less"); } @Provides @Singleton @Named("JSFileType") protected FileType provideJSFile(WebExtensionResource res) { - return new FileType("javaScript", res.jsFile(), MimeType.TEXT_JAVASCRIPT, "js"); + return new FileType(res.jsFile(), "js"); } @Provides @Singleton @Named("ES6FileType") protected FileType provideES6File(WebExtensionResource res) { - return new FileType("ECMAScript", res.jsFile(), MimeType.TEXT_JAVASCRIPT, "es6"); + return new FileType(res.jsFile(), "es6"); } @Provides @Singleton @Named("JSXFileType") protected FileType provideJSXFile(WebExtensionResource res) { - return new FileType("JSX JavaScript", res.jsFile(), MimeType.TEXT_JAVASCRIPT, "jsx"); + return new FileType(res.jsFile(), "jsx"); } @Provides @Singleton @Named("TypeScript") protected FileType provideTypeScriptFile(WebExtensionResource res) { - return new FileType("TypeScript", res.jsFile(), MimeType.TEXT_JAVASCRIPT, "ts"); + return new FileType(res.jsFile(), "ts"); } @Provides @Singleton @Named("HTMLFileType") protected FileType provideHTMLFile(WebExtensionResource res) { - return new FileType("HTML file", res.htmlFile(), MimeType.TEXT_HTML, "html"); + return new FileType(res.htmlFile(), "html"); } @Provides @Singleton @Named("PHPFileType") protected FileType providePHPFile(WebExtensionResource res) { - return new FileType("PHP file", res.phpFile(), Arrays.asList(MimeType.APPLICATION_X_PHP, "text/x-php"), "php"); + return new FileType(res.phpFile(), "php"); } } diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java index bf65cbc85b..dd8ffce904 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/DefaultCodeAssistProcessor.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.web.js.editor; -import org.eclipse.che.ide.jseditor.client.codeassist.DefaultChainedCodeAssistProcessor; +import org.eclipse.che.ide.api.editor.codeassist.DefaultChainedCodeAssistProcessor; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java index 0f91800366..476a6114ae 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsCodeAssistProcessor.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.ext.web.js.editor; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; /** diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java index 43507cdad3..00a8a9965d 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfiguration.java @@ -11,11 +11,11 @@ package org.eclipse.che.ide.ext.web.js.editor; import org.eclipse.che.ide.ext.web.html.editor.AutoEditStrategyFactory; -import org.eclipse.che.ide.jseditor.client.changeintercept.ChangeInterceptorProvider; -import org.eclipse.che.ide.jseditor.client.changeintercept.TextChangeInterceptor; -import org.eclipse.che.ide.jseditor.client.codeassist.CodeAssistProcessor; -import org.eclipse.che.ide.jseditor.client.editorconfig.AutoSaveTextEditorConfiguration; -import org.eclipse.che.ide.jseditor.client.partition.DocumentPartitioner; +import org.eclipse.che.ide.api.editor.changeintercept.ChangeInterceptorProvider; +import org.eclipse.che.ide.api.editor.changeintercept.TextChangeInterceptor; +import org.eclipse.che.ide.api.editor.codeassist.CodeAssistProcessor; +import org.eclipse.che.ide.api.editor.editorconfig.AutoSaveTextEditorConfiguration; +import org.eclipse.che.ide.api.editor.partition.DocumentPartitioner; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java index b229dc05c8..e32a64d592 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java +++ b/plugins/plugin-web/che-plugin-web-ext-web/src/main/java/org/eclipse/che/ide/ext/web/js/editor/JsEditorConfigurationProvider.java @@ -18,7 +18,7 @@ import org.eclipse.che.ide.ext.web.html.editor.AutoEditStrategyFactory; import com.google.inject.Inject; /** - * Provider for HTML Editor configuration. + * Provider for JS Editor configuration. * * @author Florent Benoit */ @@ -34,9 +34,8 @@ public class JsEditorConfigurationProvider implements Provider - + + diff --git a/pom.xml b/pom.xml index d78e7ed44a..a396c04e1e 100644 --- a/pom.xml +++ b/pom.xml @@ -290,11 +290,6 @@ che-core-ide-generators ${project.version} - - org.eclipse.che.core - che-core-ide-jseditor - ${project.version} - org.eclipse.che.core che-core-ide-stacks