diff --git a/arduino-ide-extension/package.json b/arduino-ide-extension/package.json index 637f7997..e802ccf1 100644 --- a/arduino-ide-extension/package.json +++ b/arduino-ide-extension/package.json @@ -106,8 +106,8 @@ "frontend": "lib/browser/arduino-ide-frontend-module" }, { - "frontend": "lib/browser/customization/core/browser-menu-module", - "frontendElectron": "lib/electron-browser/customization/core/electron-menu-module" + "frontend": "lib/browser/theia/core/browser-menu-module", + "frontendElectron": "lib/electron-browser/theia/core/electron-menu-module" }, { "frontend": "lib/browser/boards/quick-open/boards-quick-open-module" diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx index 3c505b0d..446bfa47 100644 --- a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx +++ b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx @@ -24,7 +24,7 @@ import { BoardsToolBarItem } from './boards/boards-toolbar-item'; import { BoardsConfig } from './boards/boards-config'; import { MonitorConnection } from './monitor/monitor-connection'; import { MonitorViewContribution } from './monitor/monitor-view-contribution'; -import { WorkspaceService } from './customization/workspace/workspace-service'; +import { WorkspaceService } from './theia/workspace/workspace-service'; import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution'; import { OutputContribution } from '@theia/output/lib/browser/output-contribution'; import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution'; diff --git a/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts b/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts index aba606d4..e8a1e46a 100644 --- a/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts +++ b/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts @@ -23,18 +23,18 @@ import { ToolOutputService } from '../common/protocol/tool-output-service'; import { ToolOutputServiceClientImpl } from './tool-output/client-service-impl'; import { BoardsServiceClientImpl } from './boards/boards-service-client-impl'; import { WorkspaceService as TheiaWorkspaceService } from '@theia/workspace/lib/browser/workspace-service'; -import { WorkspaceService } from './customization/workspace/workspace-service'; +import { WorkspaceService } from './theia/workspace/workspace-service'; import { OutlineViewContribution as TheiaOutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution'; -import { OutlineViewContribution } from './customization/outline/outline-contribution'; +import { OutlineViewContribution } from './theia/outline/outline-contribution'; import { ProblemContribution as TheiaProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution'; -import { ProblemContribution } from './customization/markers/problem-contribution'; -import { FileNavigatorContribution } from './customization/navigator/navigator-contribution'; +import { ProblemContribution } from './theia/markers/problem-contribution'; +import { FileNavigatorContribution } from './theia/navigator/navigator-contribution'; import { FileNavigatorContribution as TheiaFileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution'; import { ArduinoToolbarContribution } from './toolbar/arduino-toolbar-contribution'; import { EditorContribution as TheiaEditorContribution } from '@theia/editor/lib/browser/editor-contribution'; -import { EditorContribution } from './customization/editor/editor-contribution'; +import { EditorContribution } from './theia/editor/editor-contribution'; import { MonacoStatusBarContribution as TheiaMonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution'; -import { MonacoStatusBarContribution } from './customization/monaco/monaco-status-bar-contribution'; +import { MonacoStatusBarContribution } from './theia/monaco/monaco-status-bar-contribution'; import { ApplicationShell as TheiaApplicationShell, ShellLayoutRestorer as TheiaShellLayoutRestorer, @@ -42,14 +42,14 @@ import { CommonFrontendContribution as TheiaCommonFrontendContribution } from '@theia/core/lib/browser'; import { MenuContribution } from '@theia/core/lib/common/menu'; -import { ApplicationShell } from './customization/core/application-shell'; -import { FrontendApplication } from './customization/core/frontend-application'; +import { ApplicationShell } from './theia/core/application-shell'; +import { FrontendApplication } from './theia/core/frontend-application'; import { BoardsConfigDialog, BoardsConfigDialogProps } from './boards/boards-config-dialog'; import { BoardsConfigDialogWidget } from './boards/boards-config-dialog-widget'; import { ScmContribution as TheiaScmContribution } from '@theia/scm/lib/browser/scm-contribution'; -import { ScmContribution } from './customization/scm/scm-contribution'; +import { ScmContribution } from './theia/scm/scm-contribution'; import { SearchInWorkspaceFrontendContribution as TheiaSearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution'; -import { SearchInWorkspaceFrontendContribution } from './customization/search-in-workspace/search-in-workspace-frontend-contribution'; +import { SearchInWorkspaceFrontendContribution } from './theia/search-in-workspace/search-in-workspace-frontend-contribution'; import { LibraryListWidgetFrontendContribution } from './library/library-widget-frontend-contribution'; import { MonitorServiceClientImpl } from './monitor/monitor-service-client-impl'; import { MonitorServicePath, MonitorService, MonitorServiceClient } from '../common/protocol/monitor-service'; @@ -59,13 +59,13 @@ import { MonitorViewContribution } from './monitor/monitor-view-contribution'; import { MonitorConnection } from './monitor/monitor-connection'; import { MonitorModel } from './monitor/monitor-model'; import { TabBarDecoratorService as TheiaTabBarDecoratorService } from '@theia/core/lib/browser/shell/tab-bar-decorator'; -import { TabBarDecoratorService } from './customization/core/tab-bar-decorator'; +import { TabBarDecoratorService } from './theia/core/tab-bar-decorator'; import { ProblemManager as TheiaProblemManager } from '@theia/markers/lib/browser'; -import { ProblemManager } from './customization/markers/problem-manager'; +import { ProblemManager } from './theia/markers/problem-manager'; import { BoardsAutoInstaller } from './boards/boards-auto-installer'; import { AboutDialog as TheiaAboutDialog } from '@theia/core/lib/browser/about-dialog'; -import { AboutDialog } from './customization/core/about-dialog'; -import { ShellLayoutRestorer } from './customization/core/shell-layout-restorer'; +import { AboutDialog } from './theia/core/about-dialog'; +import { ShellLayoutRestorer } from './theia/core/shell-layout-restorer'; import { EditorMode } from './editor-mode'; import { ListItemRenderer } from './widgets/component-list/list-item-renderer'; import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution'; @@ -73,8 +73,8 @@ import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-s import { ArduinoDaemonClientImpl } from './arduino-daemon-client-impl'; import { ArduinoDaemonClient, ArduinoDaemonPath, ArduinoDaemon } from '../common/protocol/arduino-daemon'; import { EditorManager as TheiaEditorManager } from '@theia/editor/lib/browser'; -import { EditorManager } from './customization/editor/editor-manager'; -import { FrontendConnectionStatusService, ApplicationConnectionStatusContribution } from './customization/core/connection-status-service'; +import { EditorManager } from './theia/editor/editor-manager'; +import { FrontendConnectionStatusService, ApplicationConnectionStatusContribution } from './theia/core/connection-status-service'; import { FrontendConnectionStatusService as TheiaFrontendConnectionStatusService, ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution @@ -86,7 +86,7 @@ import { BoardsConfigStore } from './boards/boards-config-store'; import { ILogger } from '@theia/core'; import { FileSystemExt, FileSystemExtPath } from '../common/protocol/filesystem-ext'; import { WorkspaceFrontendContribution as TheiaWorkspaceFrontendContribution, FileMenuContribution as TheiaFileMenuContribution } from '@theia/workspace/lib/browser'; -import { WorkspaceFrontendContribution, ArduinoFileMenuContribution } from './customization/workspace/workspace-frontend-contribution'; +import { WorkspaceFrontendContribution, ArduinoFileMenuContribution } from './theia/workspace/workspace-frontend-contribution'; import { Contribution } from './contributions/contribution'; import { NewSketch } from './contributions/new-sketch'; import { OpenSketch } from './contributions/open-sketch'; @@ -95,7 +95,7 @@ import { SaveAsSketch } from './contributions/save-as-sketch'; import { SaveSketch } from './contributions/save-sketch'; import { VerifySketch } from './contributions/verify-sketch'; import { UploadSketch } from './contributions/upload-sketch'; -import { CommonFrontendContribution } from './customization/core/common-frontend-contribution'; +import { CommonFrontendContribution } from './theia/core/common-frontend-contribution'; import { EditContributions } from './contributions/edit-contributions'; import { OpenSketchExternal } from './contributions/open-sketch-external'; diff --git a/arduino-ide-extension/src/browser/customization/core/about-dialog.ts b/arduino-ide-extension/src/browser/theia/core/about-dialog.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/about-dialog.ts rename to arduino-ide-extension/src/browser/theia/core/about-dialog.ts diff --git a/arduino-ide-extension/src/browser/customization/core/application-shell.ts b/arduino-ide-extension/src/browser/theia/core/application-shell.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/application-shell.ts rename to arduino-ide-extension/src/browser/theia/core/application-shell.ts diff --git a/arduino-ide-extension/src/browser/customization/core/browser-main-menu-factory.ts b/arduino-ide-extension/src/browser/theia/core/browser-main-menu-factory.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/browser-main-menu-factory.ts rename to arduino-ide-extension/src/browser/theia/core/browser-main-menu-factory.ts diff --git a/arduino-ide-extension/src/browser/customization/core/browser-menu-module.ts b/arduino-ide-extension/src/browser/theia/core/browser-menu-module.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/browser-menu-module.ts rename to arduino-ide-extension/src/browser/theia/core/browser-menu-module.ts diff --git a/arduino-ide-extension/src/browser/customization/core/browser-menu-plugin.ts b/arduino-ide-extension/src/browser/theia/core/browser-menu-plugin.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/browser-menu-plugin.ts rename to arduino-ide-extension/src/browser/theia/core/browser-menu-plugin.ts diff --git a/arduino-ide-extension/src/browser/customization/core/common-frontend-contribution.ts b/arduino-ide-extension/src/browser/theia/core/common-frontend-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/common-frontend-contribution.ts rename to arduino-ide-extension/src/browser/theia/core/common-frontend-contribution.ts diff --git a/arduino-ide-extension/src/browser/customization/core/connection-status-service.ts b/arduino-ide-extension/src/browser/theia/core/connection-status-service.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/connection-status-service.ts rename to arduino-ide-extension/src/browser/theia/core/connection-status-service.ts diff --git a/arduino-ide-extension/src/browser/customization/core/frontend-application.ts b/arduino-ide-extension/src/browser/theia/core/frontend-application.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/frontend-application.ts rename to arduino-ide-extension/src/browser/theia/core/frontend-application.ts diff --git a/arduino-ide-extension/src/browser/customization/core/shell-layout-restorer.ts b/arduino-ide-extension/src/browser/theia/core/shell-layout-restorer.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/shell-layout-restorer.ts rename to arduino-ide-extension/src/browser/theia/core/shell-layout-restorer.ts diff --git a/arduino-ide-extension/src/browser/customization/core/tab-bar-decorator.ts b/arduino-ide-extension/src/browser/theia/core/tab-bar-decorator.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/core/tab-bar-decorator.ts rename to arduino-ide-extension/src/browser/theia/core/tab-bar-decorator.ts diff --git a/arduino-ide-extension/src/browser/customization/editor/editor-contribution.ts b/arduino-ide-extension/src/browser/theia/editor/editor-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/editor/editor-contribution.ts rename to arduino-ide-extension/src/browser/theia/editor/editor-contribution.ts diff --git a/arduino-ide-extension/src/browser/customization/editor/editor-manager.ts b/arduino-ide-extension/src/browser/theia/editor/editor-manager.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/editor/editor-manager.ts rename to arduino-ide-extension/src/browser/theia/editor/editor-manager.ts diff --git a/arduino-ide-extension/src/browser/customization/markers/problem-contribution.ts b/arduino-ide-extension/src/browser/theia/markers/problem-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/markers/problem-contribution.ts rename to arduino-ide-extension/src/browser/theia/markers/problem-contribution.ts diff --git a/arduino-ide-extension/src/browser/customization/markers/problem-manager.ts b/arduino-ide-extension/src/browser/theia/markers/problem-manager.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/markers/problem-manager.ts rename to arduino-ide-extension/src/browser/theia/markers/problem-manager.ts diff --git a/arduino-ide-extension/src/browser/customization/monaco/monaco-status-bar-contribution.ts b/arduino-ide-extension/src/browser/theia/monaco/monaco-status-bar-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/monaco/monaco-status-bar-contribution.ts rename to arduino-ide-extension/src/browser/theia/monaco/monaco-status-bar-contribution.ts diff --git a/arduino-ide-extension/src/browser/customization/navigator/navigator-contribution.ts b/arduino-ide-extension/src/browser/theia/navigator/navigator-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/navigator/navigator-contribution.ts rename to arduino-ide-extension/src/browser/theia/navigator/navigator-contribution.ts diff --git a/arduino-ide-extension/src/browser/customization/outline/outline-contribution.ts b/arduino-ide-extension/src/browser/theia/outline/outline-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/outline/outline-contribution.ts rename to arduino-ide-extension/src/browser/theia/outline/outline-contribution.ts diff --git a/arduino-ide-extension/src/browser/customization/scm/scm-contribution.ts b/arduino-ide-extension/src/browser/theia/scm/scm-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/scm/scm-contribution.ts rename to arduino-ide-extension/src/browser/theia/scm/scm-contribution.ts diff --git a/arduino-ide-extension/src/browser/customization/search-in-workspace/search-in-workspace-frontend-contribution.ts b/arduino-ide-extension/src/browser/theia/search-in-workspace/search-in-workspace-frontend-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/search-in-workspace/search-in-workspace-frontend-contribution.ts rename to arduino-ide-extension/src/browser/theia/search-in-workspace/search-in-workspace-frontend-contribution.ts diff --git a/arduino-ide-extension/src/browser/customization/workspace/workspace-frontend-contribution.ts b/arduino-ide-extension/src/browser/theia/workspace/workspace-frontend-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/workspace/workspace-frontend-contribution.ts rename to arduino-ide-extension/src/browser/theia/workspace/workspace-frontend-contribution.ts diff --git a/arduino-ide-extension/src/browser/customization/workspace/workspace-service.ts b/arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts similarity index 100% rename from arduino-ide-extension/src/browser/customization/workspace/workspace-service.ts rename to arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts diff --git a/arduino-ide-extension/src/electron-browser/customization/core/electron-menu-contribution.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-menu-contribution.ts similarity index 100% rename from arduino-ide-extension/src/electron-browser/customization/core/electron-menu-contribution.ts rename to arduino-ide-extension/src/electron-browser/theia/core/electron-menu-contribution.ts diff --git a/arduino-ide-extension/src/electron-browser/customization/core/electron-menu-module.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-menu-module.ts similarity index 100% rename from arduino-ide-extension/src/electron-browser/customization/core/electron-menu-module.ts rename to arduino-ide-extension/src/electron-browser/theia/core/electron-menu-module.ts